Merge pull request #9324 from deads2k/template-key

Merged by openshift-bot
openshift · Jun 14, 2016 · ad1561e · ad1561e
2 parents 2326e1e + b469465
commit ad1561e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/pkg/util/stringreplace/object.go b/pkg/util/stringreplace/object.go
@@ -43,9 +43,12 @@ func visitValue(v reflect.Value, visitor func(string) string) {
 
 	case reflect.Map:
 		vt := v.Type().Elem()
-		for _, k := range v.MapKeys() {
-			val := visitUnsettableValues(vt, v.MapIndex(k), visitor)
-			v.SetMapIndex(k, val)
+		for _, oldKey := range v.MapKeys() {
+			newKey := visitUnsettableValues(oldKey.Type(), oldKey, visitor)
+			oldValue := v.MapIndex(oldKey)
+			newValue := visitUnsettableValues(vt, oldValue, visitor)
+			v.SetMapIndex(oldKey, reflect.Value{})
+			v.SetMapIndex(newKey, newValue)
 		}
 
 	case reflect.String:

diff --git a/pkg/util/stringreplace/object_test.go b/pkg/util/stringreplace/object_test.go
@@ -39,7 +39,7 @@ func TestVisitObjectStringsOnStruct(t *testing.T) {
 			},
 			{
 				MapInMap: map[string]map[string]string{
-					"foo": {"bar": "sample-test"},
+					"sample-foo": {"sample-bar": "sample-test"},
 				},
 			},
 		},
@@ -49,7 +49,7 @@ func TestVisitObjectStringsOnStruct(t *testing.T) {
 		},
 		{
 			{ArrayInMap: map[string][]interface{}{"key": {"foo", "bar"}}},
-			{ArrayInMap: map[string][]interface{}{"key": {"sample-foo", "sample-bar"}}},
+			{ArrayInMap: map[string][]interface{}{"sample-key": {"sample-foo", "sample-bar"}}},
 		},
 	}
 	for i := range samples {
@@ -69,15 +69,15 @@ func TestVisitObjectStringsOnMap(t *testing.T) {
 	samples := [][]map[string]string{
 		{
 			{"foo": "bar"},
-			{"foo": "sample-bar"},
+			{"sample-foo": "sample-bar"},
 		},
 		{
 			{"empty": ""},
-			{"empty": "sample-"},
+			{"sample-empty": "sample-"},
 		},
 		{
 			{"": "invalid"},
-			{"": "sample-invalid"},
+			{"sample-": "sample-invalid"},
 		},
 	}