Move to golangci 1.62.0

Moving to the latest version errors out on inactivated linters (that were deprecated earlier). This required commenting out these linters till we ensure we have enabled the required replacements correctly. The linters that are inacivated (and hence commented out) are: deadcode, execinquery, golint, ifshort, maligned, scopelint, strutcheck, varcheck gomnd is replaced by mnd exportloopref is replaced by copyloopvar, but not enabled in this commit to address linter issues in code. Signed-off-by: Shyamsundar Ranganathan <[email protected]>
ELENAGER · Nov 26, 2024 · b0d4702 · b0d4702
1 parent a669424
commit b0d4702
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ramen.yaml b/.github/workflows/ramen.yaml
@@ -93,7 +93,7 @@ jobs:
       - name: GolangCI Lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.55.2
+          version: v1.62.0
           working-directory: ${{ matrix.directory }}
 
   unit-test:

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -103,8 +103,9 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
+    #  - copyloopvar // Additional new replacement for go 1.22 (https://go.dev/blog/loopvar-preview) (deprecating exportloopref)
     - cyclop
-    - deadcode
+    #  - deadcode // Fully deprecated, remove this line once an alternative is enabled for the same
     - decorder
     #  - depguard
     - dogsled
@@ -113,9 +114,8 @@ linters:
     - errcheck
     - errchkjson
     #  - errorlint
-    - execinquery
+    #  - execinquery // Fully deprecated, remove this line once an alternative is enabled for the same
     - exhaustive
-    - exportloopref
     - forbidigo
     - funlen
     - gocognit
@@ -124,24 +124,24 @@ linters:
     - gocyclo
     - gofmt
     - gofumpt
-    - golint
-    - gomnd
+    #  - golint // Fully deprecated, remove this line once an alternative is enabled for the same
     - gomodguard
     - goprintffuncname
     - gosec
     - gosimple
     - govet
     - grouper
-    - ifshort
+    #  - ifshort // Fully deprecated, remove this line once an alternative is enabled for the same
     - importas
     - ineffassign
     - interfacebloat
     - lll
-    - logrlint
+    - loggercheck
     - maintidx
     - makezero
-    - maligned
+    #  - maligned // Fully deprecated, remove this line once an alternative is enabled for the same
     - misspell
+    - mnd
     #  - nakedret
     - nestif
     - nilerr
@@ -155,9 +155,9 @@ linters:
     - reassign
     - revive
     - rowserrcheck
-    - scopelint
+    #  - scopelint // Fully deprecated, remove this line once an alternative is enabled for the same
     - sqlclosecheck
-    - structcheck
+    #  - structcheck // Fully deprecated, remove this line once an alternative is enabled for the same
     - stylecheck
     - tenv
     - testpackage
@@ -168,7 +168,7 @@ linters:
     - unparam
     - unused
     - usestdlibvars
-    - varcheck
+    #  - varcheck // Fully deprecated, remove this line once an alternative is enabled for the same
     - wastedassign
     - whitespace
     - wsl

diff --git a/hack/install-golangci-lint.sh b/hack/install-golangci-lint.sh
@@ -4,7 +4,7 @@ set -e
 script_dir="$(cd "$(dirname "$0")" && pwd)"
 
 source_url="https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh"
-required_version="1.55.2"
+required_version="1.62.0"
 target_dir="${script_dir}/../testbin"
 target_path="${target_dir}/golangci-lint"
 tool="golangci-lint"

diff --git a/internal/controller/drclusterconfig_controller.go b/internal/controller/drclusterconfig_controller.go
@@ -356,7 +356,7 @@ func (r *DRClusterConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	rateLimiter := workqueue.NewTypedMaxOfRateLimiter(
 		workqueue.NewTypedItemExponentialFailureRateLimiter[reconcile.Request](1*time.Second, maxReconcileBackoff),
 		// defaults from client-go
-		//nolint: gomnd
+		//nolint: mnd
 		&workqueue.TypedBucketRateLimiter[reconcile.Request]{Limiter: rate.NewLimiter(rate.Limit(10), 100)},
 	)
 

diff --git a/internal/controller/util/drpolicy_util.go b/internal/controller/util/drpolicy_util.go
@@ -90,7 +90,7 @@ func DRPolicyS3Profiles(drpolicy *rmn.DRPolicy, drclusters []rmn.DRCluster) sets
 	return mustHaveS3Profiles
 }
 
-//nolint:gomnd
+//nolint:mnd
 func GetSecondsFromSchedulingInterval(drpolicy *rmn.DRPolicy) (float64, error) {
 	schedulingInterval := drpolicy.Spec.SchedulingInterval
 	if schedulingInterval == "" {

diff --git a/internal/controller/volumereplicationgroup_controller.go b/internal/controller/volumereplicationgroup_controller.go
@@ -70,7 +70,7 @@ func (r *VolumeReplicationGroupReconciler) SetupWithManager(
 	rateLimiter := workqueue.NewTypedMaxOfRateLimiter(
 		workqueue.NewTypedItemExponentialFailureRateLimiter[reconcile.Request](1*time.Second, 1*time.Minute),
 		// defaults from client-go
-		//nolint: gomnd
+		//nolint: mnd
 		&workqueue.TypedBucketRateLimiter[reconcile.Request]{Limiter: rate.NewLimiter(rate.Limit(10), 100)},
 	)
 	if r.RateLimiter != nil {