bump golangci-lint to v1.55.2 and fix new lint issues (#5941)

Signed-off-by: Steve Kriss <krisss@vmware.com>
projectcontour · Nov 7, 2023 · 19e41e7 · 19e41e7
1 parent eb71e5c
commit 19e41e7
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.2
+          version: v1.55.2
           # TODO: re-enable linting tools package once https://github.com/projectcontour/contour/issues/5077
           # is resolved
           args: --build-tags=e2e,conformance,gcp,oidc,none

diff --git a/.golangci.yml b/.golangci.yml
@@ -59,12 +59,12 @@ linters-settings:
 
 issues:
   exclude-rules:
-  - linters:
-    - unparam
+  - linters: ["unparam"]
     text: "always receives"
   - path: zz_generated
-    linters:
-    - goimports
+    linters: ["goimports"]
   - path: test/e2e
-    linters:
-      - bodyclose
+    linters: ["bodyclose"]
+  - path: test/e2e
+    linters: ["revive"]
+    text: "should not use dot imports"
diff --git a/hack/golangci-lint b/hack/golangci-lint
@@ -1,3 +1,3 @@
 #! /usr/bin/env bash
 
-go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2 "$@"
+go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2 "$@"
diff --git a/internal/dag/policy_test.go b/internal/dag/policy_test.go
@@ -644,6 +644,7 @@ func TestHeadersPolicy(t *testing.T) {
 	}
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
+			tc := tc
 			got, gotErr := headersPolicyService(&tc.dhp, tc.hp, true, dynamicHeaders)
 			if tc.wantErr {
 				assert.Error(t, gotErr)

diff --git a/internal/envoy/v3/bootstrap_test.go b/internal/envoy/v3/bootstrap_test.go
@@ -2056,6 +2056,7 @@ func TestBootstrap(t *testing.T) {
 
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
+			tc := tc
 			steps, gotError := bootstrap(&tc.config)
 			assert.Equal(t, gotError != nil, tc.wantedError)
 

diff --git a/internal/envoy/v3/listener.go b/internal/envoy/v3/listener.go
@@ -828,6 +828,7 @@ func FilterJWTAuth(jwtProviders []dag.JWTProvider) *http.HttpFilter {
 	}
 
 	for _, provider := range jwtProviders {
+		provider := provider
 		var cacheDuration *durationpb.Duration
 		if provider.RemoteJWKS.CacheDuration != nil {
 			cacheDuration = durationpb.New(*provider.RemoteJWKS.CacheDuration)

diff --git a/internal/featuretests/kubernetes.go b/internal/featuretests/kubernetes.go
@@ -32,7 +32,7 @@ func IngressBackend(svc *v1.Service) *networking_v1.IngressBackend {
 	}
 }
 
-// nolint:revive
+// nolint:revive,gosec
 const (
 	// CERTIFICATE generated by
 	// openssl genrsa -out example-key.pem 2048

diff --git a/internal/fixture/certificate_constants.go b/internal/fixture/certificate_constants.go
@@ -13,7 +13,7 @@
 
 package fixture
 
-// nolint:revive
+// nolint:revive,gosec
 const (
 	// CERTIFICATE generated by
 	// openssl genrsa -out example-key.pem 2048

diff --git a/internal/xdscache/v3/endpointslicetranslator_test.go b/internal/xdscache/v3/endpointslicetranslator_test.go
@@ -1008,6 +1008,7 @@ func TestEndpointSliceTranslatorRecomputeClusterLoadAssignment(t *testing.T) {
 	}
 
 	for name, tc := range tests {
+		tc := tc
 		t.Run(name, func(t *testing.T) {
 			endpointSliceTranslator := NewEndpointSliceTranslator(fixture.NewTestLogger(t))
 			require.NoError(t, endpointSliceTranslator.cache.SetClusters([]*dag.ServiceCluster{&tc.cluster}))

diff --git a/internal/xdscache/v3/endpointstranslator_test.go b/internal/xdscache/v3/endpointstranslator_test.go
@@ -799,8 +799,10 @@ func TestEndpointsTranslatorRecomputeClusterLoadAssignment(t *testing.T) {
 	}
 
 	for name, tc := range tests {
+		tc := tc
 		t.Run(name, func(t *testing.T) {
 			et := NewEndpointsTranslator(fixture.NewTestLogger(t))
+			// nolint:gosec
 			require.NoError(t, et.cache.SetClusters([]*dag.ServiceCluster{&tc.cluster}))
 			et.OnAdd(tc.ep, false)
 			got := et.Contents()

diff --git a/internal/xdscache/v3/secret_test.go b/internal/xdscache/v3/secret_test.go
@@ -573,7 +573,7 @@ func backend(name string, port int32) *networking_v1.IngressBackend {
 	}
 }
 
-// nolint:revive
+// nolint:revive,gosec
 const (
 	// CERTIFICATE generated by
 	// openssl genrsa -out example-key.pem 2048