Update golangci-lint and zerolint version

Signed-off-by: Oliver Eikemeier <[email protected]>

Author: eikemeier

.custom-gcl.yaml

@@ -1,5 +1,5 @@
 ---
-version: v2.1.1
+version: v2.1.6
 plugins:
   - module: fillmore-labs.com/zerolint-golangci-plugin
     path: .

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        go-version: ["1.24.2", "1.23.8"]
+        go-version: ["1.24.3", "1.23.9"]
     env:
       GOTOOLCHAIN: local
     steps:
@@ -29,9 +29,9 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
       - name: 🧸 golangci-lint
-        uses: golangci/golangci-lint-action@v7
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.1.1
+          version: v2.1.6
           args: --config=.golangci-default.yaml
       - name: 🔨 Test
         run: golangci-lint custom -v && ./custom-gcl run -v .

.golangci-default.yaml

@@ -7,9 +7,6 @@ run:
 formatters:
   enable:
     - gofumpt
-  settings:
-    gofumpt:
-      module-path: fillmore-labs.com/zerolint
 
 linters:
   default: all
@@ -21,7 +18,6 @@ linters:
     - nonamedreturns
     - varnamelen
     - wrapcheck
-    - wsl
   settings:
     errcheck:
       exclude-functions:

.golangci.yaml

@@ -2,7 +2,7 @@
 version: "2"
 
 run:
-  go: 1.23.8
+  go: 1.23.9
   modules-download-mode: readonly
 
 linters:
@@ -12,6 +12,11 @@ linters:
     custom:
       zerolint:
         type: module
+        description: "zerolint checks usage patterns of pointers to zero-size types."
+        original-url: "https://fillmore-labs.com/zerolint"
         settings:
-          full: false
-          excluded: []
+          level: "full"
+          excluded:
+            - "struct{}"
+          generated: true
+          match: "^.*$"

README.md

@@ -10,26 +10,32 @@ Add a file `.custom-gcl.yaml` to your source with
 
 ```YAML
 ---
-version: v2.1.1
+version: v2.1.6
 plugins:
   - module: fillmore-labs.com/zerolint-golangci-plugin
-    version: v0.0.8
+    version: v0.0.9
 ```
 
 then run `golangci-lint custom`. You get an `custom-gcl` executable that can be configured in `.golangci.yaml`:
 
 ```YAML
 ---
+version: "2"
 linters:
   enable:
     - zerolint
   settings:
     custom:
       zerolint:
         type: module
+        description: "zerolint checks usage patterns of pointers to zero-size types."
+        original-url: "https://fillmore-labs.com/zerolint"
         settings:
-          full: false
-          excluded: []
+          level: "full"
+          excluded:
+            - "struct{}"
+          generated: true
+          match: "^your\\.domain/package/path"
 ```
 
 and can be used like `golangci-lint`:

go.mod

@@ -2,10 +2,10 @@ module fillmore-labs.com/zerolint-golangci-plugin
 
 go 1.23.0
 
-toolchain go1.24.2
+toolchain go1.24.3
 
 require (
-	fillmore-labs.com/zerolint v0.0.8
-	github.com/golangci/plugin-module-register v0.1.1
-	golang.org/x/tools v0.32.0
+	fillmore-labs.com/zerolint v0.0.9
+	github.com/golangci/plugin-module-register v0.1.2
+	golang.org/x/tools v0.33.0
 )

go.sum

@@ -1,10 +1,10 @@
-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=
+fillmore-labs.com/zerolint v0.0.9 h1:sh6jTmGHWEsMxQYSfsOmF9zyOZoQNXOPE5wP3W1MF1s=
+fillmore-labs.com/zerolint v0.0.9/go.mod h1:0V0kIS+x40wjQjQJGcAK0V9/H1T6rAvoy5oQo9Ue+5A=
+github.com/golangci/plugin-module-register v0.1.2 h1:e5WM6PO6NIAEcij3B053CohVp3HIYbzSuP53UAYgOpg=
+github.com/golangci/plugin-module-register v0.1.2/go.mod h1:1+QGTsKBvAIvPvoY/os+G5eoqxWn70HYDm2uvUyGuVw=
 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.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
-golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
+golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=

plugin.go

@@ -17,23 +17,24 @@
 package plugin
 
 import (
-	"fillmore-labs.com/zerolint/pkg/analyzer"
+	"regexp"
+
+	"fillmore-labs.com/zerolint/pkg/zerolint"
+	"fillmore-labs.com/zerolint/pkg/zerolint/level"
 	"github.com/golangci/plugin-module-register/register"
 	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/analysis/passes/inspect"
 )
 
-// Name is the linters name.
-const Name = "zerolint"
-
 func init() { //nolint:gochecknoinits
-	register.Plugin(Name, New)
+	register.Plugin(zerolint.Name, New)
 }
 
 // Settings are the linters settings.
 type Settings struct {
-	Excluded []string `json:"excluded"`
-	Full     bool     `json:"full"`
+	Excluded  []string        `json:"excluded,omitempty"`
+	Level     level.LintLevel `json:"level,omitempty"`
+	Match     *regexp.Regexp  `json:"match,omitempty"`
+	Generated bool            `json:"generated,omitempty"`
 }
 
 // New creates a new [Plugin] instance with the given [Settings].
@@ -53,20 +54,14 @@ type Plugin struct {
 
 // BuildAnalyzers returns the [analysis.Analyzer]s for a zerolint run.
 func (p Plugin) BuildAnalyzers() ([]*analysis.Analyzer, error) {
-	run := analyzer.NewRun(
-		analyzer.WithExcludes(p.settings.Excluded),
-		analyzer.WithFull(p.settings.Full),
-		analyzer.WithGenerated(true),
+	z := zerolint.New(
+		zerolint.WithLevel(p.settings.Level),
+		zerolint.WithExcludes(p.settings.Excluded),
+		zerolint.WithRegex(p.settings.Match),
+		zerolint.WithGenerated(p.settings.Generated),
 	)
 
-	analyzer := &analysis.Analyzer{
-		Name:     Name,
-		Doc:      analyzer.Doc,
-		Run:      run,
-		Requires: []*analysis.Analyzer{inspect.Analyzer},
-	}
-
-	return []*analysis.Analyzer{analyzer}, nil
+	return []*analysis.Analyzer{z}, nil
 }
 
 // GetLoadMode returns the golangci load mode.