Merge pull request #1572 from camilamacedo86/up-lint-fix

upgrade lint version and perform fixes
kubernetes-sigs · Jun 25, 2020 · 8c19293 · 8c19293
2 parents b98c08f + d617752
commit 8c19293
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ script: ./test.sh
 jobs:
   include:
     - stage: linting
-      before_script: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.3
+      before_script: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.27.0
       script: make lint
       after_success: echo "Linting check succeeded"
       after_failure: echo "Linting check failed. Run make lint to check it locally"

diff --git a/pkg/cli/plugins_test.go b/pkg/cli/plugins_test.go
@@ -96,7 +96,7 @@ var _ = Describe("resolvePluginsByKey", func() {
 		_, err = resolvePluginsByKey(plugins, "foo.example.com/v2")
 		Expect(err).To(MatchError(errAmbiguousPlugin{
 			key: "foo.example.com/v2",
-			msg: fmt.Sprintf(`no versions match, possible plugins: ["foo.example.com/v1"]`),
+			msg: `no versions match, possible plugins: ["foo.example.com/v1"]`,
 		}))
 
 		By("resolving foo/v3")

diff --git a/pkg/plugin/v2/scaffolds/edit.go b/pkg/plugin/v2/scaffolds/edit.go
@@ -68,7 +68,8 @@ func (s *editScaffolder) Scaffold() error {
 			return err
 		}
 	}
-
+	// false positive
+	// nolint:gosec
 	return ioutil.WriteFile(filename, []byte(str), 0644)
 }
 

diff --git a/pkg/plugin/v3/scaffolds/edit.go b/pkg/plugin/v3/scaffolds/edit.go
@@ -68,7 +68,8 @@ func (s *editScaffolder) Scaffold() error {
 			return err
 		}
 	}
-
+	// false positive
+	// nolint:gosec
 	return ioutil.WriteFile(filename, []byte(str), 0644)
 }
 

diff --git a/test/e2e/utils/util.go b/test/e2e/utils/util.go
@@ -65,6 +65,8 @@ func InsertCode(filename, target, code string) error {
 	}
 	idx := strings.Index(string(contents), target)
 	out := string(contents[:idx+len(target)]) + code + string(contents[idx+len(target):])
+	// false positive
+	// nolint:gosec
 	return ioutil.WriteFile(filename, []byte(out), 0644)
 }
 
@@ -100,6 +102,7 @@ func UncommentCode(filename, target, prefix string) error {
 	if err != nil {
 		return err
 	}
-
+	// false positive
+	// nolint:gosec
 	return ioutil.WriteFile(filename, out.Bytes(), 0644)
 }
diff --git a/test/e2e/v2/e2e_suite.go b/test/e2e/v2/e2e_suite.go
@@ -377,7 +377,8 @@ func implementWebhooks(filename string) error {
 	if err != nil {
 		return err
 	}
-
+	// false positive
+	// nolint:gosec
 	return ioutil.WriteFile(filename, []byte(str), 0644)
 }
 

diff --git a/test/e2e/v3/e2e_suite.go b/test/e2e/v3/e2e_suite.go
@@ -377,7 +377,8 @@ func implementWebhooks(filename string) error {
 	if err != nil {
 		return err
 	}
-
+	// false positive
+	// nolint:gosec
 	return ioutil.WriteFile(filename, []byte(str), 0644)
 }