From 9fd899cde7d8f4ea5d873165d97882f4e4716ecc Mon Sep 17 00:00:00 2001 From: Tim Kral Date: Wed, 24 Nov 2021 08:29:20 -0800 Subject: [PATCH] Update wrapcheck configuration to include ignoreSignRegexps --- .golangci.example.yml | 6 ++++-- pkg/config/linters_settings.go | 1 + pkg/golinters/wrapcheck.go | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.golangci.example.yml b/.golangci.example.yml index a79b718ce947..e349e5cb1348 100644 --- a/.golangci.example.yml +++ b/.golangci.example.yml @@ -744,9 +744,11 @@ linters-settings: - .WithMessage( - .WithMessagef( - .WithStack( + ignoreSigRegexps: + - \.New.*Error\( ignorePackageGlobs: - - encoding/* - - github.com/pkg/* + - encoding/* + - github.com/pkg/* wsl: # See https://github.com/bombsimon/wsl/blob/master/doc/configuration.md for diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go index 9a26ca06a4ba..39b2d13a354b 100644 --- a/pkg/config/linters_settings.go +++ b/pkg/config/linters_settings.go @@ -519,6 +519,7 @@ type WhitespaceSettings struct { type WrapcheckSettings struct { IgnoreSigs []string `mapstructure:"ignoreSigs"` + IgnoreSigRegexps []string `mapstructure:"ignoreSigRegexps"` IgnorePackageGlobs []string `mapstructure:"ignorePackageGlobs"` } diff --git a/pkg/golinters/wrapcheck.go b/pkg/golinters/wrapcheck.go index 5eaf085d7435..c52bcb740f42 100644 --- 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.IgnoreSigRegexps) != 0 { + cfg.IgnoreSigRegexps = settings.IgnoreSigRegexps + } if len(settings.IgnorePackageGlobs) != 0 { cfg.IgnorePackageGlobs = settings.IgnorePackageGlobs }