Merge pull request #1790 from jtobin/golangci-migrate-v2

tools: migrate linter config to v2

Author: GeorgeTsagk

.golangci.yml

@@ -1,77 +1,90 @@
-run:
-  # timeout for analysis
-  timeout: 10m
-
-linters-settings:
-  errorlint:
-    comparison: false
-    asserts: false
-  gofmt:
-    # simplify code: gofmt with `-s` option, true by default
-    simplify: true
-  tagliatelle:
-    case:
-      rules:
-        json: snake
-  whitespace:
-    multi-func: true
-    multi-if: true
-  gosec:
-    excludes:
-      - G402 # Look for bad TLS connection settings.
-      - G306 # Poor file permissions used when writing to a new file.
-      - G601 # Implicit memory aliasing in for loop.
-      - G115 # Integer overflow conversion.
-  exhaustive:
-    default-signifies-exhaustive: true
-  gocritic:
-    disabled-checks:
-      - unslice
-      - captLocal
-      - underef
-      - appendAssign
-      - exitAfterDefer
-  staticcheck:
-    checks: ['-SA1019']
-  lll:
-    # Max line length, lines longer will be reported.
-    line-length: 80
-    # Tab width in spaces.
-    tab-width: 8
-
+version: "2"
 linters:
   enable:
     - errorlint
-    - gofmt
-    - govet
-    - staticcheck
-    - tagliatelle
-    - whitespace
-    - gosec
-    - unused
-    - gocritic
-    - unconvert
-    - nilerr
     - exhaustive
+    - gocritic
+    - gosec
     - lll
-
+    - nilerr
+    - tagliatelle
+    - unconvert
+    - whitespace
+  settings:
+    errorlint:
+      asserts: false
+      comparison: false
+    exhaustive:
+      default-signifies-exhaustive: true
+    gocritic:
+      disabled-checks:
+        - unslice
+        - captLocal
+        - underef
+        - appendAssign
+        - exitAfterDefer
+    gosec:
+      excludes:
+        - G402 # Look for bad TLS connection settings
+        - G306 # Poor file permissions used when writing to a new file.
+        - G601 # Implicit memory aliasing in for loop.
+        - G115 # Integer overflow conversion.
+    lll:
+      # Max line length, lines longer will be reported.
+      line-length: 80
+      # Tab width in spaces.
+      tab-width: 8
+    staticcheck:
+      checks:
+        - -SA1019
+    tagliatelle:
+      case:
+        rules:
+          json: snake
+    whitespace:
+      multi-if: true
+      multi-func: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      # Exclude gosec from running for tests so that tests with weak randomness
+      # (math/rand) will pass the linter.
+      - linters:
+          - gosec
+        path: _test\.go
+      - linters:
+          - gosec
+        path: mock.go
+      - linters:
+          - gosec
+        path: internal/test/.*
+      # Fix false positives because of build flags in itest directory.
+      - linters:
+          - deadcode
+          - unused
+          - varcheck
+        path: itest/.*
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude-rules:
-    # Exclude gosec from running for tests so that tests with weak randomness
-    # (math/rand) will pass the linter.
-    - path: _test\.go
-      linters:
-        - gosec
-    - path: mock.go
-      linters:
-        - gosec
-    - path: internal/test/.*
-      linters:
-        - gosec
-    # Fix false positives because of build flags in itest directory.
-    - path: itest/.*
-      linters:
-        - unused
-        - deadcode
-        - varcheck
   new-from-rev: 002f4ac35f343797e0a1a07a505c65a94d9dd4b3
+formatters:
+  enable:
+    - gofmt
+  settings:
+    gofmt:
+      # simplify code: gofmt with `-s` option, true by default
+      simplify: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

tools/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23.12-bookworm
+FROM golang:1.24.5-bookworm
 
 RUN apt-get update && apt-get install -y git
 ENV GOCACHE=/tmp/build/.cache
@@ -10,7 +10,7 @@ RUN cd /tmp \
   && mkdir -p /tmp/build/.cache \
   && mkdir -p /tmp/build/.modcache \
   && cd /tmp/tools \
-  && go install -trimpath github.com/golangci/golangci-lint/cmd/golangci-lint \
+  && go install -trimpath github.com/golangci/golangci-lint/v2/cmd/golangci-lint \
   && chmod -R 777 /tmp/build/ \
   && git config --global --add safe.directory /build