Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump github.com/tomarrell/wrapcheck/v2 from 2.9.0 to 2.10.0 #5138

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .golangci.next.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3584,6 +3584,14 @@ linters-settings:
multi-func: true

wrapcheck:
# An array of strings specifying additional substrings of signatures to ignore.
# Unlike 'ignoreSigs', this option extends the default set (or the set specified in 'ignoreSigs') without replacing it entirely.
# This allows you to add specific signatures to the ignore list
# while retaining the defaults or any items in 'ignoreSigs'.
ldez marked this conversation as resolved.
Show resolved Hide resolved
extra-ignore-sigs:
- .CustomError(
- .SpecificWrap(

# An array of strings that specify substrings of signatures to ignore.
# If this set, it will override the default set of ignored signatures.
# See https://github.com/tomarrell/wrapcheck#configuration for more information.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ require (
github.com/tetafro/godot v1.4.18
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966
github.com/timonwong/loggercheck v0.10.1
github.com/tomarrell/wrapcheck/v2 v2.9.0
github.com/tomarrell/wrapcheck/v2 v2.10.0
github.com/tommy-muehle/go-mnd/v2 v2.5.1
github.com/ultraware/funlen v0.1.0
github.com/ultraware/whitespace v0.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions jsonschema/golangci.next.jsonschema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3412,6 +3412,17 @@
"type": "object",
"additionalProperties": false,
"properties": {
"extra-ignore-sigs": {
"description": "An array of strings specifying additional substrings of signatures to ignore.",
"default": [
".CustomError(",
".SpecificWrap("
],
"type": "array",
"items": {
"type": "string"
}
},
"ignoreSigs": {
"description": "An array of strings which specify substrings of signatures to ignore.",
"default": [
Expand Down
1 change: 1 addition & 0 deletions pkg/config/linters_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@ type WhitespaceSettings struct {
}

type WrapcheckSettings struct {
ExtraIgnoreSigs []string `mapstructure:"extra-ignore-sigs"`
// TODO(ldez): v2 the options must be renamed to use hyphen.
IgnoreSigs []string `mapstructure:"ignoreSigs"`
IgnoreSigRegexps []string `mapstructure:"ignoreSigRegexps"`
Expand Down
2 changes: 2 additions & 0 deletions pkg/golinters/wrapcheck/wrapcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
func New(settings *config.WrapcheckSettings) *goanalysis.Linter {
cfg := wrapcheck.NewDefaultConfig()
if settings != nil {
cfg.ExtraIgnoreSigs = settings.ExtraIgnoreSigs

if len(settings.IgnoreSigs) != 0 {
cfg.IgnoreSigs = settings.IgnoreSigs
}
Expand Down
Loading