kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 01:50:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add more test coverage for RawResources.

Browse Source
This commit is contained in:
jregan
2018-06-10 19:16:46 -07:00
parent ba45b1366a
commit e002b69ffa
17 changed files with 2169 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/resmap/resmap.go
View File

@@ -28,6 +28,7 @@ import (
"github.com/golang/glog"
"github.com/kubernetes-sigs/kustomize/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
k8syaml "k8s.io/apimachinery/pkg/util/yaml"
)
@@ -87,7 +88,7 @@ func (m ResMap) ErrorIfNotEqual(m2 ResMap) error {
return fmt.Errorf("%#v doesn't exist in %#v", id, m2)
}
if !reflect.DeepEqual(obj1, obj2) {
return fmt.Errorf("%#v doesn't match %#v", obj1, obj2)
return fmt.Errorf("%#v doesn't deep equal %#v", obj1, obj2)
}
}
return nil
@@ -131,9 +132,8 @@ func NewResMapFromFiles(loader loader.Loader, paths []string) (ResMap, error) {
for _, path := range paths {
content, err := loader.Load(path)
if err != nil {
return nil, err
return nil, errors.Wrap(err, "Load from path "+path+" failed")
}
res, err := newResMapFromBytes(content)
if err != nil {
return nil, err

7
pkg/resmap/secret.go
View File

@@ -25,13 +25,14 @@ import (
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
)
func newResourceFromSecretGenerator(p string, sArgs types.SecretArgs) (*resource.Resource, error) {
s, err := makeSecret(p, sArgs)
if err != nil {
return nil, err
return nil, errors.Wrap(err, "makeSecret")
}
return resource.NewResourceWithBehavior(
s, resource.NewGenerationBehavior(sArgs.Behavior))
@@ -51,7 +52,7 @@ func makeSecret(p string, sArgs types.SecretArgs) (*corev1.Secret, error) {
for k, v := range sArgs.Commands {
out, err := createSecretKey(p, v)
if err != nil {
return nil, err
return nil, errors.Wrap(err, "createSecretKey")
}
s.Data[k] = out
}
@@ -77,7 +78,7 @@ func NewResMapFromSecretArgs(p string, secretList []types.SecretArgs) (ResMap, e
for _, secret := range secretList {
res, err := newResourceFromSecretGenerator(p, secret)
if err != nil {
return nil, err
return nil, errors.Wrap(err, "newResourceFromSecretGenerator")
}
allResources = append(allResources, res)
}