From 7a773a3a48eb59f540697c1fbe11c434fc7c9fbf Mon Sep 17 00:00:00 2001 From: Katrina Verey Date: Mon, 9 May 2022 16:40:48 -0400 Subject: [PATCH] Configure wrapcheck linter to recognize wrapping done by kyaml's errors package --- .golangci.yml | 13 +++++++++++++ kyaml/fn/framework/processors.go | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 4b008d16d..7a8af0376 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -110,6 +110,19 @@ linters-settings: gomnd: ignored-functions: - ioutil.WriteFile + wrapcheck: + ignoreSigs: + # defaults + - .Errorf( + - errors.New( + - errors.Unwrap( + - .Wrap( + - .Wrapf( + - .WithMessage( + - .WithMessagef( + - .WithStack( + # from kyaml's errors package + - .WrapPrefixf( issues: new-from-rev: c94b5d8f2 # enables us to enforce a larger set of linters for new code than pass on existing code diff --git a/kyaml/fn/framework/processors.go b/kyaml/fn/framework/processors.go index ed4367b37..7d2a9b4c9 100644 --- a/kyaml/fn/framework/processors.go +++ b/kyaml/fn/framework/processors.go @@ -150,7 +150,7 @@ func LoadFunctionConfig(src *yaml.RNode, api interface{}) error { if err != nil { return errors.WrapPrefixf(err, "loading provided schema") } - schemaValidationError = validate.AgainstSchema(schema, src, strfmt.Default) + schemaValidationError = errors.Wrap(validate.AgainstSchema(schema, src, strfmt.Default)) // don't return it yet--try to make it to custom validation stage to combine errors } @@ -166,7 +166,7 @@ func LoadFunctionConfig(src *yaml.RNode, api interface{}) error { if d, ok := api.(Defaulter); ok { if err := d.Default(); err != nil { - return err + return errors.Wrap(err) } }