wip

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutor.java

@@ -33,7 +33,7 @@ public WorkflowReconcileExecutor(Workflow<P> workflow, P primary, Context<P> con
     this.workflow = workflow;
   }
 
-  public void reconcile() {
+  public synchronized void reconcile() {
     for (DependentResourceNode dependentResourceNode : workflow.getTopLevelDependentResources()) {
       submitForReconcile(dependentResourceNode);
     }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/builder/DependentBuilder.java

@@ -1,15 +1,16 @@
 package io.javaoperatorsdk.operator.processing.dependent.workflow.builder;
 
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.DependentResourceNode;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.DependsOnRelation;
 
-public class DependentBuilder {
+public class DependentBuilder<P extends HasMetadata> {
 
-  private final WorkflowBuilder workflowBuilder;
+  private final WorkflowBuilder<P> workflowBuilder;
   private final DependentResourceNode node;
 
-  public DependentBuilder(WorkflowBuilder workflowBuilder, DependentResourceNode node) {
+  public DependentBuilder(WorkflowBuilder<P> workflowBuilder, DependentResourceNode node) {
     this.workflowBuilder = workflowBuilder;
     this.node = node;
   }
@@ -20,4 +21,8 @@ public DependentBuilder dependsOn(DependentResource<?, ?> dependentResource) {
     return this;
   }
 
+  public WorkflowBuilder<P> build() {
+    return workflowBuilder;
+  }
+
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/builder/WorkflowBuilder.java

@@ -14,7 +14,7 @@ public class WorkflowBuilder<P extends HasMetadata> {
 
   private List<DependentResourceNode> dependentResourceNodes = new ArrayList<>();
 
-  public DependentBuilder addDependent(DependentResource<?, ?> dependentResource) {
+  public DependentBuilder addDependent(DependentResource<?, P> dependentResource) {
     DependentResourceNode node = new DependentResourceNode(dependentResource);
     dependentResourceNodes.add(node);
     return new DependentBuilder(this, node);

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

@@ -0,0 +1,22 @@
+package io.javaoperatorsdk.operator.processing.dependent.workflow;
+
+import java.util.List;
+
+import org.assertj.core.api.AbstractAssert;
+
+import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
+
+public class ExecutionListAssert
+    extends AbstractAssert<ExecutionListAssert, List<DependentResource<?, ?>>> {
+
+  public ExecutionListAssert(List<DependentResource<?, ?>> dependentResources) {
+    super(dependentResources, ExecutionListAssert.class);
+  }
+
+  public static ExecutionListAssert assertThat(List<DependentResource<?, ?>> actual) {
+    return new ExecutionListAssert(actual);
+  }
+
+
+
+}

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

@@ -1,14 +1,39 @@
 package io.javaoperatorsdk.operator.processing.dependent.workflow;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 import org.junit.jupiter.api.Test;
 
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
+import io.javaoperatorsdk.operator.processing.dependent.workflow.builder.WorkflowBuilder;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
+
+import static io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult.resourceCreated;
 import static org.junit.jupiter.api.Assertions.*;
 
 class WorkflowTest {
 
+  public static final String VALUE = "value";
+  private List<DependentResource<?, ?>> dependentResourceExecutions =
+      Collections.synchronizedList(new ArrayList<>());
+
   @Test
   void reconcileTopLevelResources() {
+    var dr1 = new TestDependent();
+    var dr2 = new TestDependent();
+    Workflow<TestCustomResource> workflow = new WorkflowBuilder<TestCustomResource>()
+        .addDependent(dr1).build()
+        .addDependent(dr2).build()
+        .build();
+
+    workflow.reconcile(new TestCustomResource(), null);
 
+    // assertThat(dependentResourceExecutions).hasSize(2);
   }
 
   @Test
@@ -26,4 +51,23 @@ void diamondShareWorkflowReconcile() {
 
   }
 
+  private class TestDependent implements DependentResource<String, TestCustomResource> {
+    @Override
+    public ReconcileResult<String> reconcile(TestCustomResource primary,
+        Context<TestCustomResource> context) {
+      dependentResourceExecutions.add(this);
+      return ReconcileResult.resourceCreated(VALUE);
+    }
+
+    @Override
+    public Class<String> resourceType() {
+      return String.class;
+    }
+
+    @Override
+    public Optional<String> getSecondaryResource(TestCustomResource primary) {
+      return Optional.of(VALUE);
+    }
+  }
+
 }