build(deps): bump github.com/tomarrell/wrapcheck/v2 from 2.5.0 to 2.6.0 (#2696)

dependabot[bot] · ldez · web-flow · commit b0ff233b2c79 · 2022-03-27T15:33:36.000+03:00
* build(deps): bump github.com/tomarrell/wrapcheck/v2 from 2.5.0 to 2.6.0 Bumps [github.com/tomarrell/wrapcheck/v2](https://github.com/tomarrell/wrapcheck) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/tomarrell/wrapcheck/releases) - [Commits](tomarrell/wrapcheck@v2.5.0...v2.6.0) --- updated-dependencies: - dependency-name: github.com/tomarrell/wrapcheck/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * add new option Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fernandez Ludovic <ldez@users.noreply.github.com>
diff --git a/.golangci.example.yml b/.golangci.example.yml
@@ -1530,6 +1530,8 @@ linters-settings:
     ignorePackageGlobs:
       - encoding/*
       - github.com/pkg/*
+    ignoreInterfaceRegexps:
+      - ^(?i)c(?-i)ach(ing|e)
 
   wsl:
     # See https://github.com/bombsimon/wsl/blob/master/doc/configuration.md for documentation of available settings.
diff --git a/go.mod b/go.mod
@@ -85,7 +85,7 @@ require (
 	github.com/tdakkota/asciicheck v0.1.1
 	github.com/tetafro/godot v1.4.11
 	github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144
-	github.com/tomarrell/wrapcheck/v2 v2.5.0
+	github.com/tomarrell/wrapcheck/v2 v2.6.0
 	github.com/tommy-muehle/go-mnd/v2 v2.5.0
 	github.com/ultraware/funlen v0.0.3
 	github.com/ultraware/whitespace v0.0.5
diff --git a/go.sum b/go.sum
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -592,9 +592,11 @@ type WhitespaceSettings struct {
 }
 
 type WrapcheckSettings struct {
-	IgnoreSigs         []string `mapstructure:"ignoreSigs"`
-	IgnoreSigRegexps   []string `mapstructure:"ignoreSigRegexps"`
-	IgnorePackageGlobs []string `mapstructure:"ignorePackageGlobs"`
+	// TODO(ldez): v2 the options must be renamed to use hyphen.
+	IgnoreSigs             []string `mapstructure:"ignoreSigs"`
+	IgnoreSigRegexps       []string `mapstructure:"ignoreSigRegexps"`
+	IgnorePackageGlobs     []string `mapstructure:"ignorePackageGlobs"`
+	IgnoreInterfaceRegexps []string `mapstructure:"ignoreInterfaceRegexps"`
 }
 
 type WSLSettings struct {
diff --git a/pkg/golinters/wrapcheck.go b/pkg/golinters/wrapcheck.go
@@ -22,6 +22,9 @@ func NewWrapcheck(settings *config.WrapcheckSettings) *goanalysis.Linter {
 		if len(settings.IgnorePackageGlobs) != 0 {
 			cfg.IgnorePackageGlobs = settings.IgnorePackageGlobs
 		}
+		if len(settings.IgnoreInterfaceRegexps) != 0 {
+			cfg.IgnoreInterfaceRegexps = settings.IgnoreInterfaceRegexps
+		}
 	}
 
 	a := wrapcheck.NewAnalyzer(cfg)

-Original file line number
+Diff line change
 	github.com/tdakkota/asciicheck v0.1.1
 	github.com/tetafro/godot v1.4.11
 	github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144
 -	github.com/tomarrell/wrapcheck/v2 v2.5.0
 +	github.com/tomarrell/wrapcheck/v2 v2.6.0
 	github.com/tommy-muehle/go-mnd/v2 v2.5.0
 	github.com/ultraware/funlen v0.0.3
 	github.com/ultraware/whitespace v0.0.5
Original file line number	Diff line number	Diff line change
`@@ -592,9 +592,11 @@ type WhitespaceSettings struct {`
`592`	`592`	`}`
`593`	`593`
`594`	`594`	`type WrapcheckSettings struct {`
`595`		- IgnoreSigs []string `mapstructure:"ignoreSigs"`
`596`		- IgnoreSigRegexps []string `mapstructure:"ignoreSigRegexps"`
`597`		- IgnorePackageGlobs []string `mapstructure:"ignorePackageGlobs"`
	`595`	`+ // TODO(ldez): v2 the options must be renamed to use hyphen.`
	`596`	+ IgnoreSigs []string `mapstructure:"ignoreSigs"`
	`597`	+ IgnoreSigRegexps []string `mapstructure:"ignoreSigRegexps"`
	`598`	+ IgnorePackageGlobs []string `mapstructure:"ignorePackageGlobs"`
	`599`	+ IgnoreInterfaceRegexps []string `mapstructure:"ignoreInterfaceRegexps"`
`598`	`600`	`}`
`599`	`601`
`600`	`602`	`type WSLSettings struct {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ func NewWrapcheck(settings config.WrapcheckSettings) goanalysis.Linter {`
`22`	`22`	`if len(settings.IgnorePackageGlobs) != 0 {`
`23`	`23`	`cfg.IgnorePackageGlobs = settings.IgnorePackageGlobs`
`24`	`24`	`}`
	`25`	`+ if len(settings.IgnoreInterfaceRegexps) != 0 {`
	`26`	`+ cfg.IgnoreInterfaceRegexps = settings.IgnoreInterfaceRegexps`
	`27`	`+ }`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`a := wrapcheck.NewAnalyzer(cfg)`