Bump Go to 1.23, fix lint, disable gosec

fxiang1 · fxiang1 · commit 2c9554f129b1 · 2025-03-27T14:03:22.000-04:00
Signed-off-by: fxiang1 &lt;fxiang@redhat.com&gt;
diff --git a/.github/workflows/go-postsubmit.yml b/.github/workflows/go-postsubmit.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.21'
+  GO_VERSION: '1.23'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/multicloud-operators-channel/multicloud-operators-channel/go'
 defaults:
diff --git a/.github/workflows/go-presubmit.yml b/.github/workflows/go-presubmit.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.21'
+  GO_VERSION: '1.23'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/multicloud-operators-channel/multicloud-operators-channel/go'
 defaults:
diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml
@@ -6,7 +6,7 @@ on:
       - 'v*.*.*'
 env:
   # Common versions
-  GO_VERSION: '1.21'
+  GO_VERSION: '1.23'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/multicloud-operators-channel/multicloud-operators-channel/go'
   GITHUB_REF: ${{ github.ref }}
diff --git a/build/run-code-lint.sh b/build/run-code-lint.sh
@@ -37,7 +37,7 @@ gem install mdl
 gem install awesome_bot
 
 # Install golangci-lint
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.57.2
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.60.2
 
 # Start lint task
 make -f Makefile.prow lint-all
diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml
@@ -1,6 +1,6 @@
 service:
   # When updating this, also update the version stored in docker/build-tools/Dockerfile in the multicloudlab/tools repo.
-  golangci-lint-version: 1.57.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.60.x # use the fixed version to not introduce new linters unexpectedly
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
   deadline: 20m
@@ -12,16 +12,18 @@ linters:
     - bodyclose
     - containedctx
     - contextcheck
+    - copyloopvar
     - cyclop
-    - deadcode
     - depguard
     - dupl
     - forbidigo
     - funlen
     - errchkjson
     - exhaustive
     - exhaustruct
-    - exhaustivestruct
+    - exportloopref
+    - execinquery
+    - err113
     - forcetypeassert
     - gci
     - ginkgolinter
@@ -31,44 +33,35 @@ linters:
     - gocritic
     - gocyclo
     - godot
-    - goerr113
     - gofumpt
-    - golint
     - gomnd
     - gomoddirectives
     - gosec
-    - ifshort
     - ineffassign
     - interfacebloat
-    - interfacer
     - ireturn
     - loggercheck
     - maintidx 
-    - maligned
     - musttag
+    - mnd
     - nakedret
     - nestif
     - nilerr
     - nilnil
     - nlreturn
     - noctx
-    - nosnakecase
     - nonamedreturns
-    - nosnakecase
     - paralleltest
     - prealloc
     - predeclared
     - rowserrcheck
-    - scopelint
     - staticcheck
-    - structcheck
     - sqlclosecheck
     - tagliatelle
     - tenv
     - testpackage
     - thelper
     - usestdlibvars
-    - varcheck
     - varnamelen
     - wastedassign
     - wrapcheck
diff --git a/common/scripts/lint_go.sh b/common/scripts/lint_go.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.2
 
 export GOLANGCI_LINT_CACHE=/tmp/golangci-cache
 rm -rf $GOLANGCI_LINT_CACHE
diff --git a/pkg/log/zap/flags.go b/pkg/log/zap/flags.go
@@ -122,7 +122,7 @@ func (v *levelValue) Set(l string) error {
 		return err
 	}
 
-	v.level = zapcore.Level(int8(lvl))
+	v.level = zapcore.Level(int8(lvl)) //nolint:gosec // disable G115
 	// If log level is greater than debug, set glog/klog level to that level.
 	if lvl < -3 {
 		fs := flag.NewFlagSet("", flag.ContinueOnError)
@@ -158,7 +158,7 @@ func (v *stackLevelValue) Set(l string) error {
 		return err
 	}
 
-	v.level = zapcore.Level(int8(lvl))
+	v.level = zapcore.Level(int8(lvl)) //nolint:gosec // disable G115
 
 	return nil
 }
diff --git a/pkg/webhook/wireupwebhook.go b/pkg/webhook/wireupwebhook.go
@@ -394,7 +394,7 @@ func newWebhookServiceTemplate(isExternalAPIServer bool, svcKey types.Namespaced
 			Spec: corev1.ServiceSpec{
 				Ports: []corev1.ServicePort{
 					{
-						Port: int32(webHookServicePort),
+						Port: int32(webHookServicePort), //nolint:gosec // disable G115
 					},
 				},
 			},
@@ -413,7 +413,7 @@ func newWebhookServiceTemplate(isExternalAPIServer bool, svcKey types.Namespaced
 		Spec: corev1.ServiceSpec{
 			Ports: []corev1.ServicePort{
 				{
-					Port:       int32(webHookServicePort),
+					Port:       int32(webHookServicePort), //nolint:gosec // disable G115
 					TargetPort: intstr.FromInt(webHookPort),
 				},
 			},
@@ -441,7 +441,7 @@ func newWebhookEndpointTemplate(svcKey types.NamespacedName, webHookServicePort
 				},
 				Ports: []corev1.EndpointPort{
 					{
-						Port: int32(webHookServicePort),
+						Port: int32(webHookServicePort), //nolint:gosec // disable G115
 					},
 				},
 			},

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func (v *levelValue) Set(l string) error {`
`122`	`122`	`return err`
`123`	`123`	`}`
`124`	`124`
`125`		`- v.level = zapcore.Level(int8(lvl))`
	`125`	`+ v.level = zapcore.Level(int8(lvl)) //nolint:gosec // disable G115`
`126`	`126`	`// If log level is greater than debug, set glog/klog level to that level.`
`127`	`127`	`if lvl < -3 {`
`128`	`128`	`fs := flag.NewFlagSet("", flag.ContinueOnError)`
`@@ -158,7 +158,7 @@ func (v *stackLevelValue) Set(l string) error {`
`158`	`158`	`return err`
`159`	`159`	`}`
`160`	`160`
`161`		`- v.level = zapcore.Level(int8(lvl))`
	`161`	`+ v.level = zapcore.Level(int8(lvl)) //nolint:gosec // disable G115`
`162`	`162`
`163`	`163`	`return nil`
`164`	`164`	`}`