chore(tests): add condition with result tests

Signed-off-by: Chris Laprun <[email protected]>

Author: metacosm

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutorTest.java

@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.AggregatedOperatorException;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
@@ -184,8 +185,18 @@ void onlyOneDependsOnErroredResourceNotReconciled() {
 
   @Test
   void simpleReconcileCondition() {
+    final var result = "Some error message";
+    final var unmetWithResult = new ResultCondition<ConfigMap, TestCustomResource, String>() {
+      @Override
+      public Result<String> detailedIsMet(
+          DependentResource<ConfigMap, TestCustomResource> dependentResource,
+          TestCustomResource primary, Context<TestCustomResource> context) {
+        return Result.withResult(false, result);
+      }
+    };
+
     var workflow = new WorkflowBuilder<TestCustomResource>()
-        .addDependentResource(dr1).withReconcilePrecondition(notMetCondition)
+        .addDependentResource(dr1).withReconcilePrecondition(unmetWithResult)
         .addDependentResource(dr2).withReconcilePrecondition(metCondition)
         .addDependentResource(drDeleter).withReconcilePrecondition(notMetCondition)
         .build();
@@ -196,6 +207,8 @@ void simpleReconcileCondition() {
     Assertions.assertThat(res.getErroredDependents()).isEmpty();
     Assertions.assertThat(res.getReconciledDependents()).containsExactlyInAnyOrder(dr2);
     Assertions.assertThat(res.getNotReadyDependents()).isEmpty();
+    res.getDependentConditionResult(dr1, Condition.Type.RECONCILE, String.class)
+        .ifPresentOrElse(s -> assertEquals(result, s), org.junit.jupiter.api.Assertions::fail);
   }
 
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/WorkflowAllFeatureIT.java

@@ -10,9 +10,11 @@
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+import io.javaoperatorsdk.operator.sample.workflowallfeature.ConfigMapReconcileCondition;
 import io.javaoperatorsdk.operator.sample.workflowallfeature.WorkflowAllFeatureCustomResource;
 import io.javaoperatorsdk.operator.sample.workflowallfeature.WorkflowAllFeatureReconciler;
 import io.javaoperatorsdk.operator.sample.workflowallfeature.WorkflowAllFeatureSpec;
+import io.javaoperatorsdk.operator.sample.workflowallfeature.WorkflowAllFeatureStatus;
 
 import static io.javaoperatorsdk.operator.sample.workflowallfeature.ConfigMapDependentResource.READY_TO_DELETE_ANNOTATION;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -39,6 +41,8 @@ void configMapNotReconciledUntilDeploymentReady() {
               .isPositive();
           assertThat(operator.get(Deployment.class, RESOURCE_NAME)).isNotNull();
           assertThat(operator.get(ConfigMap.class, RESOURCE_NAME)).isNull();
+          assertThat(getPrimaryStatus().getMsgFromCondition())
+              .isEqualTo(ConfigMapReconcileCondition.NOT_RECONCILED_YET);
         });
 
     await().atMost(ONE_MINUTE).untilAsserted(() -> {
@@ -47,31 +51,36 @@ void configMapNotReconciledUntilDeploymentReady() {
           .getNumberOfReconciliationExecution())
           .isGreaterThan(1);
       assertThat(operator.get(ConfigMap.class, RESOURCE_NAME)).isNotNull();
-      assertThat(operator.get(WorkflowAllFeatureCustomResource.class, RESOURCE_NAME)
-          .getStatus().getReady()).isTrue();
+      final var primaryStatus = getPrimaryStatus();
+      assertThat(primaryStatus.getReady()).isTrue();
+      assertThat(primaryStatus.getMsgFromCondition())
+          .isEqualTo(ConfigMapReconcileCondition.CREATE_SET);
     });
 
     markConfigMapForDelete();
   }
 
+  private WorkflowAllFeatureStatus getPrimaryStatus() {
+    return operator.get(WorkflowAllFeatureCustomResource.class, RESOURCE_NAME)
+        .getStatus();
+  }
+
 
   @Test
   void configMapNotReconciledIfReconcileConditionNotMet() {
     var resource = operator.create(customResource(false));
 
     await().atMost(ONE_MINUTE).untilAsserted(() -> {
       assertThat(operator.get(ConfigMap.class, RESOURCE_NAME)).isNull();
-      assertThat(operator.get(WorkflowAllFeatureCustomResource.class, RESOURCE_NAME)
-          .getStatus().getReady()).isTrue();
+      assertThat(getPrimaryStatus().getReady()).isTrue();
     });
 
     resource.getSpec().setCreateConfigMap(true);
     operator.replace(resource);
 
     await().untilAsserted(() -> {
       assertThat(operator.get(ConfigMap.class, RESOURCE_NAME)).isNotNull();
-      assertThat(operator.get(WorkflowAllFeatureCustomResource.class, RESOURCE_NAME)
-          .getStatus().getReady()).isTrue();
+      assertThat(getPrimaryStatus().getReady()).isTrue();
     });
   }
 
@@ -81,10 +90,9 @@ void configMapNotDeletedUntilNotMarked() {
     var resource = operator.create(customResource(true));
 
     await().atMost(ONE_MINUTE).untilAsserted(() -> {
-      assertThat(operator.get(WorkflowAllFeatureCustomResource.class, RESOURCE_NAME).getStatus())
+      assertThat(getPrimaryStatus())
           .isNotNull();
-      assertThat(operator.get(WorkflowAllFeatureCustomResource.class, RESOURCE_NAME)
-          .getStatus().getReady()).isTrue();
+      assertThat(getPrimaryStatus().getReady()).isTrue();
       assertThat(operator.get(ConfigMap.class, RESOURCE_NAME)).isNotNull();
     });
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/ConfigMapReconcileCondition.java

@@ -3,17 +3,20 @@
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
+import io.javaoperatorsdk.operator.processing.dependent.workflow.ResultCondition;
 
 public class ConfigMapReconcileCondition
-    implements Condition<ConfigMap, WorkflowAllFeatureCustomResource> {
+    implements ResultCondition<ConfigMap, WorkflowAllFeatureCustomResource, String> {
+
+  public static final String CREATE_SET = "create set";
+  public static final String CREATE_NOT_SET = "create not set";
+  public static final String NOT_RECONCILED_YET = "Not reconciled yet";
 
   @Override
-  public boolean isMet(
+  public Result<String> detailedIsMet(
       DependentResource<ConfigMap, WorkflowAllFeatureCustomResource> dependentResource,
-      WorkflowAllFeatureCustomResource primary,
-      Context<WorkflowAllFeatureCustomResource> context) {
-
-    return primary.getSpec().isCreateConfigMap();
+      WorkflowAllFeatureCustomResource primary, Context<WorkflowAllFeatureCustomResource> context) {
+    final var createConfigMap = primary.getSpec().isCreateConfigMap();
+    return Result.withResult(createConfigMap, createConfigMap ? CREATE_SET : CREATE_NOT_SET);
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/WorkflowAllFeatureReconciler.java

@@ -2,8 +2,16 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.javaoperatorsdk.operator.api.reconciler.*;
+import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
+import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
+import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.api.reconciler.Workflow;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 
 import static io.javaoperatorsdk.operator.sample.workflowallfeature.WorkflowAllFeatureReconciler.DEPLOYMENT_NAME;
 
@@ -33,11 +41,15 @@ public UpdateControl<WorkflowAllFeatureCustomResource> reconcile(
     if (resource.getStatus() == null) {
       resource.setStatus(new WorkflowAllFeatureStatus());
     }
+    final var reconcileResult = context.managedWorkflowAndDependentResourceContext()
+        .getWorkflowReconcileResult();
+    final var msgFromCondition = reconcileResult.getDependentConditionResult(
+        DependentResource.defaultNameFor(ConfigMapDependentResource.class),
+        Condition.Type.RECONCILE, String.class)
+        .orElse(ConfigMapReconcileCondition.NOT_RECONCILED_YET);
     resource.getStatus()
-        .setReady(
-            context.managedWorkflowAndDependentResourceContext()
-                .getWorkflowReconcileResult()
-                .allDependentResourcesReady());
+        .withReady(reconcileResult.allDependentResourcesReady())
+        .withMsgFromCondition(msgFromCondition);
     return UpdateControl.patchStatus(resource);
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/workflowallfeature/WorkflowAllFeatureStatus.java

@@ -3,13 +3,24 @@
 public class WorkflowAllFeatureStatus {
 
   private Boolean ready;
+  private String msgFromCondition;
 
   public Boolean getReady() {
     return ready;
   }
 
-  public WorkflowAllFeatureStatus setReady(Boolean ready) {
+  public String getMsgFromCondition() {
+    return msgFromCondition;
+  }
+
+  public WorkflowAllFeatureStatus withReady(Boolean ready) {
     this.ready = ready;
     return this;
   }
+
+  @SuppressWarnings("UnusedReturnValue")
+  public WorkflowAllFeatureStatus withMsgFromCondition(String msgFromCondition) {
+    this.msgFromCondition = msgFromCondition;
+    return this;
+  }
 }