IT for Glue

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

Diff for: src/main/java/io/csviri/operator/glue/reconciler/ValidationAndErrorHandler.java

@@ -35,10 +35,11 @@ public class ValidationAndErrorHandler {
     if (e instanceof ValidationAndErrorHandler.NonUniqueNameException ex) {
       resource.getStatus()
           .setErrorMessage(NON_UNIQUE_NAMES_FOUND_PREFIX + String.join(",", ex.getDuplicates()));
+      return ErrorStatusUpdateControl.updateStatus(resource).withNoRetry();
     } else {
       resource.getStatus().setErrorMessage("Error during reconciliation");
+      return ErrorStatusUpdateControl.updateStatus(resource);
     }
-    return ErrorStatusUpdateControl.updateStatus(resource);
   }
 
   public void checkIfNamesAreUnique(GlueSpec glueSpec) {
@@ -58,7 +59,6 @@ public void checkIfNamesAreUnique(GlueSpec glueSpec) {
     if (!duplicates.isEmpty()) {
       throw new NonUniqueNameException(duplicates);
     }
-
   }
 
   public static class NonUniqueNameException extends GlueException {

Diff for: src/main/java/io/csviri/operator/glue/reconciler/glue/GlueReconciler.java

@@ -2,6 +2,8 @@
 
 import java.util.*;
 
+import io.csviri.operator.glue.customresource.glue.GlueStatus;
+import io.csviri.operator.glue.customresource.operator.ResourceFlowOperatorStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -282,6 +284,9 @@ private String parentFinalizer(String glueName) {
   @Override
   public ErrorStatusUpdateControl<Glue> updateErrorStatus(Glue resource, Context<Glue> context,
       Exception e) {
+    if (resource.getStatus() == null) {
+      resource.setStatus(new GlueStatus());
+    }
     return validationAndErrorHandler.updateStatusErrorMessage(e, resource);
   }
 }

Diff for: src/main/java/io/csviri/operator/glue/reconciler/operator/GlueOperatorReconciler.java

@@ -5,6 +5,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import io.csviri.operator.glue.customresource.operator.ResourceFlowOperatorStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -139,6 +140,9 @@ public Map<String, EventSource> prepareEventSources(
   @Override
   public ErrorStatusUpdateControl<GlueOperator> updateErrorStatus(GlueOperator resource,
       Context<GlueOperator> context, Exception e) {
+    if (resource.getStatus() == null) {
+      resource.setStatus(new ResourceFlowOperatorStatus());
+    }
     return validationAndErrorHandler.updateStatusErrorMessage(e, resource);
   }
 

Diff for: src/test/java/io/csviri/operator/glue/GlueTest.java

@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.stream.IntStream;
 
+import io.csviri.operator.glue.reconciler.ValidationAndErrorHandler;
 import org.junit.jupiter.api.Test;
 
 import io.csviri.operator.glue.customresource.glue.DependentResourceSpec;
@@ -223,6 +224,18 @@ void changingWorkflow() {
     });
   }
 
+  @Test
+  void nonUniqueNameResultsInErrorMessageOnStatus() {
+    Glue glue = create(TestUtils.loadResoureFlow("/glue/NonUniqueName.yaml"));
+
+    await().untilAsserted(()-> {
+      var actualGlue = get(Glue.class,glue.getMetadata().getName());
+
+      assertThat(actualGlue.getStatus()).isNotNull();
+      assertThat(actualGlue.getStatus().getErrorMessage())
+              .startsWith(ValidationAndErrorHandler.NON_UNIQUE_NAMES_FOUND_PREFIX);
+    });
+  }
 
 
   //

Diff for: src/test/resources/glue/NonUniqueName.yaml

@@ -0,0 +1,23 @@
+# Invalid GLUE, presents resources with non-unique name
+apiVersion: io.csviri.operator.glue/v1beta1
+kind: Glue
+metadata:
+  name: templating-sample
+spec:
+  resources:
+    - name: configMap1
+      resource:
+        apiVersion: v1
+        kind: ConfigMap
+        metadata:
+          name: cm1
+        data:
+          key: "value1"
+    - name: configMap1
+      resource:
+        apiVersion: v1
+        kind: ConfigMap
+        metadata:
+          name: cm2
+        data:
+          key: "value1"