Update golangci-lint and zerolint version

eikemeier · eikemeier · commit aa141d880a98 · 2025-04-07T15:45:22.000+02:00
Signed-off-by: Oliver Eikemeier &lt;eikemeier@fillmore-labs.com&gt;
diff --git a/.custom-gcl.yaml b/.custom-gcl.yaml
@@ -1,5 +1,5 @@
 ---
-version: v1.63.4
+version: v2.0.2
 plugins:
   - module: fillmore-labs.com/zerolint-golangci-plugin
     path: .
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        go-version: ["1.24.0-rc.3", "1.23.6", "1.22.12"]
+        go-version: ["1.24.2", "1.23.8"]
     env:
       GOTOOLCHAIN: local
     steps:
@@ -29,9 +29,9 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
       - name: 🧸 golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.63.4
+          version: v2.0.2
           args: --config=.golangci-default.yaml
       - name: 🔨 Test
         run: golangci-lint custom -v && ./custom-gcl run -v .
diff --git a/.golangci-default.yaml b/.golangci-default.yaml
@@ -1,12 +1,19 @@
 ---
+version: "2"
+
 run:
   modules-download-mode: readonly
+
+formatters:
+  enable:
+    - gofumpt
+  settings:
+    gofumpt:
+      module-path: fillmore-labs.com/zerolint
+
 linters:
-  enable-all: true
+  default: all
   disable:
-    # deprecated
-    - exportloopref
-    # disabled
     - depguard
     - dupl
     - exhaustruct
@@ -15,34 +22,69 @@ linters:
     - varnamelen
     - wrapcheck
     - wsl
-linters-settings:
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment
-    settings:
-      shadow:
-        strict: true
-  testifylint:
-    enable-all: true
-    disable:
-      - require-error
-  ireturn:
-    allow:
-      - anon
-      - error
-      - empty
-      - stdlib
-      - generic
-  predeclared:
-    ignore: "new"
-issues:
-  exclude-rules:
-    - path: _test\.go$
-      linters:
-        - revive
-      text: "dot-imports"
-    - path: _test\.go$
-      linters:
-        - govet
-      text: "lostcancel"
+  settings:
+    errcheck:
+      exclude-functions:
+        - (io/fs.File).Close
+    govet:
+      enable-all: true
+      disable:
+        - fieldalignment
+      settings:
+        shadow:
+          strict: true
+    testifylint:
+      enable-all: true
+      disable:
+        - require-error
+    ireturn:
+      allow:
+        - anon
+        - error
+        - empty
+        - stdlib
+        - generic
+    predeclared:
+      ignore: ["new"]
+    revive:
+      rules:
+        - name: atomic
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+          exclude: ["TEST"]
+        - name: early-return
+        - name: error-return
+        - name: error-strings
+        - name: error-naming
+        - name: increment-decrement
+        - name: var-naming
+        - name: var-declaration
+        - name: range
+        - name: receiver-naming
+        - name: time-naming
+        - name: unexported-return
+        - name: indent-error-flow
+        - name: errorf
+        - name: empty-block
+        - name: superfluous-else
+        - name: unused-parameter
+        - name: unreachable-code
+        - name: redefines-builtin-id
+        - name: file-header
+          arguments:
+            - "Copyright 2024 Oliver Eikemeier. All Rights Reserved."
+  exclusions:
+    rules:
+      - path: _test\.go$
+        linters:
+          - govet
+        text: "lostcancel"
+      - path: ^main\.go$
+        linters:
+          - gocheckcompilerdirectives
+        text: "go:debug"
+      - linters:
+          - govet
+        text: '^shadow: declaration of "(ctx|err|ok)" shadows declaration at line \d+$'
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,14 +1,17 @@
 ---
+version: "2"
+
 run:
-  go: "1.22.9"
+  go: 1.23.8
   modules-download-mode: readonly
+
 linters:
   enable:
     - zerolint
-linters-settings:
-  custom:
-    zerolint:
-      type: module
-      settings:
-        excluded: []
-        basic: true
+  settings:
+    custom:
+      zerolint:
+        type: module
+        settings:
+          full: false
+          excluded: []
diff --git a/README.md b/README.md
@@ -10,10 +10,10 @@ Add a file `.custom-gcl.yaml` to your source with
 
 ```YAML
 ---
-version: v1.63.4
+version: v2.0.2
 plugins:
   - module: fillmore-labs.com/zerolint-golangci-plugin
-    version: v0.0.7
+    version: v0.0.8
 ```
 
 then run `golangci-lint custom`. You get an `custom-gcl` executable that can be configured in `.golangci.yaml`:
@@ -23,13 +23,13 @@ then run `golangci-lint custom`. You get an `custom-gcl` executable that can be
 linters:
   enable:
     - zerolint
-linters-settings:
-  custom:
-    zerolint:
-      type: "module"
-      settings:
-        basic: false
-        excluded: []
+  settings:
+    custom:
+      zerolint:
+        type: module
+        settings:
+          full: false
+          excluded: []
 ```
 
 and can be used like `golangci-lint`:
diff --git a/go.mod b/go.mod
@@ -1,11 +1,11 @@
 module fillmore-labs.com/zerolint-golangci-plugin
 
-go 1.22.0
+go 1.23.0
 
-toolchain go1.23.6
+toolchain go1.24.2
 
 require (
-	fillmore-labs.com/zerolint v0.0.7
+	fillmore-labs.com/zerolint v0.0.8
 	github.com/golangci/plugin-module-register v0.1.1
-	golang.org/x/tools v0.29.0
+	golang.org/x/tools v0.31.0
 )
diff --git a/go.sum b/go.sum
@@ -1,10 +1,10 @@
-fillmore-labs.com/zerolint v0.0.7 h1:ffxijMuW4Zm2550MFbWEwVBYavpOyANIWBpfnXJxmMM=
-fillmore-labs.com/zerolint v0.0.7/go.mod h1:+qGQ3b6Fp26aWFFU0OXPyEeUrUuD6zXleM7aaS4ZzSE=
+fillmore-labs.com/zerolint v0.0.8 h1:AqtUcOqRBXExBk0RoOmgVS7c/s17ICfvhYLG1ZUXWdI=
+fillmore-labs.com/zerolint v0.0.8/go.mod h1:4ZBySqMSeBOwT4Q3nUl0NUS2/RvhDNTvgIhybmABdRA=
 github.com/golangci/plugin-module-register v0.1.1 h1:TCmesur25LnyJkpsVrupv1Cdzo+2f7zX0H6Jkw1Ol6c=
 github.com/golangci/plugin-module-register v0.1.1/go.mod h1:TTpqoB6KkwOJMV8u7+NyXMrkwwESJLOkfl9TxR1DGFc=
-golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
-golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
-golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
+golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
diff --git a/plugin.go b/plugin.go
@@ -1,3 +1,19 @@
+// Copyright 2024 Oliver Eikemeier. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package plugin
 
 import (
@@ -15,7 +31,7 @@ func init() { //nolint:gochecknoinits
 
 type Settings struct {
 	Excluded []string `json:"excluded"`
-	Basic    bool     `json:"basic"`
+	Full     bool     `json:"full"`
 }
 
 func New(settings any) (register.LinterPlugin, error) { //nolint:ireturn
@@ -34,7 +50,7 @@ type Plugin struct {
 func (p Plugin) BuildAnalyzers() ([]*analysis.Analyzer, error) {
 	run := analyzer.NewRun(
 		analyzer.WithExcludes(p.settings.Excluded),
-		analyzer.WithBasic(p.settings.Basic),
+		analyzer.WithFull(p.settings.Full),
 		analyzer.WithGenerated(true),
 	)
 
