diff --git a/api/filters/nameref/nameref.go b/api/filters/nameref/nameref.go index 7549ab70011..4815f10a298 100644 --- a/api/filters/nameref/nameref.go +++ b/api/filters/nameref/nameref.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/filters/fieldspec" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/kustomize/kyaml/yaml" @@ -64,7 +64,7 @@ func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) { FieldSpec: f.NameFieldToUpdate, SetValue: f.set, }); err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "updating name reference in '%s' field of '%s'", f.NameFieldToUpdate.Path, f.Referrer.CurId().String()) } @@ -104,7 +104,7 @@ func (f Filter) setMapping(node *yaml.RNode) error { } nameNode, err := node.Pipe(yaml.FieldMatcher{Name: "name"}) if err != nil { - return errors.Wrap(err, "trying to match 'name' field") + return errors.WrapPrefixf(err, "trying to match 'name' field") } if nameNode == nil { // This is a _configuration_ error; the field path @@ -153,7 +153,7 @@ func (f Filter) filterMapCandidatesByNamespace( node *yaml.RNode) ([]*resource.Resource, error) { namespaceNode, err := node.Pipe(yaml.FieldMatcher{Name: "namespace"}) if err != nil { - return nil, errors.Wrap(err, "trying to match 'namespace' field") + return nil, errors.WrapPrefixf(err, "trying to match 'namespace' field") } if namespaceNode == nil { return f.ReferralCandidates.Resources(), nil diff --git a/api/internal/accumulator/loadconfigfromcrds.go b/api/internal/accumulator/loadconfigfromcrds.go index cac47c0de68..afe6da2e747 100644 --- a/api/internal/accumulator/loadconfigfromcrds.go +++ b/api/internal/accumulator/loadconfigfromcrds.go @@ -7,11 +7,11 @@ import ( "encoding/json" "strings" - "github.com/pkg/errors" "k8s.io/kube-openapi/pkg/validation/spec" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/yaml" @@ -39,7 +39,7 @@ func LoadConfigFromCRDs( } m, err := makeNameToApiMap(content) if err != nil { - return nil, errors.Wrapf(err, "unable to parse open API definition from '%s'", path) + return nil, errors.WrapPrefixf(err, "unable to parse open API definition from '%s'", path) } otherTc, err := makeConfigFromApiMap(m) if err != nil { diff --git a/api/internal/git/gitrunner.go b/api/internal/git/gitrunner.go index c6d12d0156c..134eb41c5f3 100644 --- a/api/internal/git/gitrunner.go +++ b/api/internal/git/gitrunner.go @@ -7,8 +7,8 @@ import ( "os/exec" "time" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/internal/utils" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/filesys" ) @@ -24,7 +24,7 @@ type gitRunner struct { func newCmdRunner(timeout time.Duration) (*gitRunner, error) { gitProgram, err := exec.LookPath("git") if err != nil { - return nil, errors.Wrap(err, "no 'git' program on path") + return nil, errors.WrapPrefixf(err, "no 'git' program on path") } dir, err := filesys.NewTmpConfirmedDir() if err != nil { @@ -48,7 +48,7 @@ func (r gitRunner) run(args ...string) error { func() error { out, err := cmd.CombinedOutput() if err != nil { - return errors.Wrapf(err, "failed to run '%s': %s", cmd.String(), string(out)) + return errors.WrapPrefixf(err, "failed to run '%s': %s", cmd.String(), string(out)) } return err }) diff --git a/api/internal/plugins/compiler/compiler.go b/api/internal/plugins/compiler/compiler.go index 04f827effff..c2b857b8f27 100644 --- a/api/internal/plugins/compiler/compiler.go +++ b/api/internal/plugins/compiler/compiler.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/internal/plugins/utils" + "sigs.k8s.io/kustomize/kyaml/errors" ) // Compiler creates Go plugin object files. @@ -86,7 +86,7 @@ func (b *Compiler) Compile() error { cmd.Dir = b.workDir if err := cmd.Run(); err != nil { b.report() - return errors.Wrapf( + return errors.WrapPrefixf( err, "cannot compile %s:\nSTDERR\n%s\n", b.srcPath(), b.stderr.String()) } diff --git a/api/internal/plugins/execplugin/execplugin.go b/api/internal/plugins/execplugin/execplugin.go index 3a380ea3849..001731f7807 100644 --- a/api/internal/plugins/execplugin/execplugin.go +++ b/api/internal/plugins/execplugin/execplugin.go @@ -13,9 +13,9 @@ import ( "github.com/google/shlex" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/internal/plugins/utils" "sigs.k8s.io/kustomize/api/resmap" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/yaml" ) @@ -151,17 +151,17 @@ func (p *ExecPlugin) Transform(rm resmap.ResMap) error { func (p *ExecPlugin) invokePlugin(input []byte) ([]byte, error) { f, err := os.CreateTemp("", tmpConfigFilePrefix) if err != nil { - return nil, errors.Wrap( + return nil, errors.WrapPrefixf( err, "creating tmp plugin config file") } _, err = f.Write(p.cfg) if err != nil { - return nil, errors.Wrap( + return nil, errors.WrapPrefixf( err, "writing plugin config to "+f.Name()) } err = f.Close() if err != nil { - return nil, errors.Wrap( + return nil, errors.WrapPrefixf( err, "closing plugin config file "+f.Name()) } //nolint:gosec @@ -175,7 +175,7 @@ func (p *ExecPlugin) invokePlugin(input []byte) ([]byte, error) { } result, err := cmd.Output() if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "failure in plugin configured via %s; %v", f.Name(), err.Error()) } diff --git a/api/internal/plugins/fnplugin/fnplugin.go b/api/internal/plugins/fnplugin/fnplugin.go index bf9d794d8fb..3a033d7278f 100644 --- a/api/internal/plugins/fnplugin/fnplugin.go +++ b/api/internal/plugins/fnplugin/fnplugin.go @@ -7,7 +7,7 @@ import ( "bytes" "fmt" - "github.com/pkg/errors" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/api/internal/plugins/utils" "sigs.k8s.io/kustomize/api/resmap" @@ -194,7 +194,7 @@ func (p *FnPlugin) invokePlugin(input []byte) ([]byte, error) { err = p.runFns.Execute() if err != nil { - return nil, errors.Wrap( + return nil, errors.WrapPrefixf( err, "couldn't execute function") } diff --git a/api/internal/plugins/loader/loader.go b/api/internal/plugins/loader/loader.go index 43b11d6ffb4..1758e5cf661 100644 --- a/api/internal/plugins/loader/loader.go +++ b/api/internal/plugins/loader/loader.go @@ -12,7 +12,6 @@ import ( "reflect" "strings" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers" "sigs.k8s.io/kustomize/api/internal/plugins/execplugin" @@ -22,6 +21,7 @@ import ( "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/resid" ) @@ -216,11 +216,11 @@ func (l *Loader) loadAndConfigurePlugin( } yaml, err := res.AsYAML() if err != nil { - return nil, errors.Wrapf(err, "marshalling yaml from res %s", res.OrgId()) + return nil, errors.WrapPrefixf(err, "marshalling yaml from res %s", res.OrgId()) } err = c.Config(resmap.NewPluginHelpers(ldr, v, l.rf, l.pc), yaml) if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "plugin %s fails configuration", res.OrgId()) } return c, nil @@ -246,12 +246,12 @@ func (l *Loader) loadPlugin(res *resource.Resource) (resmap.Configurable, error) // validation check that function mounts are under the current kustomization directory for _, mount := range spec.Container.StorageMounts { if filepath.IsAbs(mount.Src) { - return nil, errors.New(fmt.Sprintf("plugin %s with mount path '%s' is not permitted; "+ - "mount paths must be relative to the current kustomization directory", res.OrgId(), mount.Src)) + return nil, errors.Errorf("plugin %s with mount path '%s' is not permitted; "+ + "mount paths must be relative to the current kustomization directory", res.OrgId(), mount.Src) } if strings.HasPrefix(filepath.Clean(mount.Src), "../") { - return nil, errors.New(fmt.Sprintf("plugin %s with mount path '%s' is not permitted; "+ - "mount paths must be under the current kustomization directory", res.OrgId(), mount.Src)) + return nil, errors.Errorf("plugin %s with mount path '%s' is not permitted; "+ + "mount paths must be under the current kustomization directory", res.OrgId(), mount.Src) } } return fnplugin.NewFnPlugin(&l.pc.FnpLoadingOptions), nil @@ -307,11 +307,11 @@ func (l *Loader) loadGoPlugin(id resid.ResId, absPath string) (resmap.Configurab log.Printf("Attempting plugin load from '%s'", absPath) p, err := plugin.Open(absPath) if err != nil { - return nil, errors.Wrapf(err, "plugin %s fails to load", absPath) + return nil, errors.WrapPrefixf(err, "plugin %s fails to load", absPath) } symbol, err := p.Lookup(konfig.PluginSymbol) if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "plugin %s doesn't have symbol %s", regId, konfig.PluginSymbol) } diff --git a/api/internal/target/errmissingkustomization.go b/api/internal/target/errmissingkustomization.go index 45e4895932b..b542dbfafc8 100644 --- a/api/internal/target/errmissingkustomization.go +++ b/api/internal/target/errmissingkustomization.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/konfig" + "sigs.k8s.io/kustomize/kyaml/errors" ) type errMissingKustomization struct { @@ -23,12 +23,7 @@ func (e *errMissingKustomization) Error() string { } func IsMissingKustomizationFileError(err error) bool { - _, ok := err.(*errMissingKustomization) - if ok { - return true - } - _, ok = errors.Cause(err).(*errMissingKustomization) - return ok + return errors.As(err, &errMissingKustomization{}) } func NewErrMissingKustomization(p string) *errMissingKustomization { diff --git a/api/internal/target/kusttarget.go b/api/internal/target/kusttarget.go index 718b50d9373..d841d52e3f4 100644 --- a/api/internal/target/kusttarget.go +++ b/api/internal/target/kusttarget.go @@ -9,7 +9,6 @@ import ( "os" "strings" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/accumulator" "sigs.k8s.io/kustomize/api/internal/builtins" @@ -23,6 +22,7 @@ import ( "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/openapi" "sigs.k8s.io/yaml" ) @@ -195,11 +195,11 @@ func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) ( resRa *accumulator.ResAccumulator, err error) { ra, err = kt.accumulateResources(ra, kt.kustomization.Resources) if err != nil { - return nil, errors.Wrap(err, "accumulating resources") + return nil, errors.WrapPrefixf(err, "accumulating resources") } ra, err = kt.accumulateComponents(ra, kt.kustomization.Components) if err != nil { - return nil, errors.Wrap(err, "accumulating components") + return nil, errors.WrapPrefixf(err, "accumulating components") } tConfig, err := builtinconfig.MakeTransformerConfig( kt.ldr, kt.kustomization.Configurations) @@ -208,17 +208,17 @@ func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) ( } err = ra.MergeConfig(tConfig) if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "merging config %v", tConfig) } crdTc, err := accumulator.LoadConfigFromCRDs(kt.ldr, kt.kustomization.Crds) if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "loading CRDs %v", kt.kustomization.Crds) } err = ra.MergeConfig(crdTc) if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "merging CRDs %v", crdTc) } err = kt.runGenerators(ra) @@ -235,7 +235,7 @@ func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) ( } err = ra.MergeVars(kt.kustomization.Vars) if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "merging vars %v", kt.kustomization.Vars) } return ra, nil @@ -265,7 +265,7 @@ func (kt *KustTarget) runGenerators( gs, err = kt.configureExternalGenerators() if err != nil { - return errors.Wrap(err, "loading generator plugins") + return errors.WrapPrefixf(err, "loading generator plugins") } generators = append(generators, gs...) for i, g := range generators { @@ -276,12 +276,12 @@ func (kt *KustTarget) runGenerators( if resMap != nil { err = resMap.AddOriginAnnotation(generators[i].Origin) if err != nil { - return errors.Wrapf(err, "adding origin annotations for generator %v", g) + return errors.WrapPrefixf(err, "adding origin annotations for generator %v", g) } } err = ra.AbsorbAll(resMap) if err != nil { - return errors.Wrapf(err, "merging from generator %v", g) + return errors.WrapPrefixf(err, "merging from generator %v", g) } } return nil @@ -308,7 +308,7 @@ func (kt *KustTarget) configureExternalGenerators() ( } } if err = ra.AppendAll(rm); err != nil { - return nil, errors.Wrapf(err, "configuring external generator") + return nil, errors.WrapPrefixf(err, "configuring external generator") } } ra, err := kt.accumulateResources(ra, generatorPaths) @@ -355,7 +355,7 @@ func (kt *KustTarget) configureExternalTransformers(transformers []string) ([]*r } if err = ra.AppendAll(rm); err != nil { - return nil, errors.Wrapf(err, "configuring external transformer") + return nil, errors.WrapPrefixf(err, "configuring external transformer") } } ra, err := kt.accumulateResources(ra, transformerPaths) @@ -419,7 +419,7 @@ func (kt *KustTarget) accumulateResources( if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file return nil, errF } - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "accumulation err='%s'", errF.Error()) } // store the origin, we'll need it later @@ -436,7 +436,7 @@ func (kt *KustTarget) accumulateResources( if kusterr.IsMalformedYAMLError(errF) { // Some error occurred while tyring to decode YAML file return nil, errF } - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "accumulation err='%s'", errF.Error()) } } @@ -478,7 +478,7 @@ func (kt *KustTarget) accumulateDirectory( subKt := NewKustTarget(ldr, kt.validator, kt.rFactory, kt.pLdr) err := subKt.Load() if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "couldn't make target for path '%s'", ldr.Root()) } subKt.kustomization.BuildMetadata = kt.kustomization.BuildMetadata @@ -513,12 +513,12 @@ func (kt *KustTarget) accumulateDirectory( subRa, err = subKt.AccumulateTarget() } if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "recursed accumulation of path '%s'", ldr.Root()) } err = ra.MergeAccumulator(subRa) if err != nil { - return nil, errors.Wrapf( + return nil, errors.WrapPrefixf( err, "recursed merging from path '%s'", ldr.Root()) } return ra, nil @@ -528,21 +528,21 @@ func (kt *KustTarget) accumulateFile( ra *accumulator.ResAccumulator, path string) error { resources, err := kt.rFactory.FromFile(kt.ldr, path) if err != nil { - return errors.Wrapf(err, "accumulating resources from '%s'", path) + return errors.WrapPrefixf(err, "accumulating resources from '%s'", path) } if kt.origin != nil { originAnno, err := kt.origin.Append(path).String() if err != nil { - return errors.Wrapf(err, "cannot add path annotation for '%s'", path) + return errors.WrapPrefixf(err, "cannot add path annotation for '%s'", path) } err = resources.AnnotateAll(utils.OriginAnnotationKey, originAnno) if err != nil || originAnno == "" { - return errors.Wrapf(err, "cannot add path annotation for '%s'", path) + return errors.WrapPrefixf(err, "cannot add path annotation for '%s'", path) } } err = ra.AppendAll(resources) if err != nil { - return errors.Wrapf(err, "merging resources from '%s'", path) + return errors.WrapPrefixf(err, "merging resources from '%s'", path) } return nil } @@ -553,7 +553,7 @@ func (kt *KustTarget) configureBuiltinPlugin( if c != nil { y, err = yaml.Marshal(c) if err != nil { - return errors.Wrapf( + return errors.WrapPrefixf( err, "builtin %s marshal", bpt) } } @@ -562,7 +562,7 @@ func (kt *KustTarget) configureBuiltinPlugin( kt.ldr, kt.validator, kt.rFactory, kt.pLdr.Config()), y) if err != nil { - return errors.Wrapf( + return errors.WrapPrefixf( err, "trouble configuring builtin %s with config: `\n%s`", bpt, string(y)) } return nil diff --git a/api/internal/target/kusttarget_configplugin.go b/api/internal/target/kusttarget_configplugin.go index 9a3c63086fe..b589961e5fc 100644 --- a/api/internal/target/kusttarget_configplugin.go +++ b/api/internal/target/kusttarget_configplugin.go @@ -7,12 +7,12 @@ import ( "fmt" "path/filepath" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/yaml" ) @@ -290,7 +290,7 @@ var transformerConfigurators = map[builtinhelpers.BuiltinPluginType]func( if label.IncludeTemplates { fss, err = fss.MergeAll(tc.TemplateLabels) if err != nil { - return nil, errors.Wrap(err, "failed to merge template fieldSpec") + return nil, errors.WrapPrefixf(err, "failed to merge template fieldSpec") } } // only add to metadata by default diff --git a/api/internal/utils/errtimeout.go b/api/internal/utils/errtimeout.go index 24b8abe664c..60a83df49e2 100644 --- a/api/internal/utils/errtimeout.go +++ b/api/internal/utils/errtimeout.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/pkg/errors" + "sigs.k8s.io/kustomize/kyaml/errors" ) type errTimeOut struct { @@ -24,13 +24,5 @@ func (e errTimeOut) Error() string { } func IsErrTimeout(err error) bool { - if err == nil { - return false - } - _, ok := err.(errTimeOut) - if ok { - return true - } - _, ok = errors.Cause(err).(errTimeOut) - return ok + return errors.As(err, &errTimeOut{}) } diff --git a/api/kv/kv.go b/api/kv/kv.go index 52f17bb20fd..d3ada130a3a 100644 --- a/api/kv/kv.go +++ b/api/kv/kv.go @@ -11,10 +11,10 @@ import ( "unicode" "unicode/utf8" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/generators" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" ) var utf8bom = []byte{0xEF, 0xBB, 0xBF} @@ -40,23 +40,23 @@ func (kvl *loader) Load( args types.KvPairSources) (all []types.Pair, err error) { pairs, err := kvl.keyValuesFromEnvFiles(args.EnvSources) if err != nil { - return nil, errors.Wrap(err, fmt.Sprintf( + return nil, errors.WrapPrefixf(err, "env source files: %v", - args.EnvSources)) + args.EnvSources) } all = append(all, pairs...) pairs, err = keyValuesFromLiteralSources(args.LiteralSources) if err != nil { - return nil, errors.Wrap(err, fmt.Sprintf( - "literal sources %v", args.LiteralSources)) + return nil, errors.WrapPrefixf(err, + "literal sources %v", args.LiteralSources) } all = append(all, pairs...) pairs, err = kvl.keyValuesFromFileSources(args.FileSources) if err != nil { - return nil, errors.Wrap(err, fmt.Sprintf( - "file sources: %v", args.FileSources)) + return nil, errors.WrapPrefixf(err, + "file sources: %v", args.FileSources) } return append(all, pairs...), nil } diff --git a/api/resmap/factory.go b/api/resmap/factory.go index ee6c68f1071..9cc860749ce 100644 --- a/api/resmap/factory.go +++ b/api/resmap/factory.go @@ -4,11 +4,11 @@ package resmap import ( - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/kusterr" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/yaml" ) @@ -81,7 +81,7 @@ func (rmF *Factory) NewResMapFromConfigMapArgs( for i := range argList { res, err := rmF.resF.MakeConfigMap(kvLdr, &argList[i]) if err != nil { - return nil, errors.Wrap(err, "NewResMapFromConfigMapArgs") + return nil, errors.WrapPrefixf(err, "NewResMapFromConfigMapArgs") } resources = append(resources, res) } @@ -106,7 +106,7 @@ func (rmF *Factory) NewResMapFromSecretArgs( for i := range argsList { res, err := rmF.resF.MakeSecret(kvLdr, &argsList[i]) if err != nil { - return nil, errors.Wrap(err, "NewResMapFromSecretArgs") + return nil, errors.WrapPrefixf(err, "NewResMapFromSecretArgs") } resources = append(resources, res) } diff --git a/api/resmap/reswrangler.go b/api/resmap/reswrangler.go index e8029944820..411e4e8138f 100644 --- a/api/resmap/reswrangler.go +++ b/api/resmap/reswrangler.go @@ -8,10 +8,10 @@ import ( "fmt" "reflect" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/filters/annotations" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/resid" kyaml "sigs.k8s.io/kustomize/kyaml/yaml" @@ -108,7 +108,7 @@ func (m *resWrangler) Replace(res *resource.Resource) (int, error) { id := res.CurId() i, err := m.GetIndexOfCurrentId(id) if err != nil { - return -1, errors.Wrap(err, "in Replace") + return -1, errors.WrapPrefixf(err, "in Replace") } if i < 0 { return -1, fmt.Errorf("cannot find resource with id %s to replace", id) @@ -286,7 +286,7 @@ func (m *resWrangler) AsYaml() ([]byte, error) { out, err := res.AsYAML() if err != nil { m, _ := res.Map() - return nil, errors.Wrapf(err, "%#v", m) + return nil, errors.WrapPrefixf(err, "%#v", m) } if firstObj { firstObj = false diff --git a/api/types/erronlybuiltinpluginsallowed.go b/api/types/erronlybuiltinpluginsallowed.go index 73ee95fd7d8..22742825e88 100644 --- a/api/types/erronlybuiltinpluginsallowed.go +++ b/api/types/erronlybuiltinpluginsallowed.go @@ -6,7 +6,7 @@ package types import ( "fmt" - "github.com/pkg/errors" + "sigs.k8s.io/kustomize/kyaml/errors" ) type errOnlyBuiltinPluginsAllowed struct { @@ -24,10 +24,5 @@ func NewErrOnlyBuiltinPluginsAllowed(n string) *errOnlyBuiltinPluginsAllowed { } func IsErrOnlyBuiltinPluginsAllowed(err error) bool { - _, ok := err.(*errOnlyBuiltinPluginsAllowed) - if ok { - return true - } - _, ok = errors.Cause(err).(*errOnlyBuiltinPluginsAllowed) - return ok + return errors.As(err, &errOnlyBuiltinPluginsAllowed{}) } diff --git a/api/types/errunabletofind.go b/api/types/errunabletofind.go index f95b8edd5a1..20294a497c0 100644 --- a/api/types/errunabletofind.go +++ b/api/types/errunabletofind.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/pkg/errors" + "sigs.k8s.io/kustomize/kyaml/errors" ) type errUnableToFind struct { @@ -31,10 +31,5 @@ func NewErrUnableToFind(w string, a []Pair) *errUnableToFind { } func IsErrUnableToFind(err error) bool { - _, ok := err.(*errUnableToFind) - if ok { - return true - } - _, ok = errors.Cause(err).(*errUnableToFind) - return ok + return errors.As(err, &errUnableToFind{}) } diff --git a/go.work.sum b/go.work.sum index 867c1800e0d..91e79c74482 100644 --- a/go.work.sum +++ b/go.work.sum @@ -10,17 +10,31 @@ github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PL github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/paulmach/orb v0.1.3/go.mod h1:VFlX/8C+IQ1p6FTRRKzKoOPJnvEtA5G0Veuqwbu//Vk= github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.starlark.net v0.0.0-20190528202925-30ae18b8564f/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/kustomize/commands/edit/remove/removepatch.go b/kustomize/commands/edit/remove/removepatch.go index 103cb34638e..202dd7e9665 100644 --- a/kustomize/commands/edit/remove/removepatch.go +++ b/kustomize/commands/edit/remove/removepatch.go @@ -6,11 +6,11 @@ package remove import ( "log" - "github.com/pkg/errors" "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/filesys" ) @@ -55,7 +55,7 @@ exactly match the patch item to successfully remote the item.`, // Validate validates removePatch command. func (o *removePatchOptions) Validate() error { if o.Patch.Patch != "" && o.Patch.Path != "" { - return errors.New("patch and path can't be set at the same time") + return errors.Errorf("patch and path can't be set at the same time") } return nil } diff --git a/kustomize/commands/edit/remove/removetransformer_test.go b/kustomize/commands/edit/remove/removetransformer_test.go index 633b0ad2b1a..954b45b4fc4 100644 --- a/kustomize/commands/edit/remove/removetransformer_test.go +++ b/kustomize/commands/edit/remove/removetransformer_test.go @@ -6,8 +6,8 @@ package remove import ( "testing" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/kustomize/v4/commands/edit/remove_test" + "sigs.k8s.io/kustomize/kyaml/errors" ) func TestRemoveTransformer(t *testing.T) { @@ -76,7 +76,7 @@ func TestRemoveTransformer(t *testing.T) { Description: "no arguments", Given: remove_test.Given{}, Expected: remove_test.Expected{ - Err: errors.New("must specify a transformer file"), + Err: errors.Errorf("must specify a transformer file"), }, }, { diff --git a/kustomize/go.mod b/kustomize/go.mod index db09caf193f..c4793f0bf19 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( github.com/google/go-cmp v0.5.5 - github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 @@ -37,6 +36,7 @@ require ( github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/olekukonko/tablewriter v0.0.4 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/xlab/treeprint v1.1.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect diff --git a/kyaml/filesys/filesystem_test.go b/kyaml/filesys/filesystem_test.go index 41821715381..1a8da5a8bbe 100644 --- a/kyaml/filesys/filesystem_test.go +++ b/kyaml/filesys/filesystem_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "sigs.k8s.io/kustomize/kyaml/errors" ) const ( diff --git a/kyaml/go.mod b/kyaml/go.mod index 15ce3ff9e47..9dc91f1d453 100644 --- a/kyaml/go.mod +++ b/kyaml/go.mod @@ -8,7 +8,6 @@ require ( github.com/google/gnostic v0.5.7-v3refs github.com/google/go-cmp v0.5.5 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 - github.com/pkg/errors v0.9.1 github.com/sergi/go-diff v1.1.0 github.com/spf13/cobra v1.4.0 github.com/stretchr/testify v1.8.0 diff --git a/kyaml/go.sum b/kyaml/go.sum index 018267449d2..62664a11695 100644 --- a/kyaml/go.sum +++ b/kyaml/go.sum @@ -90,8 +90,6 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/kyaml/internal/forked/github.com/qri-io/starlib/util/util.go b/kyaml/internal/forked/github.com/qri-io/starlib/util/util.go index 96b4a9aeaa1..6bc4fba0f51 100644 --- a/kyaml/internal/forked/github.com/qri-io/starlib/util/util.go +++ b/kyaml/internal/forked/github.com/qri-io/starlib/util/util.go @@ -25,9 +25,9 @@ package util import ( "fmt" - "github.com/pkg/errors" "go.starlark.net/starlark" "go.starlark.net/starlarkstruct" + "sigs.k8s.io/kustomize/kyaml/errors" ) // // asString unquotes a starlark string value @@ -44,6 +44,7 @@ func IsEmptyString(s starlark.String) bool { } // Unmarshal decodes a starlark.Value into it's golang counterpart +// //nolint:nakedret func Unmarshal(x starlark.Value) (val interface{}, err error) { switch v := x.(type) { @@ -161,7 +162,7 @@ func Unmarshal(x starlark.Value) (val interface{}, err error) { if _var, ok := v.Constructor().(Unmarshaler); ok { err = _var.UnmarshalStarlark(x) if err != nil { - err = errors.Wrapf(err, "failed marshal %q to Starlark object", v.Constructor().Type()) + err = errors.WrapPrefixf(err, "failed marshal %q to Starlark object", v.Constructor().Type()) return } val = _var @@ -176,6 +177,7 @@ func Unmarshal(x starlark.Value) (val interface{}, err error) { } // Marshal turns go values into starlark types +// //nolint:nakedret func Marshal(data interface{}) (v starlark.Value, err error) { switch x := data.(type) { diff --git a/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go b/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go index 1d75fab545c..1956bac391a 100644 --- a/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go +++ b/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go @@ -17,9 +17,9 @@ import ( "strings" "github.com/imdario/mergo" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/yaml" ) @@ -106,7 +106,7 @@ func (p *plugin) validateArgs() (err error) { // ConfigHome is not loaded by the plugin, and can be located anywhere. if p.ConfigHome == "" { if err = p.establishTmpDir(); err != nil { - return errors.Wrap( + return errors.WrapPrefixf( err, "unable to create tmp dir for HELM_CONFIG_HOME") } p.ConfigHome = filepath.Join(p.tmpDir, "helm") @@ -150,7 +150,7 @@ func (p *plugin) runHelmCommand( err := cmd.Run() if err != nil { helm := p.h.GeneralConfig().HelmConfig.Command - err = errors.Wrap( + err = errors.WrapPrefixf( fmt.Errorf( "unable to run: '%s %s' with env=%s (is '%s' installed?)", helm, strings.Join(args, " "), env, helm), @@ -213,7 +213,7 @@ func (p *plugin) writeValuesBytes( return "", fmt.Errorf("cannot create tmp dir to write helm values") } path := filepath.Join(p.tmpDir, p.Name+"-kustomize-values.yaml") - return path, errors.Wrap(os.WriteFile(path, b, 0644), "failed to write values file") + return path, errors.WrapPrefixf(os.WriteFile(path, b, 0644), "failed to write values file") } func (p *plugin) cleanup() { diff --git a/plugin/builtin/helmchartinflationgenerator/go.mod b/plugin/builtin/helmchartinflationgenerator/go.mod index 773c937d642..9171a5e4b90 100644 --- a/plugin/builtin/helmchartinflationgenerator/go.mod +++ b/plugin/builtin/helmchartinflationgenerator/go.mod @@ -4,8 +4,8 @@ go 1.19 require ( github.com/imdario/mergo v0.3.6 - github.com/pkg/errors v0.9.1 sigs.k8s.io/kustomize/api v0.11.5 + sigs.k8s.io/kustomize/kyaml v0.13.7 sigs.k8s.io/yaml v1.3.0 ) @@ -25,6 +25,7 @@ require ( github.com/kr/pretty v0.2.1 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/stretchr/objx v0.4.0 // indirect github.com/xlab/treeprint v1.1.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect @@ -34,5 +35,4 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect - sigs.k8s.io/kustomize/kyaml v0.13.7 // indirect ) diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go index d3292da32f7..e09d5f32010 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go +++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go @@ -8,11 +8,11 @@ import ( "fmt" jsonpatch "github.com/evanphx/json-patch" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/filters/patchjson6902" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/kio/kioutil" "sigs.k8s.io/yaml" ) @@ -64,7 +64,7 @@ func (p *plugin) Config( } p.decodedPatch, err = jsonpatch.DecodePatch([]byte(p.JsonOp)) if err != nil { - return errors.Wrapf(err, "decoding %s", p.JsonOp) + return errors.WrapPrefixf(err, "decoding %s", p.JsonOp) } if len(p.decodedPatch) == 0 { return fmt.Errorf( diff --git a/plugin/builtin/patchjson6902transformer/go.mod b/plugin/builtin/patchjson6902transformer/go.mod index 5a968a8a11b..69d988650b0 100644 --- a/plugin/builtin/patchjson6902transformer/go.mod +++ b/plugin/builtin/patchjson6902transformer/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( github.com/evanphx/json-patch v4.11.0+incompatible - github.com/pkg/errors v0.9.1 sigs.k8s.io/kustomize/api v0.11.5 sigs.k8s.io/kustomize/kyaml v0.13.9 sigs.k8s.io/yaml v1.3.0 @@ -26,6 +25,7 @@ require ( github.com/kr/pretty v0.2.1 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/stretchr/objx v0.4.0 // indirect github.com/xlab/treeprint v1.1.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect diff --git a/plugin/builtin/sortordertransformer/SortOrderTransformer.go b/plugin/builtin/sortordertransformer/SortOrderTransformer.go index fbeca06269b..fefc810d787 100644 --- a/plugin/builtin/sortordertransformer/SortOrderTransformer.go +++ b/plugin/builtin/sortordertransformer/SortOrderTransformer.go @@ -8,10 +8,10 @@ import ( "sort" "strings" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/yaml" ) @@ -29,7 +29,7 @@ var KustomizePlugin plugin //nolint:gochecknoglobals func (p *plugin) Config( _ *resmap.PluginHelpers, c []byte) error { - return errors.Wrap(yaml.Unmarshal(c, p), "Failed to unmarshal SortOrderTransformer config") + return errors.WrapPrefixf(yaml.Unmarshal(c, p), "Failed to unmarshal SortOrderTransformer config") } func (p *plugin) applyDefaults() { @@ -72,7 +72,7 @@ func (p *plugin) Transform(m resmap.ResMap) (err error) { p.applyDefaults() err = p.validate() if err != nil { - return errors.WithStack(err) + return err } // Sort @@ -97,14 +97,14 @@ func applyOrdering(m resmap.ResMap, ordering []resid.ResId) error { for i, id := range ordering { resources[i], err = m.GetByCurrentId(id) if err != nil { - return errors.Wrap(err, "expected match for sorting") + return errors.WrapPrefixf(err, "expected match for sorting") } } m.Clear() for _, r := range resources { err = m.Append(r) if err != nil { - return errors.Wrap(err, "SortOrderTransformer: Failed to append to resources") + return errors.WrapPrefixf(err, "SortOrderTransformer: Failed to append to resources") } } return nil diff --git a/plugin/builtin/sortordertransformer/go.mod b/plugin/builtin/sortordertransformer/go.mod index 7e6270efc4a..c8d9dc7dc56 100644 --- a/plugin/builtin/sortordertransformer/go.mod +++ b/plugin/builtin/sortordertransformer/go.mod @@ -3,7 +3,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/sortordertransformer go 1.18 require ( - github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.8.0 sigs.k8s.io/kustomize/api v0.12.1 sigs.k8s.io/kustomize/kyaml v0.13.9 @@ -26,6 +25,7 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/xlab/treeprint v1.1.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect diff --git a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go index 5bf64c5c4a7..78de44f8485 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go +++ b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go @@ -8,10 +8,10 @@ import ( "fmt" "os" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/builtins" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/yaml" ) @@ -39,13 +39,13 @@ func (p *plugin) Config(h *resmap.PluginHelpers, _ []byte) error { // Ignore the incoming c, compute new config. c, err := p.makePrefixPluginConfig() if err != nil { - return errors.Wrapf( + return errors.WrapPrefixf( err, "dateprefixer makeconfig") } prefixer := builtins.NewPrefixTransformerPlugin() err = prefixer.Config(h, c) if err != nil { - return errors.Wrapf( + return errors.WrapPrefixf( err, "prefix configure") } p.t = prefixer diff --git a/plugin/someteam.example.com/v1/dateprefixer/go.mod b/plugin/someteam.example.com/v1/dateprefixer/go.mod index a41ae2fd3de..0c2cced3169 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/go.mod +++ b/plugin/someteam.example.com/v1/dateprefixer/go.mod @@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/dateprefixer go 1.19 require ( - github.com/pkg/errors v0.9.1 sigs.k8s.io/kustomize/api v0.11.5 + sigs.k8s.io/kustomize/kyaml v0.13.7 sigs.k8s.io/yaml v1.3.0 ) @@ -25,6 +25,7 @@ require ( github.com/kr/pretty v0.2.1 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/stretchr/objx v0.4.0 // indirect github.com/xlab/treeprint v1.1.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect @@ -34,5 +35,4 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect - sigs.k8s.io/kustomize/kyaml v0.13.7 // indirect ) diff --git a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go index 17355e79889..9c054bdceb4 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go +++ b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go @@ -8,10 +8,10 @@ import ( "fmt" "os" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/builtins" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/yaml" ) @@ -48,7 +48,7 @@ func (p *plugin) Config(h *resmap.PluginHelpers, c []byte) error { prefixer := builtins.NewPrefixTransformerPlugin() err = prefixer.Config(h, c) if err != nil { - return errors.Wrapf( + return errors.WrapPrefixf( err, "stringprefixer configure") } p.t = prefixer diff --git a/plugin/someteam.example.com/v1/stringprefixer/go.mod b/plugin/someteam.example.com/v1/stringprefixer/go.mod index f351f9bcd61..597a30e5423 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/go.mod +++ b/plugin/someteam.example.com/v1/stringprefixer/go.mod @@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/stringprefixer go 1.19 require ( - github.com/pkg/errors v0.9.1 sigs.k8s.io/kustomize/api v0.11.5 + sigs.k8s.io/kustomize/kyaml v0.13.7 sigs.k8s.io/yaml v1.3.0 ) @@ -25,6 +25,7 @@ require ( github.com/kr/pretty v0.2.1 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/stretchr/objx v0.4.0 // indirect github.com/xlab/treeprint v1.1.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect @@ -34,5 +35,4 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect - sigs.k8s.io/kustomize/kyaml v0.13.7 // indirect )