E2e tests for forEach field

flanksource · Jan 15, 2021 · 375f87b · 375f87b
1 parent 871e63e
commit 375f87b
Show file tree

Hide file tree

Showing 3 changed files with 162 additions and 1 deletion.
diff --git a/k8s/template_manager.go b/k8s/template_manager.go
@@ -372,7 +372,7 @@ func (tm *TemplateManager) JSONPath(object interface{}, jsonpath string) (*ForEa
 	value := gjson.Get(string(jsonObject), jsonpath)
 
 	if !value.Exists() {
-		return nil, errors.Errorf("object %s does not have jsonPath %s", string(jsonObject), jsonpath)
+		return &ForEach{}, nil
 	}
 
 	if value.IsArray() {

diff --git a/test/e2e.go b/test/e2e.go
@@ -47,6 +47,8 @@ var (
 		"deployment-replicas":          TestDeploymentReplicas,
 		"copy-to-namespace":            TestCopyToNamespace,
 		"awx-operator":                 TestAwxOperator,
+		"for-each-array":               TestForEachWithArray,
+		"for-each-map":                 TestForEachWithMap,
 	}
 	scheme              = runtime.NewScheme()
 	restConfig          *rest.Config
@@ -388,6 +390,122 @@ func TestAwxOperator(ctx context.Context, test *console.TestResults) error {
 	return nil
 }
 
+func TestForEachWithArray(ctx context.Context, test *console.TestResults) error {
+	testName := "TestForEachWithArray"
+	ns := fmt.Sprintf("test-abcd-e2e-%s", utils.RandomString(6))
+	if err := client.CreateOrUpdateNamespace(ns, nil, nil); err != nil {
+		test.Failf(testName, "failed to create namespace %s: %v", ns, err)
+		return err
+	}
+
+	defer func() {
+		if err := k8s.CoreV1().Namespaces().Delete(context.Background(), ns, metav1.DeleteOptions{}); err != nil {
+			logger.Errorf("failed to delete namespace %s: %v", ns, err)
+		}
+	}()
+
+	abcdName := fmt.Sprintf("abcd-test-array")
+	abcd := &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": "abcd.flanksource.com/v1",
+			"kind":       "ABCD",
+			"metadata": map[string]interface{}{
+				"name":      abcdName,
+				"namespace": ns,
+			},
+			"spec": map[string]interface{}{
+				"topics": []string{"a", "b", "c", "d"},
+			},
+		},
+	}
+
+	if err := client.Apply(ns, abcd); err != nil {
+		test.Failf(testName, "failed to create test abcd: %v", err)
+		return err
+	}
+
+	defer func() {
+		if err := client.DeleteUnstructured(ns, abcd); err != nil {
+			logger.Errorf("failed to delete abcd %s: %v", abcdName, err)
+		}
+	}()
+
+	abcdTopics := []string{"a", "b", "c", "d"}
+	for _, topic := range abcdTopics {
+		name := fmt.Sprintf("abcd-test-array-%s", topic)
+		if err := waitForAbcdTopic(ctx, name, ns, map[string]string{"topicName": topic}); err != nil {
+			test.Failf(testName, "ABCD topic %s not found: %v", name, err)
+		} else {
+			test.Passf(testName, "ABCD topic %s found", name)
+		}
+	}
+
+	return nil
+}
+
+func TestForEachWithMap(ctx context.Context, test *console.TestResults) error {
+	testName := "TestForEachWithMap"
+	ns := fmt.Sprintf("test-abcd-e2e-%s", utils.RandomString(6))
+	if err := client.CreateOrUpdateNamespace(ns, nil, nil); err != nil {
+		test.Failf(testName, "failed to create namespace %s: %v", ns, err)
+		return err
+	}
+
+	defer func() {
+		if err := k8s.CoreV1().Namespaces().Delete(context.Background(), ns, metav1.DeleteOptions{}); err != nil {
+			logger.Errorf("failed to delete namespace %s: %v", ns, err)
+		}
+	}()
+
+	abcdName := fmt.Sprintf("abcd-test-map")
+	abcd := &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": "abcd.flanksource.com/v1",
+			"kind":       "ABCD",
+			"metadata": map[string]interface{}{
+				"name":      abcdName,
+				"namespace": ns,
+			},
+			"spec": map[string]interface{}{
+				"topicsMap": map[string]string{
+					"a1": "a2",
+					"b1": "b2",
+					"c1": "c2",
+					"d1": "d2",
+				},
+			},
+		},
+	}
+
+	if err := client.Apply(ns, abcd); err != nil {
+		test.Failf(testName, "failed to create test abcd: %v", err)
+		return err
+	}
+
+	defer func() {
+		if err := client.DeleteUnstructured(ns, abcd); err != nil {
+			logger.Errorf("failed to delete abcd %s: %v", abcdName, err)
+		}
+	}()
+
+	abcdTopics := map[string]string{
+		"a1": "a2",
+		"b1": "b2",
+		"c1": "c2",
+		"d1": "d2",
+	}
+	for k, v := range abcdTopics {
+		name := fmt.Sprintf("abcd-test-map-%s", k)
+		if err := waitForAbcdTopic(ctx, name, ns, map[string]string{k: v}); err != nil {
+			test.Failf(testName, "ABCD topic %s not found: %v", name, err)
+		} else {
+			test.Passf(testName, "ABCD topic %s found", name)
+		}
+	}
+
+	return nil
+}
+
 func waitForDeploymentChanged(ctx context.Context, deployment *appsv1.Deployment, fn deploymentFn) (*appsv1.Deployment, error) {
 	for {
 		d, err := k8s.AppsV1().Deployments(deployment.Namespace).Get(ctx, deployment.Name, metav1.GetOptions{})
@@ -526,6 +644,48 @@ func waitForPostgres(ctx context.Context, postgres *unstructured.Unstructured, t
 	}
 }
 
+func waitForAbcdTopic(ctx context.Context, name, namespace string, spec map[string]string) error {
+	abcdTopic := &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": "abcd.flanksource.com/v1",
+			"kind":       "ABCDTopic",
+			"metadata": map[string]interface{}{
+				"name":      name,
+				"namespace": namespace,
+			},
+		},
+	}
+
+	for {
+		client, _, _, err := client.GetDynamicClientFor(namespace, abcdTopic)
+		if err != nil {
+			return errors.Wrap(err, "failed to get client for ABCDTopic")
+		}
+		topic, err := client.Get(ctx, name, metav1.GetOptions{})
+		if err != nil && !kerrors.IsNotFound(err) {
+			return errors.Wrapf(err, "failed to get abcd topic %s", name)
+		} else if kerrors.IsNotFound(err) {
+			time.Sleep(2 * time.Second)
+			continue
+		}
+
+		topicSpecYaml, err := yaml.Marshal(topic.Object["spec"])
+		if err != nil {
+			return errors.Wrap(err, "failed to marshal topic to yaml")
+		}
+
+		specYaml, err := yaml.Marshal(spec)
+		if err != nil {
+			return errors.Wrap(err, "failed to marshal spec to yaml")
+		}
+
+		if !expectYamlMatch(string(specYaml), string(topicSpecYaml)) {
+			return fmt.Errorf("Spec for ABCDTopic %s does not match", name)
+		}
+		return nil
+	}
+}
+
 func readFixture(path string) (*templatev1.Template, error) {
 	templateBytes, err := ioutil.ReadFile(filepath.Join("test", "fixtures", path))
 	if err != nil {

diff --git a/test/e2e.sh b/test/e2e.sh
@@ -45,6 +45,7 @@ $KARINA deploy postgres-operator
 
 kubectl apply -f examples/postgres-operator.yml
 kubectl apply -f examples/namespacerequest.yml
+kubectl apply -f examples/for-each.yml
 kubectl apply -f test/fixtures/awx-operator.yml
 
 export IMG=flanksource/template-operator:v1