Merge pull request #125 from weaveworks/ignore-empty-repeat

Ignore empty repeat values.

Author: bigkevmcd

controllers/templates/renderer.go

@@ -89,7 +89,10 @@ func repeat(index int, tmpl templatesv1.GitOpsSetTemplate, params map[string]any
 			slice, ok := v.Interface().([]any)
 			if ok {
 				repeated = append(repeated, slice...)
-			} else {
+				continue
+			}
+
+			if !v.IsNil() {
 				repeated = append(repeated, v.Interface())
 			}
 		}

controllers/templates/renderer_test.go

@@ -206,6 +206,34 @@ func TestRender(t *testing.T) {
 					addLabels[*corev1.Namespace](map[string]string{"templates.weave.works/name": "test-gitops-set", "templates.weave.works/namespace": testNS}))),
 			},
 		},
+		{
+			name: "repeat elements with no elements does not error",
+			elements: []apiextensionsv1.JSON{
+				{Raw: []byte(`{"env": "engineering-dev","externalIP": "192.168.50.50","namespaces":null}`)},
+			},
+			setOptions: []func(*templatesv1.GitOpsSet){
+				func(s *templatesv1.GitOpsSet) {
+					s.Spec.Templates = []templatesv1.GitOpsSetTemplate{
+						{
+							Content: runtime.RawExtension{
+								Raw: mustMarshalJSON(t, makeTestService(types.NamespacedName{Name: "{{ .Element.env}}-demo1", Namespace: testNS})),
+							},
+						},
+						{
+							Repeat: "{ $.namespaces }",
+							Content: runtime.RawExtension{
+								Raw: mustMarshalJSON(t, makeTestNamespace("{{ .Repeat.name }}-{{ .Element.env }}")),
+							},
+						},
+					}
+				},
+			},
+			want: []*unstructured.Unstructured{
+				test.ToUnstructured(t, makeTestService(nsn(testNS, "engineering-dev-demo1"), setClusterIP("192.168.50.50"),
+					addAnnotations(map[string]string{"app.kubernetes.io/instance": "engineering-dev"}),
+					addLabels[*corev1.Service](map[string]string{"templates.weave.works/name": "test-gitops-set", "templates.weave.works/namespace": testNS}))),
+			},
+		},
 		{
 			name: "repeat elements with maps",
 			elements: []apiextensionsv1.JSON{