Add originalName field to resource.

pkg/accumulator/resaccumulator_test.go

@@ -174,10 +174,9 @@ func TestResolveVarsVarNeedsDisambiguation(t *testing.T) {
 		t.Fatalf("unexpected err: %v", err)
 	}
 
-	rm0 := resmap.FromMap(map[resid.ResId]*resource.Resource{
-		resid.NewResIdWithPrefixNamespace(
-			gvk.Gvk{Version: "v1", Kind: "Service"},
-			"backendOne", "", "fooNamespace"): rf.FromMap(
+	rm0 := resmap.New()
+	rm0.Append(
+		rf.FromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "Service",
@@ -185,9 +184,7 @@ func TestResolveVarsVarNeedsDisambiguation(t *testing.T) {
 					"name":      "backendOne",
 					"namespace": "fooNamespace",
 				},
-			}),
-	})
-
+			}))
 	err = ra.AppendAll(rm0)
 	if err != nil {
 		t.Fatalf("unexpected err: %v", err)

pkg/patch/transformer/factory.go

@@ -59,14 +59,13 @@ func (f PatchJson6902Factory) makeOnePatchJson6902Transformer(p types.PatchJson6
 		return nil, fmt.Errorf("must specify the path for a json patch file")
 	}
 
-	targetId := resid.NewResIdWithPrefixNamespace(
+	targetId := resid.NewResIdWithNamespace(
 		gvk.Gvk{
 			Group:   p.Target.Group,
 			Version: p.Target.Version,
 			Kind:    p.Target.Kind,
 		},
 		p.Target.Name,
-		"",
 		p.Target.Namespace,
 	)
 

pkg/resid/resid.go

@@ -38,6 +38,12 @@ type ResId struct {
 	Suffix string `json:"suffix,omitempty"`
 }
 
+// NewResIdWithNamespace creates new resource identifier
+// in a given namespace.
+func NewResIdWithNamespace(k gvk.Gvk, n, ns string) ResId {
+	return ResId{ItemId: ItemId{Gvk: k, Name: n, Namespace: ns}}
+}
+
 // NewResIdWithPrefixSuffixNamespace creates new resource identifier with a prefix, suffix and a namespace
 func NewResIdWithPrefixSuffixNamespace(k gvk.Gvk, n, p, s, ns string) ResId {
 	return ResId{ItemId: ItemId{Gvk: k, Name: n, Namespace: ns}, Prefix: p, Suffix: s}

pkg/resmap/factory_test.go

@@ -46,24 +46,26 @@ metadata:
 	if ferr := l.AddFile("/whatever/project/deployment.yaml", []byte(resourceStr)); ferr != nil {
 		t.Fatalf("Error adding fake file: %v\n", ferr)
 	}
-	expected := FromMap(map[resid.ResId]*resource.Resource{
-		resid.NewResId(deploy, "dply1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "apps/v1",
-				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"name": "dply1",
-				},
-			}),
-		resid.NewResId(deploy, "dply2"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "apps/v1",
-				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"name": "dply2",
-				},
-			}),
-		resid.NewResIdWithPrefixNamespace(deploy, "dply2", "", "test"): rf.FromMap(
+	expected := New()
+	expected.Append(rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "apps/v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "dply1",
+			},
+		}))
+	expected.Append(rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "apps/v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "dply2",
+			},
+		}))
+	expected.AppendWithId(
+		resid.NewResIdWithNamespace(deploy, "dply2", "test"),
+		rf.FromMap(
 			map[string]interface{}{
 				"apiVersion": "apps/v1",
 				"kind":       "Deployment",
@@ -71,8 +73,7 @@ metadata:
 					"name":      "dply2",
 					"namespace": "test",
 				},
-			}),
-	})
+			}))
 	m, _ := rmF.FromFile(l, "deployment.yaml")
 	if m.Size() != 3 {
 		t.Fatalf("result should contain 3, but got %d", m.Size())

pkg/resource/factory.go

@@ -43,30 +43,39 @@ func (rf *Factory) Hasher() ifc.KunstructuredHasher {
 
 // FromMap returns a new instance of Resource.
 func (rf *Factory) FromMap(m map[string]interface{}) *Resource {
-	return &Resource{
-		Kunstructured: rf.kf.FromMap(m),
-		options:       types.NewGenArgs(nil, nil),
-	}
+	return rf.makeOne(rf.kf.FromMap(m), nil)
+}
+
+// FromMapWithName returns a new instance with the given "original" name.
+func (rf *Factory) FromMapWithName(n string, m map[string]interface{}) *Resource {
+	return rf.makeOne(rf.kf.FromMap(m), nil).setOriginalName(n)
 }
 
 // FromMapAndOption returns a new instance of Resource with given options.
-func (rf *Factory) FromMapAndOption(m map[string]interface{}, args *types.GeneratorArgs, option *types.GeneratorOptions) *Resource {
-	return &Resource{
-		Kunstructured: rf.kf.FromMap(m),
-		options:       types.NewGenArgs(args, option),
-	}
+func (rf *Factory) FromMapAndOption(
+	m map[string]interface{}, args *types.GeneratorArgs, option *types.GeneratorOptions) *Resource {
+	return rf.makeOne(rf.kf.FromMap(m), types.NewGenArgs(args, option))
 }
 
 // FromKunstructured returns a new instance of Resource.
-func (rf *Factory) FromKunstructured(
-	u ifc.Kunstructured) *Resource {
+func (rf *Factory) FromKunstructured(u ifc.Kunstructured) *Resource {
+	return rf.makeOne(u, nil)
+}
+
+// makeOne returns a new instance of Resource.
+func (rf *Factory) makeOne(
+	u ifc.Kunstructured, o *types.GenArgs) *Resource {
 	if u == nil {
 		log.Fatal("unstruct ifc must not be null")
 	}
-	return &Resource{
-		Kunstructured: u,
-		options:       types.NewGenArgs(nil, nil),
+	if o == nil {
+		o = types.NewGenArgs(nil, nil)
 	}
+	r := &Resource{
+		Kunstructured: u,
+		options:       o,
+	}
+	return r.setOriginalName(r.GetName())
 }
 
 // SliceFromPatches returns a slice of resources given a patch path
@@ -88,7 +97,7 @@ func (rf *Factory) SliceFromPatches(
 	return result, nil
 }
 
-// FromBytes unmarshalls bytes into one Resource.
+// FromBytes unmarshals bytes into one Resource.
 func (rf *Factory) FromBytes(in []byte) (*Resource, error) {
 	result, err := rf.SliceFromBytes(in)
 	if err != nil {
@@ -101,7 +110,7 @@ func (rf *Factory) FromBytes(in []byte) (*Resource, error) {
 	return result[0], nil
 }
 
-// SliceFromBytes unmarshalls bytes into a Resource slice.
+// SliceFromBytes unmarshals bytes into a Resource slice.
 func (rf *Factory) SliceFromBytes(in []byte) ([]*Resource, error) {
 	kunStructs, err := rf.kf.SliceFromBytes(in)
 	if err != nil {
@@ -149,12 +158,11 @@ func (rf *Factory) MakeConfigMap(
 	if err != nil {
 		return nil, err
 	}
-	return &Resource{
-		Kunstructured: u,
-		options: types.NewGenArgs(
+	return rf.makeOne(
+		u,
+		types.NewGenArgs(
 			&types.GeneratorArgs{Behavior: args.Behavior},
-			options),
-	}, nil
+			options)), nil
 }
 
 // MakeSecret makes an instance of Resource for Secret
@@ -166,10 +174,9 @@ func (rf *Factory) MakeSecret(
 	if err != nil {
 		return nil, err
 	}
-	return &Resource{
-		Kunstructured: u,
-		options: types.NewGenArgs(
+	return rf.makeOne(
+		u,
+		types.NewGenArgs(
 			&types.GeneratorArgs{Behavior: args.Behavior},
-			options),
-	}, nil
+			options)), nil
 }

pkg/resource/resource.go

@@ -31,15 +31,69 @@ import (
 // paired with a GenerationBehavior.
 type Resource struct {
 	ifc.Kunstructured
-	options     *types.GenArgs
-	refBy       []resid.ResId
-	refVarNames []string
+	originalName string
+	options      *types.GenArgs
+	refBy        []resid.ResId
+	refVarNames  []string
+}
+
+// DeepCopy returns a new copy of resource
+func (r *Resource) DeepCopy() *Resource {
+	rc := &Resource{
+		Kunstructured: r.Kunstructured.Copy(),
+	}
+	rc.copyOtherFields(r)
+	return rc
+}
+
+// Replace performs replace with other resource.
+func (r *Resource) Replace(other *Resource) {
+	r.SetLabels(mergeStringMaps(other.GetLabels(), r.GetLabels()))
+	r.SetAnnotations(
+		mergeStringMaps(other.GetAnnotations(), r.GetAnnotations()))
+	r.SetName(other.GetName())
+	r.copyOtherFields(other)
+}
+
+func (r *Resource) copyOtherFields(other *Resource) {
+	r.originalName = other.originalName
+	r.options = other.options
+	r.refBy = other.copyRefBy()
+	r.refVarNames = other.copyRefVarNames()
+}
+
+// Merge performs merge with other resource.
+func (r *Resource) Merge(other *Resource) {
+	r.Replace(other)
+	mergeConfigmap(r.Map(), other.Map(), r.Map())
+}
+
+func (r *Resource) copyRefBy() []resid.ResId {
+	s := make([]resid.ResId, len(r.refBy))
+	copy(s, r.refBy)
+	return s
+}
+
+func (r *Resource) copyRefVarNames() []string {
+	s := make([]string, len(r.refVarNames))
+	copy(s, r.refVarNames)
+	return s
 }
 
 func (r *Resource) KunstructEqual(o *Resource) bool {
 	return reflect.DeepEqual(r.Kunstructured, o.Kunstructured)
 }
 
+func (r *Resource) GetOriginalName() string {
+	return r.originalName
+}
+
+// Making this public would be bad.
+func (r *Resource) setOriginalName(n string) *Resource {
+	r.originalName = n
+	return r
+}
+
 // String returns resource as JSON.
 func (r *Resource) String() string {
 	bs, err := r.MarshalJSON()
@@ -49,25 +103,6 @@ func (r *Resource) String() string {
 	return strings.TrimSpace(string(bs)) + r.options.String()
 }
 
-// DeepCopy returns a new copy of resource
-func (r *Resource) DeepCopy() *Resource {
-	rc := &Resource{
-		Kunstructured: r.Kunstructured.Copy(),
-		options:       r.options,
-	}
-	if len(r.refBy) > 0 {
-		refby := make([]resid.ResId, len(r.refBy))
-		copy(refby, r.refBy)
-		rc.refBy = refby
-	}
-	if len(r.refVarNames) > 0 {
-		refVarNames := make([]string, len(r.refVarNames))
-		copy(refVarNames, r.refVarNames)
-		rc.refVarNames = refVarNames
-	}
-	return rc
-}
-
 // AsYAML returns the resource in Yaml form.
 // Easier to read than JSON.
 func (r *Resource) AsYAML() ([]byte, error) {
@@ -88,10 +123,17 @@ func (r *Resource) NeedHashSuffix() bool {
 	return r.options != nil && r.options.NeedsHashSuffix()
 }
 
+// GetNamespace returns the namespace the resource thinks it's in.
+func (r *Resource) GetNamespace() string {
+	namespace, _ := r.GetFieldValue("metadata.namespace")
+	// if err, namespace is empty, so no need to check.
+	return namespace
+}
+
 // Id returns the ResId for the resource.
 func (r *Resource) Id() resid.ResId {
-	namespace, _ := r.GetFieldValue("metadata.namespace")
-	return resid.NewResIdWithPrefixNamespace(r.GetGvk(), r.GetName(), "", namespace)
+	return resid.NewResIdWithPrefixNamespace(
+		r.GetGvk(), r.GetOriginalName(), "", r.GetNamespace())
 }
 
 // GetRefBy returns the ResIds that referred to current resource
@@ -114,21 +156,6 @@ func (r *Resource) AppendRefVarName(variable types.Var) {
 	r.refVarNames = append(r.refVarNames, variable.Name)
 }
 
-// Merge performs merge with other resource.
-func (r *Resource) Merge(other *Resource) {
-	r.Replace(other)
-	mergeConfigmap(r.Map(), other.Map(), r.Map())
-}
-
-// Replace performs replace with other resource.
-func (r *Resource) Replace(other *Resource) {
-	r.SetLabels(mergeStringMaps(other.GetLabels(), r.GetLabels()))
-	r.SetAnnotations(
-		mergeStringMaps(other.GetAnnotations(), r.GetAnnotations()))
-	r.SetName(other.GetName())
-	r.options = other.options
-}
-
 // TODO: Add BinaryData once we sync to new k8s.io/api
 func mergeConfigmap(
 	mergedTo map[string]interface{},

pkg/resource/resource_test.go

@@ -98,7 +98,8 @@ func TestResourceId(t *testing.T) {
 	}{
 		{
 			in: testConfigMap,
-			id: resid.NewResIdWithPrefixNamespace(gvk.Gvk{Version: "v1", Kind: "ConfigMap"}, "winnie", "", "hundred-acre-wood"),
+			id: resid.NewResIdWithNamespace(
+				gvk.Gvk{Version: "v1", Kind: "ConfigMap"}, "winnie", "hundred-acre-wood"),
 		},
 		{
 			in: testDeployment,

pkg/transformers/labelsandannotations_test.go

@@ -28,20 +28,16 @@ import (
 )
 
 var service = gvk.Gvk{Version: "v1", Kind: "Service"}
-var secret = gvk.Gvk{Version: "v1", Kind: "Secret"}
 var cmap = gvk.Gvk{Version: "v1", Kind: "ConfigMap"}
 var ns = gvk.Gvk{Version: "v1", Kind: "Namespace"}
 var deploy = gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"}
-var statefulset = gvk.Gvk{Group: "apps", Version: "v1", Kind: "StatefulSet"}
 var crd = gvk.Gvk{Group: "apiextensions.k8s.io", Version: "v1beta1", Kind: "CustomResourceDefinition"}
 var job = gvk.Gvk{Group: "batch", Version: "v1", Kind: "Job"}
 var cronjob = gvk.Gvk{Group: "batch", Version: "v1beta1", Kind: "CronJob"}
 var pv = gvk.Gvk{Version: "v1", Kind: "PersistentVolume"}
-var pvc = gvk.Gvk{Version: "v1", Kind: "PersistentVolumeClaim"}
 var cr = gvk.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRole"}
 var crb = gvk.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRoleBinding"}
 var sa = gvk.Gvk{Version: "v1", Kind: "ServiceAccount"}
-var ingress = gvk.Gvk{Kind: "Ingress"}
 var rf = resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
 var defaultTransformerConfig = config.MakeDefaultConfig()
 

pkg/transformers/namereference.go

@@ -1,18 +1,5 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
 package transformers
 

pkg/transformers/namereference_test.go

@@ -1,22 +1,10 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
 package transformers
 
 import (
+	"sigs.k8s.io/kustomize/pkg/gvk"
 	"strings"
 	"testing"
 
@@ -26,248 +14,291 @@ import (
 	"sigs.k8s.io/kustomize/pkg/resource"
 )
 
+type rmFactory struct {
+	t  *testing.T
+	m  resmap.ResMap
+	rf *resource.Factory
+}
+
+func NewSeededRmFactory(t *testing.T, rf *resource.Factory, m resmap.ResMap) *rmFactory {
+	return &rmFactory{t: t, rf: rf, m: m}
+}
+
+func NewRmFactory(t *testing.T, rf *resource.Factory) *rmFactory {
+	return NewSeededRmFactory(t, rf, resmap.New())
+}
+
+func (rm *rmFactory) add(m map[string]interface{}) *rmFactory {
+	err := rm.m.Append(rm.rf.FromMap(m))
+	if err != nil {
+		rm.t.Fatalf("test setup failure: %v", err)
+	}
+	return rm
+}
+
+func (rm *rmFactory) addWithId(id resid.ResId, m map[string]interface{}) *rmFactory {
+	err := rm.m.AppendWithId(id, rm.rf.FromMap(m))
+	if err != nil {
+		rm.t.Fatalf("test setup failure: %v", err)
+	}
+	return rm
+}
+
+func (rm *rmFactory) addWithName(n string, m map[string]interface{}) *rmFactory {
+	err := rm.m.Append(rm.rf.FromMapWithName(n, m))
+	if err != nil {
+		rm.t.Fatalf("test setup failure: %v", err)
+	}
+	return rm
+}
+
+func (rm *rmFactory) replaceResource(m map[string]interface{}) *rmFactory {
+	r := rm.rf.FromMap(m)
+	err := rm.m.ReplaceResource(r.Id(), r)
+	if err != nil {
+		rm.t.Fatalf("test setup failure: %v", err)
+	}
+	return rm
+}
+
+func (rm *rmFactory) resMap() resmap.ResMap {
+	return rm.m
+}
+
 func TestNameReferenceHappyRun(t *testing.T) {
 	rf := resource.NewFactory(
 		kunstruct.NewKunstructuredFactoryImpl())
-	m := resmap.FromMap(map[resid.ResId]*resource.Resource{
-		resid.NewResId(cmap, "cm1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "ConfigMap",
-				"metadata": map[string]interface{}{
-					"name": "someprefix-cm1-somehash",
-				},
-			}),
-		resid.NewResId(cmap, "cm2"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "ConfigMap",
-				"metadata": map[string]interface{}{
-					"name": "someprefix-cm2-somehash",
-				},
-			}),
-		resid.NewResId(secret, "secret1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "Secret",
-				"metadata": map[string]interface{}{
-					"name": "someprefix-secret1-somehash",
-				},
-			}),
-		resid.NewResId(pvc, "claim1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "PersistentVolumeClaim",
-				"metadata": map[string]interface{}{
-					"name": "someprefix-claim1",
-				},
-			}),
-		resid.NewResId(ingress, "ingress1"): rf.FromMap(
-			map[string]interface{}{
-				"group":      "extensions",
-				"apiVersion": "v1beta1",
-				"kind":       "Ingress",
-				"metadata": map[string]interface{}{
-					"name": "ingress1",
-					"annotations": map[string]interface{}{
-						"ingress.kubernetes.io/auth-secret":       "secret1",
-						"nginx.ingress.kubernetes.io/auth-secret": "secret1",
-					},
-				},
-				"spec": map[string]interface{}{
-					"backend": map[string]interface{}{
-						"serviceName": "testsvc",
-						"servicePort": "80",
-					},
+	m := NewRmFactory(t, rf).addWithName(
+		"cm1",
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "someprefix-cm1-somehash",
+			},
+		}).addWithName(
+		"cm2",
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "someprefix-cm2-somehash",
+			},
+		}).addWithName(
+		"secret1",
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Secret",
+			"metadata": map[string]interface{}{
+				"name": "someprefix-secret1-somehash",
+			},
+		}).addWithName(
+		"claim1",
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "PersistentVolumeClaim",
+			"metadata": map[string]interface{}{
+				"name": "someprefix-claim1",
+			},
+		}).add(
+		map[string]interface{}{
+			"group":      "extensions",
+			"apiVersion": "v1beta1",
+			"kind":       "Ingress",
+			"metadata": map[string]interface{}{
+				"name": "ingress1",
+				"annotations": map[string]interface{}{
+					"ingress.kubernetes.io/auth-secret":       "secret1",
+					"nginx.ingress.kubernetes.io/auth-secret": "secret1",
 				},
 			},
-		),
-		resid.NewResId(deploy, "deploy1"): rf.FromMap(
-			map[string]interface{}{
-				"group":      "apps",
-				"apiVersion": "v1",
-				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"name": "deploy1",
+			"spec": map[string]interface{}{
+				"backend": map[string]interface{}{
+					"serviceName": "testsvc",
+					"servicePort": "80",
 				},
-				"spec": map[string]interface{}{
-					"template": map[string]interface{}{
-						"spec": map[string]interface{}{
-							"containers": []interface{}{
-								map[string]interface{}{
-									"name":  "nginx",
-									"image": "nginx:1.7.9",
-									"env": []interface{}{
-										map[string]interface{}{
-											"name": "CM_FOO",
-											"valueFrom": map[string]interface{}{
-												"configMapKeyRef": map[string]interface{}{
-													"name": "cm1",
-													"key":  "somekey",
-												},
-											},
-										},
-										map[string]interface{}{
-											"name": "SECRET_FOO",
-											"valueFrom": map[string]interface{}{
-												"secretKeyRef": map[string]interface{}{
-													"name": "secret1",
-													"key":  "somekey",
-												},
-											},
-										},
-									},
-									"envFrom": []interface{}{
-										map[string]interface{}{
-											"configMapRef": map[string]interface{}{
+			},
+		},
+	).add(
+		map[string]interface{}{
+			"group":      "apps",
+			"apiVersion": "v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "deploy1",
+			},
+			"spec": map[string]interface{}{
+				"template": map[string]interface{}{
+					"spec": map[string]interface{}{
+						"containers": []interface{}{
+							map[string]interface{}{
+								"name":  "nginx",
+								"image": "nginx:1.7.9",
+								"env": []interface{}{
+									map[string]interface{}{
+										"name": "CM_FOO",
+										"valueFrom": map[string]interface{}{
+											"configMapKeyRef": map[string]interface{}{
 												"name": "cm1",
 												"key":  "somekey",
 											},
 										},
-										map[string]interface{}{
-											"secretRef": map[string]interface{}{
+									},
+									map[string]interface{}{
+										"name": "SECRET_FOO",
+										"valueFrom": map[string]interface{}{
+											"secretKeyRef": map[string]interface{}{
 												"name": "secret1",
 												"key":  "somekey",
 											},
 										},
 									},
 								},
-							},
-							"imagePullSecrets": []interface{}{
-								map[string]interface{}{
-									"name": "secret1",
-								},
-							},
-							"volumes": map[string]interface{}{
-								"configMap": map[string]interface{}{
-									"name": "cm1",
-								},
-								"projected": map[string]interface{}{
-									"sources": map[string]interface{}{
-										"configMap": map[string]interface{}{
-											"name": "cm2",
+								"envFrom": []interface{}{
+									map[string]interface{}{
+										"configMapRef": map[string]interface{}{
+											"name": "cm1",
+											"key":  "somekey",
 										},
-										"secret": map[string]interface{}{
+									},
+									map[string]interface{}{
+										"secretRef": map[string]interface{}{
 											"name": "secret1",
+											"key":  "somekey",
 										},
 									},
 								},
-								"secret": map[string]interface{}{
-									"secretName": "secret1",
-								},
-								"persistentVolumeClaim": map[string]interface{}{
-									"claimName": "claim1",
+							},
+						},
+						"imagePullSecrets": []interface{}{
+							map[string]interface{}{
+								"name": "secret1",
+							},
+						},
+						"volumes": map[string]interface{}{
+							"configMap": map[string]interface{}{
+								"name": "cm1",
+							},
+							"projected": map[string]interface{}{
+								"sources": map[string]interface{}{
+									"configMap": map[string]interface{}{
+										"name": "cm2",
+									},
+									"secret": map[string]interface{}{
+										"name": "secret1",
+									},
 								},
 							},
+							"secret": map[string]interface{}{
+								"secretName": "secret1",
+							},
+							"persistentVolumeClaim": map[string]interface{}{
+								"claimName": "claim1",
+							},
 						},
 					},
 				},
-			}),
-		resid.NewResId(statefulset, "statefulset1"): rf.FromMap(
-			map[string]interface{}{
-				"group":      "apps",
-				"apiVersion": "v1",
-				"kind":       "StatefulSet",
-				"metadata": map[string]interface{}{
-					"name": "statefulset1",
-				},
-				"spec": map[string]interface{}{
-					"template": map[string]interface{}{
-						"spec": map[string]interface{}{
-							"containers": []interface{}{
-								map[string]interface{}{
-									"name":  "nginx",
-									"image": "nginx:1.7.9",
-								},
+			},
+		}).add(
+		map[string]interface{}{
+			"group":      "apps",
+			"apiVersion": "v1",
+			"kind":       "StatefulSet",
+			"metadata": map[string]interface{}{
+				"name": "statefulset1",
+			},
+			"spec": map[string]interface{}{
+				"template": map[string]interface{}{
+					"spec": map[string]interface{}{
+						"containers": []interface{}{
+							map[string]interface{}{
+								"name":  "nginx",
+								"image": "nginx:1.7.9",
 							},
-							"volumes": map[string]interface{}{
-								"projected": map[string]interface{}{
-									"sources": map[string]interface{}{
-										"configMap": map[string]interface{}{
-											"name": "cm2",
-										},
-										"secret": map[string]interface{}{
-											"name": "secret1",
-										},
+						},
+						"volumes": map[string]interface{}{
+							"projected": map[string]interface{}{
+								"sources": map[string]interface{}{
+									"configMap": map[string]interface{}{
+										"name": "cm2",
+									},
+									"secret": map[string]interface{}{
+										"name": "secret1",
 									},
 								},
 							},
 						},
 					},
 				},
-			}),
-		resid.NewResIdWithPrefixNamespace(sa, "sa", "", "test"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "ServiceAccount",
-				"metadata": map[string]interface{}{
-					"name":      "someprefix-sa",
+			},
+		}).addWithName("sa",
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ServiceAccount",
+			"metadata": map[string]interface{}{
+				"name":      "someprefix-sa",
+				"namespace": "test",
+			},
+		}).add(
+		map[string]interface{}{
+			"apiVersion": "rbac.authorization.k8s.io/v1",
+			"kind":       "ClusterRoleBinding",
+			"metadata": map[string]interface{}{
+				"name": "crb",
+			},
+			"subjects": []interface{}{
+				map[string]interface{}{
+					"kind":      "ServiceAccount",
+					"name":      "sa",
 					"namespace": "test",
 				},
-			}),
-		resid.NewResId(crb, "crb"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "rbac.authorization.k8s.io/v1",
-				"kind":       "ClusterRoleBinding",
-				"metadata": map[string]interface{}{
-					"name": "crb",
-				},
-				"subjects": []interface{}{
-					map[string]interface{}{
-						"kind":      "ServiceAccount",
-						"name":      "sa",
-						"namespace": "test",
+			},
+		}).add(
+		map[string]interface{}{
+			"apiVersion": "rbac.authorization.k8s.io/v1",
+			"kind":       "ClusterRole",
+			"metadata": map[string]interface{}{
+				"name": "cr",
+			},
+			"rules": []interface{}{
+				map[string]interface{}{
+					"resources": []interface{}{
+						"secrets",
+					},
+					"resourceNames": []interface{}{
+						"secret1",
+						"secret1",
+						"secret2",
 					},
 				},
-			}),
-		resid.NewResId(cr, "cr"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "rbac.authorization.k8s.io/v1",
-				"kind":       "ClusterRole",
-				"metadata": map[string]interface{}{
-					"name": "cr",
-				},
-				"rules": []interface{}{
-					map[string]interface{}{
-						"resources": []interface{}{
-							"secrets",
-						},
-						"resourceNames": []interface{}{
-							"secret1",
-							"secret1",
-							"secret2",
-						},
-					},
-				},
-			}),
-		resid.NewResId(cronjob, "cronjob1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "batch/v1beta1",
-				"kind":       "CronJob",
-				"metadata": map[string]interface{}{
-					"name": "cronjob1",
-				},
-				"spec": map[string]interface{}{
-					"schedule": "0 14 * * *",
-					"jobTemplate": map[string]interface{}{
-						"spec": map[string]interface{}{
-							"template": map[string]interface{}{
-								"spec": map[string]interface{}{
-									"containers": []interface{}{
-										map[string]interface{}{
-											"name":  "main",
-											"image": "myimage",
-										},
+			},
+		}).add(
+		map[string]interface{}{
+			"apiVersion": "batch/v1beta1",
+			"kind":       "CronJob",
+			"metadata": map[string]interface{}{
+				"name": "cronjob1",
+			},
+			"spec": map[string]interface{}{
+				"schedule": "0 14 * * *",
+				"jobTemplate": map[string]interface{}{
+					"spec": map[string]interface{}{
+						"template": map[string]interface{}{
+							"spec": map[string]interface{}{
+								"containers": []interface{}{
+									map[string]interface{}{
+										"name":  "main",
+										"image": "myimage",
 									},
-									"volumes": map[string]interface{}{
-										"projected": map[string]interface{}{
-											"sources": map[string]interface{}{
-												"configMap": map[string]interface{}{
-													"name": "cm2",
-												},
-												"secret": map[string]interface{}{
-													"name": "secret1",
-												},
+								},
+								"volumes": map[string]interface{}{
+									"projected": map[string]interface{}{
+										"sources": map[string]interface{}{
+											"configMap": map[string]interface{}{
+												"name": "cm2",
+											},
+											"secret": map[string]interface{}{
+												"name": "secret1",
 											},
 										},
 									},
@@ -276,12 +307,10 @@ func TestNameReferenceHappyRun(t *testing.T) {
 						},
 					},
 				},
-			}),
-	})
+			},
+		}).resMap()
 
-	expected := m.ShallowCopy()
-
-	expected.ReplaceResource(resid.NewResId(deploy, "deploy1"), rf.FromMap(
+	expected := NewSeededRmFactory(t, rf, m.ShallowCopy()).replaceResource(
 		map[string]interface{}{
 			"group":      "apps",
 			"apiVersion": "v1",
@@ -361,8 +390,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
 					},
 				},
 			},
-		}))
-	expected.ReplaceResource(resid.NewResId(statefulset, "statefulset1"), rf.FromMap(
+		}).replaceResource(
 		map[string]interface{}{
 			"group":      "apps",
 			"apiVersion": "v1",
@@ -394,8 +422,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
 					},
 				},
 			},
-		}))
-	expected.ReplaceResource(resid.NewResId(ingress, "ingress1"), rf.FromMap(
+		}).replaceResource(
 		map[string]interface{}{
 			"group":      "extensions",
 			"apiVersion": "v1beta1",
@@ -413,9 +440,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
 					"servicePort": "80",
 				},
 			},
-		},
-	))
-	expected.ReplaceResource(resid.NewResId(crb, "crb"), rf.FromMap(
+		}).replaceResource(
 		map[string]interface{}{
 			"apiVersion": "rbac.authorization.k8s.io/v1",
 			"kind":       "ClusterRoleBinding",
@@ -429,8 +454,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
 					"namespace": "test",
 				},
 			},
-		}))
-	expected.ReplaceResource(resid.NewResId(cr, "cr"), rf.FromMap(
+		}).replaceResource(
 		map[string]interface{}{
 			"apiVersion": "rbac.authorization.k8s.io/v1",
 			"kind":       "ClusterRole",
@@ -449,8 +473,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
 					},
 				},
 			},
-		}))
-	expected.ReplaceResource(resid.NewResId(cronjob, "cronjob1"), rf.FromMap(
+		}).replaceResource(
 		map[string]interface{}{
 			"apiVersion": "batch/v1beta1",
 			"kind":       "CronJob",
@@ -486,7 +509,8 @@ func TestNameReferenceHappyRun(t *testing.T) {
 					},
 				},
 			},
-		}))
+		}).resMap()
+
 	nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
 	err := nrt.Transform(m)
 	if err != nil {
@@ -505,29 +529,27 @@ func TestNameReferenceUnhappyRun(t *testing.T) {
 		expectedErr string
 	}{
 		{
-			resMap: resmap.FromMap(map[resid.ResId]*resource.Resource{
-				resid.NewResId(cr, "cr"): rf.FromMap(
-					map[string]interface{}{
-						"apiVersion": "rbac.authorization.k8s.io/v1",
-						"kind":       "ClusterRole",
-						"metadata": map[string]interface{}{
-							"name": "cr",
-						},
-						"rules": []interface{}{
-							map[string]interface{}{
-								"resources": []interface{}{
-									"secrets",
-								},
-								"resourceNames": []interface{}{
-									[]interface{}{},
-								},
+			resMap: NewRmFactory(t, rf).add(
+				map[string]interface{}{
+					"apiVersion": "rbac.authorization.k8s.io/v1",
+					"kind":       "ClusterRole",
+					"metadata": map[string]interface{}{
+						"name": "cr",
+					},
+					"rules": []interface{}{
+						map[string]interface{}{
+							"resources": []interface{}{
+								"secrets",
+							},
+							"resourceNames": []interface{}{
+								[]interface{}{},
 							},
 						},
-					}),
-			}),
+					},
+				}).resMap(),
 			expectedErr: "is expected to be string"},
-		{resMap: resmap.FromMap(map[resid.ResId]*resource.Resource{
-			resid.NewResId(cr, "cr"): rf.FromMap(
+		{
+			resMap: NewRmFactory(t, rf).add(
 				map[string]interface{}{
 					"apiVersion": "rbac.authorization.k8s.io/v1",
 					"kind":       "ClusterRole",
@@ -544,8 +566,7 @@ func TestNameReferenceUnhappyRun(t *testing.T) {
 							},
 						},
 					},
-				}),
-		}),
+				}).resMap(),
 			expectedErr: "is expected to be either a string or a []interface{}"},
 	}
 
@@ -566,54 +587,52 @@ func TestNameReferenceUnhappyRun(t *testing.T) {
 func TestNameReferencePersistentVolumeHappyRun(t *testing.T) {
 	rf := resource.NewFactory(
 		kunstruct.NewKunstructuredFactoryImpl())
-	m := resmap.FromMap(map[resid.ResId]*resource.Resource{
-		resid.NewResId(pv, "volume1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "PersistentVolume",
-				"metadata": map[string]interface{}{
-					"name": "someprefix-volume1",
-				},
-			}),
+	m := NewRmFactory(t, rf).addWithName(
+		"volume1",
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "PersistentVolume",
+			"metadata": map[string]interface{}{
+				"name": "someprefix-volume1",
+			},
+		}).addWithName(
+		"claim1",
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "PersistentVolumeClaim",
+			"metadata": map[string]interface{}{
+				"name":      "someprefix-claim1",
+				"namespace": "some-namespace",
+			},
+			"spec": map[string]interface{}{
+				"volumeName": "volume1",
+			},
+		}).resMap()
 
-		resid.NewResId(pvc, "claim1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "PersistentVolumeClaim",
-				"metadata": map[string]interface{}{
-					"name":      "someprefix-claim1",
-					"namespace": "some-namespace",
-				},
-				"spec": map[string]interface{}{
-					"volumeName": "volume1",
-				},
-			}),
-	})
-
-	expected := resmap.FromMap(map[resid.ResId]*resource.Resource{
-		resid.NewResId(pv, "volume1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "PersistentVolume",
-				"metadata": map[string]interface{}{
-					"name": "someprefix-volume1",
-				},
-			}),
-
-		resid.NewResId(pvc, "claim1"): rf.FromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "PersistentVolumeClaim",
-				"metadata": map[string]interface{}{
-					"name":      "someprefix-claim1",
-					"namespace": "some-namespace",
-				},
-				"spec": map[string]interface{}{
-					"volumeName": "someprefix-volume1",
-				},
-			}),
-	})
-	expected.GetById(resid.NewResId(pv, "volume1")).AppendRefBy(resid.NewResId(pvc, "claim1"))
+	expected := NewRmFactory(t, rf).addWithName(
+		"volume1",
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "PersistentVolume",
+			"metadata": map[string]interface{}{
+				"name": "someprefix-volume1",
+			},
+		}).addWithName(
+		"claim1",
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "PersistentVolumeClaim",
+			"metadata": map[string]interface{}{
+				"name":      "someprefix-claim1",
+				"namespace": "some-namespace",
+			},
+			"spec": map[string]interface{}{
+				"volumeName": "someprefix-volume1",
+			},
+		}).resMap()
+	expected.GetById(
+		resid.NewResId(gvk.Gvk{Version: "v1", Kind: "PersistentVolume"}, "volume1")).AppendRefBy(
+		resid.NewResId(gvk.Gvk{Version: "v1", Kind: "PersistentVolumeClaim"}, "claim1"))
 	nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
 	err := nrt.Transform(m)
 	if err != nil {

pkg/transformers/namespace_test.go

@@ -110,7 +110,7 @@ func TestNamespaceRun(t *testing.T) {
 			}),
 	})
 	expected := resmap.FromMap(map[resid.ResId]*resource.Resource{
-		resid.NewResIdWithPrefixNamespace(ns, "ns1", "", ""): rf.FromMap(
+		resid.NewResIdWithNamespace(ns, "ns1", ""): rf.FromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "Namespace",
@@ -118,7 +118,7 @@ func TestNamespaceRun(t *testing.T) {
 					"name": "ns1",
 				},
 			}),
-		resid.NewResIdWithPrefixNamespace(cmap, "cm1", "", "test"): rf.FromMap(
+		resid.NewResIdWithNamespace(cmap, "cm1", "test"): rf.FromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "ConfigMap",
@@ -127,7 +127,7 @@ func TestNamespaceRun(t *testing.T) {
 					"namespace": "test",
 				},
 			}),
-		resid.NewResIdWithPrefixNamespace(cmap, "cm2", "", "test"): rf.FromMap(
+		resid.NewResIdWithNamespace(cmap, "cm2", "test"): rf.FromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "ConfigMap",
@@ -136,10 +136,10 @@ func TestNamespaceRun(t *testing.T) {
 					"namespace": "test",
 				},
 			}),
-		resid.NewResIdWithPrefixNamespace(cmap, "cm3", "", "test"): rf.FromMap(
+		resid.NewResIdWithNamespace(cmap, "cm3", "test"): rf.FromMap(
 			map[string]interface{}{},
 		),
-		resid.NewResIdWithPrefixNamespace(sa, "default", "", "test"): rf.FromMap(
+		resid.NewResIdWithNamespace(sa, "default", "test"): rf.FromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "ServiceAccount",
@@ -148,7 +148,7 @@ func TestNamespaceRun(t *testing.T) {
 					"namespace": "test",
 				},
 			}),
-		resid.NewResIdWithPrefixNamespace(sa, "service-account", "", "test"): rf.FromMap(
+		resid.NewResIdWithNamespace(sa, "service-account", "test"): rf.FromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "ServiceAccount",