Update tests to use range with both data and index

Author: michaelvl

controllers/gateway_controller_test.go

@@ -124,14 +124,14 @@ spec:
         data:
           valueIntermediate: {{ (index .Resources.configMapTestSource 0).data.valueToRead1 }}
       configMapTestIntermediate2: |
-        {{ range .Values.configmap2SuffixData }}
+        {{ range $idx,$suffix := .Values.configmap2SuffixData }}
         apiVersion: v1
         kind: ConfigMap
         metadata:
-          name: intermediate2-configmap-{{ . }}
+          name: intermediate2-configmap-{{ $idx }}
           namespace: {{ $.Gateway.metadata.namespace }}
         data:
-          valueIntermediate: {{ (index $.Resources.configMapTestSource 0).data.valueToRead1 }}-{{ . }}
+          valueIntermediate: {{ (index $.Resources.configMapTestSource 0).data.valueToRead1 }}-{{ $suffix }}
         ---
         {{ end }}
       # Use references to multiple resources coupled with template pipeline and functions

controllers/templating_test.go

@@ -22,8 +22,8 @@ t2: |
     name: {{ .Values.name2 }}
     {{ end }}
 t3: |
-    {{ range .Values.t3data }}
-    name: {{ $.Values.name3 }}-{{ . }}
+    {{ range $idx,$data := .Values.t3data }}
+    name: {{ $.Values.name3 }}-{{ $data }}-{{ $idx }}
     ---
     {{ end }}
 `
@@ -97,4 +97,7 @@ func TestTemplate2map(t *testing.T) {
 	if len(rawResources) != 3 {
 		t.Fatalf("Error rendering multi-resource, got len %v, expected 3", len(rawResources))
 	}
+	if rawResources[2]["name"] != "t3name-foo3-2" {
+		t.Fatalf("Rendered template error, got %v, expected 't3name-foo3-2'", rawResources[2]["name"])
+	}
 }