msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #5284 from adamreese/v3/make-format

Browse Source 
feat(Makefile): add formatting target
pull/5383/head
Adam Reese 7 years ago committed by GitHub
parent e581516951 f791421fab
commit e51a9b90c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File

8
Makefile
Unescape View File

@ -6,6 +6,7 @@ BINNAME ?= helm
GOPATH = $(shell go env GOPATH)
DEP = $(GOPATH)/bin/dep
GOX = $(GOPATH)/bin/gox
GOIMPORTS = $(GOPATH)/bin/goimports
# go option
PKG := ./...
@ -81,6 +82,10 @@ verify-docs: build
coverage:
@scripts/coverage.sh
.PHONY: format
format: $(GOIMPORTS)
go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local k8s.io/helm
# ------------------------------------------------------------------------------
# dependencies
@ -93,6 +98,9 @@ $(DEP):
$(GOX):
go get -u github.com/mitchellh/gox
$(GOIMPORTS):
go get -u golang.org/x/tools/cmd/goimports
# install vendored dependencies
vendor: Gopkg.lock
$(DEP) ensure -v --vendor-only

5
cmd/helm/helm_test.go
Unescape View File

@ -24,11 +24,9 @@ import (
"testing"
"time"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/helm/pkg/tiller/environment"
shellwords "github.com/mattn/go-shellwords"
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/helm/internal/test"
"k8s.io/helm/pkg/action"
@ -38,6 +36,7 @@ import (
"k8s.io/helm/pkg/repo"
"k8s.io/helm/pkg/storage"
"k8s.io/helm/pkg/storage/driver"
"k8s.io/helm/pkg/tiller/environment"
)
func testTimestamper() time.Time { return time.Unix(242085845, 0).UTC() }

4
cmd/helm/plugin.go
Unescape View File

@ -20,10 +20,10 @@ import (
"os"
"os/exec"
"k8s.io/helm/pkg/plugin"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/plugin"
)
const pluginHelp = `

4
cmd/helm/plugin_install.go
Unescape View File

@ -19,12 +19,12 @@ import (
"fmt"
"io"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/helm/helmpath"
"k8s.io/helm/pkg/plugin"
"k8s.io/helm/pkg/plugin/installer"
"github.com/spf13/cobra"
)
type pluginInstallOptions struct {

4
cmd/helm/plugin_list.go
Unescape View File

@ -19,10 +19,10 @@ import (
"fmt"
"io"
"k8s.io/helm/pkg/helm/helmpath"
"github.com/gosuri/uitable"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helm/helmpath"
)
type pluginListOptions struct {

4
cmd/helm/plugin_test.go
Unescape View File

@ -23,10 +23,10 @@ import (
"strings"
"testing"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helm/helmpath"
"k8s.io/helm/pkg/plugin"
"github.com/spf13/cobra"
)
func TestManuallyProcessArgs(t *testing.T) {

1
pkg/action/action_test.go
Unescape View File

@ -24,6 +24,7 @@ import (
"github.com/pkg/errors"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/hapi/release"
"k8s.io/helm/pkg/storage"

1
pkg/action/list_test.go
Unescape View File

@ -20,6 +20,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"k8s.io/helm/pkg/hapi/release"
"k8s.io/helm/pkg/storage"
)

4
pkg/helm/environment/environment_test.go
Unescape View File

@ -21,9 +21,9 @@ import (
"strings"
"testing"
"k8s.io/helm/pkg/helm/helmpath"
"github.com/spf13/pflag"
"k8s.io/helm/pkg/helm/helmpath"
)
func TestEnvSettings(t *testing.T) {

2
pkg/kube/client.go
Unescape View File

@ -32,7 +32,7 @@ import (
appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2"
batch "k8s.io/api/batch/v1"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
extv1beta1 "k8s.io/api/extensions/v1beta1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors"

2
pkg/kube/client_test.go
Unescape View File

@ -24,7 +24,7 @@ import (
"strings"
"testing"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/kube/wait.go
Unescape View File

@ -22,7 +22,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"

3
pkg/lint/lint_test.go
Unescape View File

@ -18,10 +18,9 @@ package lint
import (
"strings"
"testing"
"k8s.io/helm/pkg/lint/support"
"testing"
)
var values map[string]interface{}

4
pkg/plugin/installer/vcs_installer_test.go
Unescape View File

@ -22,9 +22,9 @@ import (
"path/filepath"
"testing"
"k8s.io/helm/pkg/helm/helmpath"
"github.com/Masterminds/vcs"
"k8s.io/helm/pkg/helm/helmpath"
)
var _ Installer = new(VCSInstaller)

4
pkg/plugin/plugin.go
Unescape View File

@ -23,9 +23,9 @@ import (
"runtime"
"strings"
helm_env "k8s.io/helm/pkg/helm/environment"
"github.com/ghodss/yaml"
helm_env "k8s.io/helm/pkg/helm/environment"
)
const pluginFileName = "plugin.yaml"

4
pkg/registry/client_test.go
Unescape View File

@ -21,7 +21,6 @@ import (
"context"
"fmt"
"io"
"k8s.io/helm/pkg/chart"
"net"
"os"
"testing"
@ -31,8 +30,9 @@ import (
"github.com/docker/distribution/configuration"
"github.com/docker/distribution/registry"
_ "github.com/docker/distribution/registry/storage/driver/inmemory"
"github.com/stretchr/testify/suite"
"k8s.io/helm/pkg/chart"
)
var (

2
pkg/releasetesting/environment.go
Unescape View File

@ -22,7 +22,7 @@ import (
"log"
"time"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/helm/pkg/hapi"
"k8s.io/helm/pkg/hapi/release"

2
pkg/releasetesting/test_suite.go
Unescape View File

@ -22,7 +22,7 @@ import (
"github.com/ghodss/yaml"
"github.com/pkg/errors"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/helm/pkg/hapi/release"
"k8s.io/helm/pkg/hooks"

2
pkg/releasetesting/test_suite_test.go
Unescape View File

@ -21,7 +21,7 @@ import (
"testing"
"time"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/helm/pkg/hapi"
"k8s.io/helm/pkg/hapi/release"

1
pkg/releaseutil/manifest_sorter.go
Unescape View File

@ -24,6 +24,7 @@ import (
"github.com/pkg/errors"
yaml "gopkg.in/yaml.v2"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/hapi/release"
"k8s.io/helm/pkg/hooks"

3
pkg/storage/driver/cfgmaps.go
Unescape View File

@ -22,8 +22,7 @@ import (
"time"
"github.com/pkg/errors"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kblabels "k8s.io/apimachinery/pkg/labels"

2
pkg/storage/driver/cfgmaps_test.go
Unescape View File

@ -19,7 +19,7 @@ import (
"reflect"
"testing"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
rspb "k8s.io/helm/pkg/hapi/release"
)

2
pkg/storage/driver/mock_test.go
Unescape View File

@ -20,7 +20,7 @@ import (
"fmt"
"testing"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"

3
pkg/storage/driver/secrets.go
Unescape View File

@ -22,8 +22,7 @@ import (
"time"
"github.com/pkg/errors"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kblabels "k8s.io/apimachinery/pkg/labels"

2
pkg/storage/driver/secrets_test.go
Unescape View File

@ -19,7 +19,7 @@ import (
"reflect"
"testing"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
rspb "k8s.io/helm/pkg/hapi/release"
)

2
pkg/tiller/environment/environment.go
Unescape View File

@ -26,7 +26,7 @@ import (
"io"
"time"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
"k8s.io/helm/pkg/kube"

2
pkg/tiller/environment/environment_test.go
Unescape View File

@ -22,7 +22,7 @@ import (
"testing"
"time"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
"k8s.io/helm/pkg/kube"

Write Preview
Loading…
Cancel
Save