Fix lint

tsuru · Dec 11, 2020 · 2ada41a · 2ada41a
1 parent 23297c6
commit 2ada41a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -106,4 +106,9 @@ endif
 
 build/plugin/rpaasv2:
 	@mkdir -p build/_output/bin/
-	go build -o build/_output/bin/rpaasv2 ./cmd/plugin/rpaasv2
+	go build -o build/_output/bin/rpaasv2 ./cmd/plugin/rpaasv2
+
+lint:
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin $(GOLANGCI_LINT_VERSION)
+	go install ./...
+	golangci-lint run --config ./.golangci.yml ./...
diff --git a/test/integration_test.go b/test/integration_test.go
@@ -297,8 +297,8 @@ func Test_RpaasApi(t *testing.T) {
 		for _, podLabel := range podLabels {
 			_, err = kubectlWithRetry("wait", "--for=condition=Ready", "-l", podLabel, "pod", "--timeout", "5m", "-n", namespaceName)
 			if !assert.NoError(t, err) {
-				troubleshoot, err := kubectl("get", "pods", "-l", podLabel, "-n", namespaceName)
-				assert.NoError(t, err)
+				troubleshoot, troubleshootErr := kubectl("get", "pods", "-l", podLabel, "-n", namespaceName)
+				assert.NoError(t, troubleshootErr)
 				t.Errorf("Current pods: %s", string(troubleshoot))
 			}
 		}