kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 18:25:26 +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

6
api/resmap/factory.go
View File

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

6
api/resmap/reswrangler.go
View File

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