Replace gometalinter with GolangCI-Lint

Running test.sh is down from 34s to 20s on my machine. Also, from now on, run go lint. Signed-off-by: David Gageot <david@gageot.net>
GoogleContainerTools · May 30, 2018 · cb0c4c4 · cb0c4c4
1 parent 8c13026
commit cb0c4c4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 39 deletions.
diff --git a/hack/gometalinter.json b/hack/gometalinter.json
diff --git a/hack/gometalinter.sh → hack/linter.sh b/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
diff --git a/pkg/skaffold/kubernetes/log.go b/pkg/skaffold/kubernetes/log.go
@@ -56,7 +56,7 @@ func NewLogAggregator(out io.Writer, podSelector PodSelector, colorPicker ColorP
 	}
 }
 
-func (a *LogAggregator) Start(ctx context.Context, client corev1.CoreV1Interface) error {
+func (a *LogAggregator) Start(ctx context.Context, client corev1.PodsGetter) error {
 	a.startTime = time.Now()
 
 	watcher, err := client.Pods("").Watch(meta_v1.ListOptions{
@@ -91,8 +91,7 @@ func (a *LogAggregator) Start(ctx context.Context, client corev1.CoreV1Interface
 	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")

diff --git a/pkg/skaffold/kubernetes/wait.go b/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()

diff --git a/test.sh b/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