lint: transition to golangci-lint v2

Signed-off-by: Alex Aizman <[email protected]>

Author: alex-aizman

.github/workflows/lint.yml

@@ -26,10 +26,10 @@ jobs:
           go-version: ${{ matrix.go-version }}
 
       - name: Install `golangci-lint`
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           # NOTE: See `lint-update-ci` target in Makefile.
-          version: v1.64.5
+          version: v2.0.2
           args: --timeout=30m
 
       - name: Lint

.golangci.yml

@@ -1,5 +1,11 @@
+version: "2"
+
 linters:
-  disable-all: true
+  default: standard  ## TODO: 'none|standard|all'; enable these 3 with rules
+  disable:
+    - errcheck
+    - gosec
+    # staticcheck
   enable:
     - asciicheck
     - bodyclose
@@ -8,137 +14,173 @@ linters:
     - depguard
     - dogsled
     - dupl
+    - dupword
     - durationcheck
-    - errcheck
+    # errcheck
     - fatcontext
-    # gci
     - gochecksumtype
     - gocritic
-    - gofmt
     - goheader
-    - goimports
     - gomoddirectives
     - goprintffuncname
-    - gosec
-    - gosimple
+    # gosec
     - govet
-    # iface
     - importas
     - ineffassign
     - intrange
     - misspell
-    # nakedret    ## (TODO run/review periodically)
+    # nakedret    ## TODO (wtp)
     - nilnesserr
     - nolintlint
     - perfsprint
     - prealloc
     - protogetter
     - reassign
-    # recvcheck
     - revive
     - staticcheck
     - testpackage
-    - typecheck
     - unconvert
     - unparam
     - unused
     - usetesting
+    - wastedassign
     - whitespace
 
 # See: https://golangci-lint.run/usage/linters/
-linters-settings:
-  ## dupl: ## (TODO run/review periodically)
-  ##   threshold: 100
-  revive:
-    ignore-generated-header: true
-    severity: warning
-    rules:
-      # name: import-shadowing ## (e.g., url)
-      # name: unhandled-error  ## (TODO run/review periodically)
-      # name: line-length-limit
-      # name: dot-imports
-      - name: blank-imports
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: early-return
-      - name: error-naming
-      - name: error-strings
-      - name: exported
-      - name: if-return
-      - name: increment-decrement
-      - name: indent-error-flow
-      - name: modifies-value-receiver
-      - name: package-comments
-      - name: range
-      - name: receiver-naming
-      - name: redefines-builtin-id
-      - name: string-of-int
-      - name: superfluous-else
-      - name: time-naming
-      - name: var-naming
-      - name: var-declaration
-      - name: unconditional-recursion
-      - name: unexported-naming
-      - name: unexported-return
-      - name: unnecessary-stmt
-      - name: unreachable-code
-      - name: unused-parameter
-      - name: unused-receiver
-      - name: waitgroup-by-value
-  gci:
-    skip-generated: true
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment # (TODO run/review periodically)
-      - shadow # (e.g., proxyURL)
-  errcheck:
-    check-blank: true
-    check-type-assertions: false
-  gocritic:
-    enabled-tags:
-      - performance
-      - style
-    disabled-checks:
-      - unnamedResult
-  gosec:
-    excludes: ## integer overflow; weak rand
-      - G115
-      - G402
-      - G404
-  prealloc:
-    simple: true # Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them
-    range-loops: true # Report preallocation suggestions on range loops, true by default
-    for-loops: true # Report preallocation suggestions on for loops, false by default
-  misspell:
-    # Correct spellings using locale preferences for US or UK.
-    # Default is to use a neutral variety of English.
-    # Setting locale to US will correct the British spelling of 'colour' to 'color'.
-    locale: US
-  depguard:
+  settings:
+    dupl:
+      threshold: 150 ## TODO (make it 100; skip test)
+
+    revive:
+      # ignore-generated-header: true
+      severity: warning
+      rules:
+        # name: import-shadowing ## (e.g., url)
+        # name: unhandled-error  ## TODO (wtp)
+        # name: line-length-limit
+        # name: dot-imports
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: early-return
+        - name: error-naming
+        - name: error-strings
+        # name: exported
+        - name: if-return
+        - name: increment-decrement
+        - name: indent-error-flow
+        - name: modifies-value-receiver
+        # name: package-comments  TODO (wtp)
+        - name: range
+        - name: receiver-naming
+        - name: redefines-builtin-id
+        - name: string-of-int
+        - name: superfluous-else
+        - name: time-naming
+        - name: var-naming
+        - name: var-declaration
+        - name: unconditional-recursion
+        - name: unexported-naming
+        - name: unexported-return
+        - name: unnecessary-stmt
+        - name: unreachable-code
+        - name: unused-parameter
+        - name: unused-receiver
+        - name: waitgroup-by-value
+
+    errcheck:
+      check-type-assertions: true
+      check-blank: true
+      disable-default-exclusions: false
+      exclude-functions:
+        - io/ioutil.ReadFile
+        - io.Copy(*bytes.Buffer)
+        - io.Copy(os.Stdout)
+
+    govet:
+      enable-all: true
+      disable:
+        - fieldalignment ## TODO (wtp)
+        - shadow         ## ditto
+
+    gocritic:
+      enabled-tags:
+        - performance
+        - style
+      disabled-checks:
+        - unnamedResult
+        - unnecessaryBlock
+
+    gosec:
+      excludes: ## integer overflow; weak rand
+        - G115
+        - G402
+        - G404
+
+    prealloc:
+      simple: true # Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them
+      range-loops: true # Report preallocation suggestions on range loops, true by default
+      for-loops: true # Report preallocation suggestions on for loops, false by default
+
+    misspell:
+      # Correct spellings using locale preferences for US or UK.
+      # Default is to use a neutral variety of English.
+      # Setting locale to US will correct the British spelling of 'colour' to 'color'.
+      locale: US
+
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: io/ioutil
+              desc: "replaced by io and os packages since Go 1.16: https://tip.golang.org/doc/go1.16#ioutil"
+            - pkg: 'math/rand$'
+              desc: "`math/rand` package has been deprecated use `math/rand/v2`"
+
+  # Defines a set of rules to ignore issues.
+  # It does not skip the analysis, and so does not ignore "typecheck" errors.
+  exclusions:
+    warn-unused: false ## TODO (wtp)
+    # Predefined exclusion rules.
+    # Default: []
+    presets:
+      # comments
+      # std-error-handling
+      # common-false-positives
+      - legacy
+
+    # Excluding configuration per-path, per-linter, per-text and per-source.
     rules:
-      main:
-        deny:
-          - pkg: io/ioutil
-            desc: "replaced by io and os packages since Go 1.16: https://tip.golang.org/doc/go1.16#ioutil"
-          - pkg: 'math/rand$'
-            desc: "`math/rand` package has been deprecated use `math/rand/v2`"
-
-issues:
-  # use default exclude rules
-  exclude-use-default: true
-
-  # additional exclude rules
-  exclude-rules:
-    - linters: [errcheck]
-      text: "Error return value of" # ignores 'error return value of ... is unchecked'
-
-    - linters: [gocritic]
-      text: "block doesn't have definitions" # Sometimes blocks are useful for better readability.
-
-  # Set to 0 to disable limit
-  max-same-issues: 0
-  max-issues-per-linter: 0
+      # Exclude some linters from running on tests files.
+      - path: _test\.go
+        linters:
+          - errcheck
+          - dupl
+          - gosec
+
+      # Exclude some `staticcheck` messages.
+      - linters:
+          - staticcheck
+        text: "QF1008:"
+      # linters:
+      #   - staticcheck
+      # text: "ST1005:"
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+    goimports:
+      local-prefixes:
+        - github.com/NVIDIA/aistore
+  # exclusions:
+    # paths:
+      # test/testdata
 
 run:
   go: '1.24'

Makefile

@@ -265,7 +265,7 @@ lint-update:
 ## See also: .github/workflows/lint.yml
 lint-update-ci:
 	@rm -f $(GOPATH)/bin/golangci-lint
-	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.64.5
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v2.0.2
 
 lint:
 	@([[ -x "$(command -v golangci-lint)" ]] && echo "Cannot find golangci-lint, run 'make lint-update' to install" && exit 1) || true

ais/backend/oci.go

@@ -493,7 +493,7 @@ func (bp *ocibp) PutObj(ctx context.Context, r io.ReadCloser, lom *core.LOM, _ *
 		avoidingMPU bool // true if object size is not known or known to be <= bp.mpuThreshold
 		cloudBck    = lom.Bck().RemoteBck()
 		err         error
-		objectAttrs *cmn.ObjAttrs = lom.ObjAttrs()
+		objectAttrs = lom.ObjAttrs()
 		objectSize  int64
 	)
 

ais/clustermap.go

@@ -255,6 +255,8 @@ func (m *smapX) isValid() bool {
 }
 
 // a stronger version of the above
+//
+//nolint:staticcheck // making an exception for Smap
 func (m *smapX) validate() error {
 	if m == nil {
 		return errors.New(clusterMap + " is <nil>")

ais/prxs3.go

@@ -695,7 +695,7 @@ func (p *proxy) getBckVersioningS3(w http.ResponseWriter, r *http.Request, bucke
 
 // GET /s3/<bucket-name>?lifecycle|cors|policy|acl
 func (p *proxy) unsupported(w http.ResponseWriter, r *http.Request, bucket string) {
-	if _, err, ecode := meta.InitByNameOnly(bucket, p.owner.bmd); err != nil {
+	if _, ecode, err := meta.InitByNameOnly(bucket, p.owner.bmd); err != nil {
 		s3.WriteErr(w, r, err, ecode)
 		return
 	}
@@ -738,7 +738,7 @@ func (p *proxy) putBckVersioningS3(w http.ResponseWriter, r *http.Request, bucke
 //
 
 func (p *proxy) initByNameOnly(w http.ResponseWriter, r *http.Request, bucket string) *meta.Bck {
-	bck, err, ecode := meta.InitByNameOnly(bucket, p.owner.bmd)
+	bck, ecode, err := meta.InitByNameOnly(bucket, p.owner.bmd)
 	if err != nil {
 		s3.WriteErr(w, r, err, ecode)
 		return nil

ais/test/downloader_test.go

@@ -720,7 +720,7 @@ func TestDownloadStatusError(t *testing.T) {
 	invalidAddressCausedError := resp.Errs[0].Name == "invalidURL" || resp.Errs[1].Name == "invalidURL"
 	notFoundFileCausedError := resp.Errs[0].Name == "notFoundFile" || resp.Errs[1].Name == "notFoundFile"
 
-	if !(invalidAddressCausedError && notFoundFileCausedError) {
+	if !invalidAddressCausedError || !notFoundFileCausedError {
 		t.Errorf("expected objects that cause errors to be (%s, %s), but got: (%s, %s)",
 			"invalidURL", "notFoundFile", resp.Errs[0].Name, resp.Errs[1].Name)
 	}

ais/test/dsort_test.go

@@ -1,4 +1,3 @@
-//nolint:dupl // copy-paste benign and can wait
 // Package integration_test.
 /*
  * Copyright (c) 2018-2025, NVIDIA CORPORATION. All rights reserved.
@@ -443,12 +442,13 @@ outer:
 			}
 
 			for _, file := range files {
-				if df.alg.Kind == "" || df.alg.Kind == dsort.Alphanumeric {
+				switch df.alg.Kind {
+				case "", dsort.Alphanumeric:
 					if lastName > file.Name() && canonicalName(lastName) != canonicalName(file.Name()) {
 						df.m.t.Fatalf("%s: names out of order (shard: %s, lastName: %s, curName: %s)",
 							df.job(), shardName, lastName, file.Name())
 					}
-				} else if df.alg.Kind == dsort.Shuffle {
+				case dsort.Shuffle:
 					if lastName > file.Name() {
 						inversions++
 					}
@@ -515,10 +515,7 @@ func (df *dsortFramework) checkOutputShardsWithEKM(ekm *shard.ExternalKeyMap) {
 	for tmpl, pool := range shardNamePools {
 		pt, _ := cos.NewParsedTemplate(tmpl)
 		pt.InitIter()
-		for {
-			if len(pool) == 0 {
-				break
-			}
+		for len(pool) > 0 {
 			shardName, hasNext := pt.Next()
 			if !hasNext {
 				df.m.t.Fatalf("Shard name template (%v) does not match the corresponding shard name pool, remaining names: %v", tmpl, pool)