Upgrade golangci-lint to v2

Author: System-Glitch

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ["1.23", "1.24"]
+        go: ["1.24"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -38,9 +38,9 @@ jobs:
           go-version: "1.24"
           cache: false
       - name: Run lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.64
+          version: v2.1
           args: --timeout 5m
 
   govulncheck:

.golangci.yml

@@ -1,64 +1,81 @@
-linters-settings:
-  gocyclo:
-    min-complexity: 25
-  gofmt:
-    simplify: true
-  misspell:
-    locale: US
-  govet:
-    disable:
-      - shadow
-      - nilness
-    enable-all: true
-  errcheck:
-    exclude-functions:
-      - (*gorm.io/gorm.DB).AddError
-  testifylint:
-    disable:
-      - require-error
-      - error-nil
-      - formatter
-      - encoded-compare
-  revive:
-    rules:
-      - name: var-naming
-        arguments:
-          - [] # AllowList
-          - ["DTO"] # DenyList
-      - name: unused-parameter
-        disabled: false
-
+version: "2"
 linters:
   enable:
-    - gofmt
-    - revive
+    - bodyclose
+    - copyloopvar
     - gocyclo
+    - inamedparam
     - misspell
-    - bodyclose
+    - revive
+    - testifylint
+    - whitespace
     - govet
     - unused
     - errcheck
-    - copyloopvar
-    - gosimple
     - ineffassign
     - staticcheck
-    - testifylint
-    - whitespace
-    - bodyclose
-    - inamedparam
-  disable-all: false
-  fast: false
-
+  settings:
+    errcheck:
+      exclude-functions:
+        - (*gorm.io/gorm.DB).AddError
+    gocyclo:
+      min-complexity: 25
+    govet:
+      disable:
+        - shadow
+        - nilness
+      enable-all: true
+    misspell:
+      locale: US
+    revive:
+      rules:
+        - name: var-naming
+          disabled: false
+          arguments:
+            - [] # AllowList
+            - ["DTO"] # DenyList
+        - name: unused-parameter
+          disabled: false
+    testifylint:
+      disable:
+        - require-error
+        - error-nil
+        - formatter
+        - encoded-compare
+    staticcheck:
+      checks:
+        [
+          "all",
+          "-ST1000",
+          "-ST1003",
+          "-ST1016",
+          "-ST1020",
+          "-ST1021",
+          "-ST1022",
+          "-QF1001",
+        ]
+  exclusions:
+    generated: strict
+    rules:
+      - linters:
+          - gocyclo
+        path: _test\.go
+      - path: (.+)\.go$
+        text: should have a package comment
+      - path: (.+)\.go$
+        text: type name will be used as filter.FilterValidator by other packages, and that stutters; consider calling this Validator
+    paths:
+      - .github
 issues:
-  exclude-use-default: false
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude-dirs:
-    - .github
-  exclude:
-    - should have a package comment
-    - type name will be used as filter.FilterValidator by other packages, and that stutters; consider calling this Validator
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - gocyclo
+formatters:
+  enable:
+    - gofmt
+  settings:
+    gofmt:
+      simplify: true
+  exclusions:
+    generated: strict
+    paths:
+      - .github

join.go

@@ -213,7 +213,7 @@ func findStatementJoin(stmt *gorm.Statement, join *clause.Join) bool {
 
 func quoteString(stmt *gorm.Statement, str string) string {
 	writer := bytes.NewBufferString("")
-	stmt.DB.Dialector.QuoteTo(writer, str)
+	stmt.Dialector.QuoteTo(writer, str)
 	return writer.String()
 }