Merge pull request #226 from cpanato/update-go

Update go.mod to be min 1.19 and golangci-lint
kubernetes-sigs · Mar 25, 2023 · 06323f4 · 06323f4
2 parents f9fcedf + 938a274
commit 06323f4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -15,7 +15,6 @@ linters:
   enable:
     - asciicheck
     - bodyclose
-    - deadcode
     - depguard
     - dogsled
     - dupl
@@ -40,13 +39,11 @@ linters:
     - rowserrcheck
     - sqlclosecheck
     - staticcheck
-    - structcheck
     - stylecheck
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
 
 linters-settings:

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/e2e-framework
 
-go 1.18
+go 1.19
 
 require (
 	github.com/vladimirvivien/gexe v0.2.0

diff --git a/hack/verify-golangci-lint.sh b/hack/verify-golangci-lint.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-VERSION=v1.46.2
+VERSION=v1.52.0
 URL_BASE=https://raw.githubusercontent.com/golangci/golangci-lint
 URL=$URL_BASE/$VERSION/install.sh
 

diff --git a/klient/decoder/decoder.go b/klient/decoder/decoder.go
@@ -332,7 +332,7 @@ func IgnoreErrorHandler(handler HandlerFunc, errorMatcher func(err error) bool)
 }
 
 // NoopHandler returns a Handler func that only returns nil
-func NoopHandler(r *resources.Resources, opts ...resources.DeleteOption) HandlerFunc {
+func NoopHandler(_ *resources.Resources, _ ...resources.DeleteOption) HandlerFunc {
 	return func(ctx context.Context, obj k8s.Object) error {
 		return nil
 	}