Merge pull request #619 from dgageot/golangci-lint

Replace gometalinter with GolangCI-Lint

hack/gometalinter.sh → hack/linter.sh

@@ -16,18 +16,22 @@
 
 set -e -o pipefail
 
-SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-install_gometalinter() {
-	echo "Installing gometalinter.v2"
-	go get -u gopkg.in/alecthomas/gometalinter.v2
-	gometalinter.v2 --install
-}
-
-if ! [ -x "$(command -v gometalinter.v2)" ]; then
-  install_gometalinter
+if ! [ -x "$(command -v golangci-lint)" ]; then
+	echo "Installing GolangCI-Lint"
+	go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 fi
 
-gometalinter.v2 \
-	--deadline 5m \
-	--config $SCRIPTDIR/gometalinter.json ./...
+golangci-lint run \
+	--no-config \
+	-E goimports \
+	-E interfacer \
+	-E unconvert \
+	-E goconst \
+	-E maligned \
+	-D errcheck
+
+# From now on, run go lint.
+golangci-lint run \
+	--disable-all \
+	-E golint \
+	--new-from-rev bed41e9a77431990cc8504c0955252c851934b89

pkg/skaffold/build/local_test.go

@@ -69,9 +69,9 @@ func TestLocalRun(t *testing.T) {
 		out          io.Writer
 		api          docker.DockerAPIClient
 		tagger       tag.Tagger
-		localCluster bool
 		artifacts    []*v1alpha2.Artifact
 		expected     []Build
+		localCluster bool
 		shouldErr    bool
 	}{
 		{

pkg/skaffold/build/tag/date_time.go

@@ -31,12 +31,13 @@ type dateTimeTagger struct {
 	timeFn   func() time.Time
 }
 
-func NewDateTimeTagger(format, timezone string) (*dateTimeTagger, error) {
+// NewDateTimeTagger creates a tagger from a date format and timezone.
+func NewDateTimeTagger(format, timezone string) Tagger {
 	return &dateTimeTagger{
 		Format:   format,
 		TimeZone: timezone,
 		timeFn:   func() time.Time { return time.Now() },
-	}, nil
+	}
 }
 
 // GenerateFullyQualifiedImageName tags an image with the supplied image name and the current timestamp

pkg/skaffold/build/tag/date_time_test.go

@@ -23,14 +23,6 @@ import (
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
-type mockClock struct {
-	time time.Time
-}
-
-func (m mockClock) Now() time.Time {
-	return m.time
-}
-
 func TestDateTime_GenerateFullyQualifiedImageName(t *testing.T) {
 	aLocalTimeStamp := time.Date(2015, 03, 07, 11, 06, 39, 123456789, time.Local)
 	localZone, _ := aLocalTimeStamp.Zone()

pkg/skaffold/build/tag/env_template.go

@@ -30,7 +30,7 @@ type envTemplateTagger struct {
 }
 
 // NewEnvTemplateTagger creates a new envTemplateTagger
-func NewEnvTemplateTagger(t string) (*envTemplateTagger, error) {
+func NewEnvTemplateTagger(t string) (Tagger, error) {
 	tmpl, err := util.ParseEnvTemplate(t)
 	if err != nil {
 		return nil, errors.Wrap(err, "parsing template")

pkg/skaffold/docker/image_test.go

@@ -37,7 +37,6 @@ func TestMain(m *testing.M) {
 type testImageAPI struct {
 	description  string
 	imageName    string
-	imageID      string
 	tagToImageID map[string]string
 	shouldErr    bool
 	expected     string
@@ -96,7 +95,6 @@ func TestRunBuild(t *testing.T) {
 		{
 			description:  "build",
 			tagToImageID: map[string]string{},
-			imageID:      "sha256:test",
 			expected:     "test",
 		},
 		{

pkg/skaffold/kubernetes/log.go

@@ -60,7 +60,6 @@ func NewLogAggregator(out io.Writer, podSelector PodSelector, colorPicker ColorP
 }
 
 func (a *LogAggregator) Start(ctx context.Context) error {
-	// Start logs
 	kubeclient, err := Client()
 	if err != nil {
 		return errors.Wrap(err, "getting k8s client")
@@ -101,8 +100,7 @@ func (a *LogAggregator) Start(ctx context.Context) error {
 	return nil
 }
 
-// nolint: interfacer
-func (a *LogAggregator) streamLogs(ctx context.Context, client corev1.CoreV1Interface, pod *v1.Pod) error {
+func (a *LogAggregator) streamLogs(ctx context.Context, client corev1.PodsGetter, pod *v1.Pod) error {
 	pods := client.Pods(pod.Namespace)
 	if err := WaitForPodReady(pods, pod.Name); err != nil {
 		return errors.Wrap(err, "waiting for pod ready")

pkg/skaffold/kubernetes/wait.go

@@ -116,8 +116,7 @@ func (s *PodStore) Stop() {
 	close(s.stopCh)
 }
 
-// nolint: interfacer
-func NewPodStore(c kubernetes.Interface, namespace string, label labels.Selector, field fields.Selector) *PodStore {
+func NewPodStore(c kubernetes.Interface, namespace string, label fmt.Stringer, field fmt.Stringer) *PodStore {
 	lw := &cache.ListWatch{
 		ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
 			options.LabelSelector = label.String()

pkg/skaffold/kubernetes/wait_test.go

@@ -79,20 +79,6 @@ var podBadPhase = &v1.Pod{
 	},
 }
 
-var podDifferentName = &v1.Pod{
-	ObjectMeta: metav1.ObjectMeta{
-		Name: "pod_different_name",
-	},
-	Status: v1.PodStatus{
-		Conditions: []v1.PodCondition{
-			{
-				Type: v1.PodScheduled,
-			},
-		},
-		Phase: "not a real phase",
-	},
-}
-
 func TestWaitForPodReady(t *testing.T) {
 	var tests = []struct {
 		description string

pkg/skaffold/runner/runner.go

@@ -141,7 +141,7 @@ func getTagger(t v1alpha2.TagPolicy, customTag string) (tag.Tagger, error) {
 		return &tag.GitCommit{}, nil
 
 	case t.DateTimeTagger != nil:
-		return tag.NewDateTimeTagger(t.DateTimeTagger.Format, t.DateTimeTagger.TimeZone)
+		return tag.NewDateTimeTagger(t.DateTimeTagger.Format, t.DateTimeTagger.TimeZone), nil
 
 	default:
 		return nil, fmt.Errorf("Unknown tagger for strategy %+v", t)

pkg/skaffold/util/env_template_test.go

@@ -60,12 +60,12 @@ func TestEnvTemplate_ExecuteEnvTemplate(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			test_template := template.Must(template.New("").Parse(test.template))
+			testTemplate := template.Must(template.New("").Parse(test.template))
 			OSEnviron = func() []string {
 				return test.env
 			}
 
-			got, err := ExecuteEnvTemplate(test_template, test.customMap)
+			got, err := ExecuteEnvTemplate(testTemplate, test.customMap)
 			testutil.CheckErrorAndDeepEqual(t, test.shouldErr, err, test.want, got)
 		})
 	}

test.sh

@@ -31,7 +31,7 @@ echo "Running validation scripts..."
 scripts=(
     "hack/boilerplate.sh"
     "hack/gofmt.sh"
-    "hack/gometalinter.sh"
+    "hack/linter.sh"
     "hack/dep.sh"
 )
 fail=0