deps: Update Wrapcheck to v2.3.0 (#2145)

hn8 · ldez · web-flow · commit 6c295e404247 · 2021-08-02T14:17:39.000+02:00
* Update Wrapcheck to v2.3

Updat ignoreSigs default, add ignorePackageGlobs

* Update .golangci.example.yml

Co-authored-by: Ludovic Fernandez &lt;ldez@users.noreply.github.com&gt;

Co-authored-by: Ludovic Fernandez &lt;ldez@users.noreply.github.com&gt;
diff --git a/.golangci.example.yml b/.golangci.example.yml
@@ -616,6 +616,11 @@ linters-settings:
       - .Wrap(
       - .Wrapf(
       - .WithMessage(
+      - .WithMessagef(
+      - .WithStack(
+    ignorePackageGlobs:
+        - encoding/*
+        - github.com/pkg/*
 
   wsl:
     # See https://github.com/bombsimon/wsl/blob/master/doc/configuration.md for
diff --git a/go.mod b/go.mod
@@ -77,7 +77,7 @@ require (
 	github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b
 	github.com/tetafro/godot v1.4.8
 	github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94
-	github.com/tomarrell/wrapcheck/v2 v2.2.0
+	github.com/tomarrell/wrapcheck/v2 v2.3.0
 	github.com/tommy-muehle/go-mnd/v2 v2.4.0
 	github.com/ultraware/funlen v0.0.3
 	github.com/ultraware/whitespace v0.0.4
diff --git a/go.sum b/go.sum
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -462,7 +462,8 @@ type WhitespaceSettings struct {
 }
 
 type WrapcheckSettings struct {
-	IgnoreSigs []string `mapstructure:"ignoreSigs"`
+	IgnoreSigs         []string `mapstructure:"ignoreSigs"`
+	IgnorePackageGlobs []string `mapstructure:"ignorePackageGlobs"`
 }
 
 type WSLSettings struct {
diff --git a/pkg/golinters/wrapcheck.go b/pkg/golinters/wrapcheck.go
@@ -16,6 +16,9 @@ func NewWrapcheck(settings *config.WrapcheckSettings) *goanalysis.Linter {
 		if len(settings.IgnoreSigs) != 0 {
 			cfg.IgnoreSigs = settings.IgnoreSigs
 		}
+		if len(settings.IgnorePackageGlobs) != 0 {
+			cfg.IgnorePackageGlobs = settings.IgnorePackageGlobs
+		}
 	}
 
 	a := wrapcheck.NewAnalyzer(cfg)

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,8 @@ type WhitespaceSettings struct {`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`type WrapcheckSettings struct {`
`465`		- IgnoreSigs []string `mapstructure:"ignoreSigs"`
	`465`	+ IgnoreSigs []string `mapstructure:"ignoreSigs"`
	`466`	+ IgnorePackageGlobs []string `mapstructure:"ignorePackageGlobs"`
`466`	`467`	`}`
`467`	`468`
`468`	`469`	`type WSLSettings struct {`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ func NewWrapcheck(settings config.WrapcheckSettings) goanalysis.Linter {`
`16`	`16`	`if len(settings.IgnoreSigs) != 0 {`
`17`	`17`	`cfg.IgnoreSigs = settings.IgnoreSigs`
`18`	`18`	`}`
	`19`	`+ if len(settings.IgnorePackageGlobs) != 0 {`
	`20`	`+ cfg.IgnorePackageGlobs = settings.IgnorePackageGlobs`
	`21`	`+ }`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`a := wrapcheck.NewAnalyzer(cfg)`