kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

remove direct dependency on github/pkg/errors (#4970)

Browse Source
This commit is contained in:
Cailyn
2023-01-13 13:52:25 -05:00
committed by GitHub
parent 2b7eb6d92a
commit 8ab4b8d167
38 changed files with 137 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/builtin/sortordertransformer/SortOrderTransformer.go
View File

@@ -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

2
plugin/builtin/sortordertransformer/go.mod
View File

@@ -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
@@ -27,6 +26,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/pmezard/go-difflib v1.0.0 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect