Keep var refernce in resources

pkg/accumulator/resaccumulator.go

@@ -63,6 +63,19 @@ func (ra *ResAccumulator) GetTransformerConfig() *config.TransformerConfig {
 }
 
 func (ra *ResAccumulator) MergeVars(incoming []types.Var) error {
+	for _, v := range incoming {
+		matched := ra.resMap.GetMatchingIds(
+			resid.NewResId(v.ObjRef.GVK(), v.ObjRef.Name).GvknEquals)
+		if len(matched) > 1 {
+			return fmt.Errorf(
+				"found %d resId matches for var %s "+
+					"(unable to disambiguate)",
+				len(matched), v)
+		}
+		if len(matched) == 1 {
+			ra.resMap.GetById(matched[0]).AppendRefVarName(v)
+		}
+	}
 	return ra.varSet.MergeSlice(incoming)
 }
 
@@ -78,34 +91,41 @@ func (ra *ResAccumulator) MergeAccumulator(other *ResAccumulator) (err error) {
 	return ra.varSet.MergeSet(other.varSet)
 }
 
+func (ra *ResAccumulator) findValueFromResources(v types.Var) (string, error) {
+	for _, res := range ra.resMap.Resources() {
+		for _, varName := range res.GetRefVarNames() {
+			if varName == v.Name {
+				s, err := res.GetFieldValue(v.FieldRef.FieldPath)
+				if err != nil {
+					return "", fmt.Errorf(
+						"field specified in var '%v' "+
+							"not found in corresponding resource", v)
+				}
+
+				return s, nil
+			}
+		}
+	}
+
+	return "", fmt.Errorf(
+		"var '%v' cannot be mapped to a field "+
+			"in the set of known resources", v)
+}
+
 // makeVarReplacementMap returns a map of Var names to
 // their final values. The values are strings intended
 // for substitution wherever the $(var.Name) occurs.
 func (ra *ResAccumulator) makeVarReplacementMap() (map[string]string, error) {
 	result := map[string]string{}
 	for _, v := range ra.Vars() {
-		matched := ra.resMap.GetMatchingIds(
-			resid.NewResId(v.ObjRef.GVK(), v.ObjRef.Name).GvknEquals)
-		if len(matched) > 1 {
-			return nil, fmt.Errorf(
-				"found %d resId matches for var %s "+
-					"(unable to disambiguate)",
-				len(matched), v)
-		}
-		if len(matched) == 1 {
-			s, err := ra.resMap.GetById(matched[0]).GetFieldValue(v.FieldRef.FieldPath)
-			if err != nil {
-				return nil, fmt.Errorf(
-					"field specified in var '%v' "+
-						"not found in corresponding resource", v)
-			}
-			result[v.Name] = s
-		} else {
-			return nil, fmt.Errorf(
-				"var '%v' cannot be mapped to a field "+
-					"in the set of known resources", v)
+		s, err := ra.findValueFromResources(v)
+		if err != nil {
+			return nil, err
 		}
+
+		result[v.Name] = s
 	}
+
 	return result, nil
 }
 

pkg/accumulator/resaccumulator_test.go

@@ -202,10 +202,6 @@ func TestResolveVarsVarNeedsDisambiguation(t *testing.T) {
 			},
 		},
 	})
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	err = ra.ResolveVars()
 	if err == nil {
 		t.Fatalf("expected error")
 	}
@@ -270,6 +266,87 @@ func TestResolveVarsUnmappableVar(t *testing.T) {
 	}
 }
 
+func TestResolveVarsWithNoambiguiation(t *testing.T) {
+	ra, rf, err := makeResAccumulator()
+	if err != nil {
+		t.Fatalf("unexpected err: %v", err)
+	}
+
+	err = ra.MergeVars([]types.Var{
+		{
+			Name: "SERVICE_ONE",
+			ObjRef: types.Target{
+				Gvk:  gvk.Gvk{Version: "v1", Kind: "Service"},
+				Name: "backendOne",
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("unexpected err: %v", err)
+	}
+
+	// Create another accumulator having a resource with different prefix
+	ra1 := MakeEmptyAccumulator()
+	rm1 := resmap.FromMap(map[resid.ResId]*resource.Resource{
+		resid.NewResId(gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"},
+			"deploy2"): rf.FromMap(
+			map[string]interface{}{
+				"apiVersion": "apps/v1",
+				"kind":       "Deployment",
+				"metadata": map[string]interface{}{
+					"name": "deploy2",
+				},
+				"spec": map[string]interface{}{
+					"template": map[string]interface{}{
+						"spec": map[string]interface{}{
+							"containers": []interface{}{
+								map[string]interface{}{
+									"command": []interface{}{
+										"myserver",
+										"--somebackendService $(SUB_SERVICE_ONE)",
+									},
+								},
+							},
+						},
+					},
+				},
+			}),
+		resid.NewResIdWithPrefixNamespace(
+			gvk.Gvk{Version: "v1", Kind: "Service"},
+			"backendOne", "sub-", ""): rf.FromMap(
+			map[string]interface{}{
+				"apiVersion": "v1",
+				"kind":       "Service",
+				"metadata": map[string]interface{}{
+					"name": "backendOne",
+				},
+			}),
+	})
+	ra1.AppendAll(rm1)
+
+	err = ra1.MergeVars([]types.Var{
+		{
+			Name: "SUB_SERVICE_ONE",
+			ObjRef: types.Target{
+				Gvk:  gvk.Gvk{Version: "v1", Kind: "Service"},
+				Name: "backendOne",
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("unexpected err: %v", err)
+	}
+	err = ra.MergeAccumulator(ra1)
+	if err != nil {
+		t.Fatalf("unexpected err: %v", err)
+	}
+
+	err = ra.ResolveVars()
+	if err != nil {
+		t.Fatalf("unexpected err: %v", err)
+	}
+}
+
 func find(name string, resMap resmap.ResMap) *resource.Resource {
 	for k, v := range resMap.AsMap() {
 		if k.Name() == name {