From 1220304a618d1eaf409789d1768a316d0f71e7aa Mon Sep 17 00:00:00 2001
From: Steve Yegge <stevey@sourcegraph.com>
Date: Fri, 24 Oct 2025 00:14:57 -0700
Subject: [PATCH] Fix golangci-lint config for v2+ format compatibility

---
 .golangci.yml | 105 ++++++++++++++++++++++----------------------------
 1 file changed, 47 insertions(+), 58 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 2bef5f8e..76466d00 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,12 +1,8 @@
-version: "2"
-
 run:
   timeout: 5m
   tests: true
 
 linters:
-  default: standard
-
   enable:
     - dupl
     - goconst
@@ -17,62 +13,55 @@ linters:
     - unconvert
     - unparam
 
-  settings:
-    dupl:
-      threshold: 100
-    errcheck:
-      check-type-assertions: true
-      check-blank: false
-      exclude-functions:
-        - (*database/sql.DB).Close
-        - (*database/sql.Rows).Close
-        - (*database/sql.Tx).Rollback
-    goconst:
-      min-len: 3
-      min-occurrences: 3
-    gocyclo:
-      min-complexity: 15
-    misspell:
-      locale: US
-    revive:
-      rules:
-        - name: var-naming
-        - name: exported
-
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+linters-settings:
+  dupl:
+    threshold: 100
+  errcheck:
+    check-type-assertions: true
+    check-blank: false
+    exclude-functions:
+      - (*database/sql.DB).Close
+      - (*database/sql.Rows).Close
+      - (*database/sql.Tx).Rollback
+  goconst:
+    min-len: 3
+    min-occurrences: 3
+  gocyclo:
+    min-complexity: 15
+  misspell:
+    locale: US
+  revive:
     rules:
-      - path: _test\.go
-        linters:
-          - dupl
-          - errcheck
-          - goconst
-          - gocyclo
-      - path: (.+)\.go$
-        text: Error return value.*\.Close.*is not checked
-      - path: (.+)\.go$
-        text: Error return value.*\.Rollback.*is not checked
-      - path: (.+)\.go$
-        text: Error return value.*\.RemoveAll.*is not checked
-      - path: (.+)\.go$
-        text: 'unused-parameter: parameter ''cmd'' seems to be unused'
-      - path: (.+)\.go$
-        text: 'unused-parameter: parameter ''args'' seems to be unused'
-      - path: (.+)\.go$
-        text: 'var-naming: avoid meaningless package names'
-      - path: (.+)\.go$
-        text: exported.*SQLiteStorage.*stutters
-      - path: (.+)\.go$
-        text: 'G201: SQL string formatting'
-      - path: (.+)\.go$
-        text: G304.*file inclusion via variable
-      - path: (.+)\.go$
-        text: 'G301: Expect directory permissions'
+      - name: var-naming
+      - name: exported
 
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - dupl
+        - errcheck
+        - goconst
+        - gocyclo
+    - path: (.+)\.go$
+      text: Error return value.*\.Close.*is not checked
+    - path: (.+)\.go$
+      text: Error return value.*\.Rollback.*is not checked
+    - path: (.+)\.go$
+      text: Error return value.*\.RemoveAll.*is not checked
+    - path: (.+)\.go$
+      text: 'unused-parameter: parameter ''cmd'' seems to be unused'
+    - path: (.+)\.go$
+      text: 'unused-parameter: parameter ''args'' seems to be unused'
+    - path: (.+)\.go$
+      text: 'var-naming: avoid meaningless package names'
+    - path: (.+)\.go$
+      text: exported.*SQLiteStorage.*stutters
+    - path: (.+)\.go$
+      text: 'G201: SQL string formatting'
+    - path: (.+)\.go$
+      text: G304.*file inclusion via variable
+    - path: (.+)\.go$
+      text: 'G301: Expect directory permissions'