Skip to content

Commit ac22888

Browse files
metacosmmetacosm
committed
chore: adapt after rebase
Signed-off-by: Chris Laprun <[email protected]>
1 parent 7c29434 commit ac22888

File tree

5 files changed

+27
-33
lines changed

5 files changed

+27
-33
lines changed

Diff for: ‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/managed/DefaultManagedWorkflowAndDependentResourceContext.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
@SuppressWarnings("rawtypes")
1313
public class DefaultManagedWorkflowAndDependentResourceContext<P extends HasMetadata>
14-
implements ManagedWorkflowAndDependentResourceContext {
14+
implements ManagedWorkflowAndDependentResourceContext {
1515

16-
public static final Object RECONCILE_RESULT_KEY = new Object();
17-
public static final Object CLEANUP_RESULT_KEY = new Object();
16+
public static final Object RECONCILE_RESULT_KEY = new Object();
17+
public static final Object CLEANUP_RESULT_KEY = new Object();
1818
private final ConcurrentHashMap attributes = new ConcurrentHashMap();
1919
private final Controller<P> controller;
2020
private final P primaryResource;
@@ -53,13 +53,13 @@ public <T> T getMandatory(Object key, Class<T> expectedType) {
5353
}
5454

5555
@Override
56-
public Optional<WorkflowReconcileResult> getWorkflowReconcileResult() {
57-
return get(RECONCILE_RESULT_KEY, WorkflowReconcileResult.class);
56+
public WorkflowReconcileResult getWorkflowReconcileResult() {
57+
return getMandatory(RECONCILE_RESULT_KEY, WorkflowReconcileResult.class);
5858
}
5959

6060
@Override
61-
public Optional<WorkflowCleanupResult> getWorkflowCleanupResult() {
62-
return get(CLEANUP_RESULT_KEY, WorkflowCleanupResult.class);
61+
public WorkflowCleanupResult getWorkflowCleanupResult() {
62+
return getMandatory(CLEANUP_RESULT_KEY, WorkflowCleanupResult.class);
6363
}
6464

6565
@Override

Diff for: ‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/Controller.java

+9-18
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public UpdateControl<P> execute() throws Exception {
149149
initContextIfNeeded(resource, context);
150150
configuration.getWorkflowSpec().ifPresent(ws -> {
151151
if (!managedWorkflow.isEmpty() && !explicitWorkflowInvocation) {
152-
managedWorkflow.reconcile(resource, context);
152+
managedWorkflow.reconcile(resource, context);
153153
}
154154
});
155155
return reconciler.reconcile(resource, context);
@@ -177,9 +177,9 @@ public String successTypeName(DeleteControl deleteControl) {
177177
return deleteControl.isRemoveFinalizer() ? DELETE : FINALIZER_NOT_REMOVED;
178178
}
179179

180-
@Override
181-
public ResourceID resourceID() {
182-
return ResourceID.fromResource(resource);
180+
@Override
181+
public ResourceID resourceID() {
182+
return ResourceID.fromResource(resource);
183183
}
184184

185185
@Override
@@ -192,7 +192,8 @@ public DeleteControl execute() throws Exception {
192192
initContextIfNeeded(resource, context);
193193
WorkflowCleanupResult workflowCleanupResult = null;
194194

195-
// The cleanup is called also when explicit invocation is true, but the cleaner is not implemented
195+
// The cleanup is called also when explicit invocation is true, but the cleaner is not
196+
// implemented
196197
if (managedWorkflow.hasCleaner() || !explicitWorkflowInvocation) {
197198
workflowCleanupResult = managedWorkflow.cleanup(resource, context);
198199
}
@@ -450,23 +451,13 @@ public EventSourceContext<P> eventSourceContext() {
450451

451452
public void reconcileManagedWorkflow(P primary, Context<P> context) {
452453
if (!managedWorkflow.isEmpty()) {
453-
var res = managedWorkflow.reconcile(primary, context);
454-
((DefaultManagedWorkflowAndDependentResourceContext) context
455-
.managedWorkflowAndDependentResourceContext())
456-
.setWorkflowExecutionResult(res);
454+
managedWorkflow.reconcile(primary, context);
457455
}
458456
}
459457

460-
public WorkflowCleanupResult cleanupManagedWorkflow(P resource, Context<P> context) {
458+
public void cleanupManagedWorkflow(P resource, Context<P> context) {
461459
if (managedWorkflow.hasCleaner()) {
462-
var workflowCleanupResult = managedWorkflow.cleanup(resource, context);
463-
((DefaultManagedWorkflowAndDependentResourceContext) context
464-
.managedWorkflowAndDependentResourceContext())
465-
.setWorkflowCleanupResult(workflowCleanupResult);
466-
467-
return workflowCleanupResult;
468-
} else {
469-
return null;
460+
managedWorkflow.cleanup(resource, context);
470461
}
471462
}
472463

Diff for: ‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultWorkflow.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
1313
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
1414
import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
15-
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedDependentResourceContext;
1615
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
1716

17+
import static io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedWorkflowAndDependentResourceContext.CLEANUP_RESULT_KEY;
18+
import static io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedWorkflowAndDependentResourceContext.RECONCILE_RESULT_KEY;
19+
1820
/**
1921
* Dependents definition: so if B depends on A, the B is dependent of A.
2022
*
@@ -92,8 +94,7 @@ public WorkflowReconcileResult reconcile(P primary, Context<P> context) {
9294
WorkflowReconcileExecutor<P> workflowReconcileExecutor =
9395
new WorkflowReconcileExecutor<>(this, primary, context);
9496
var result = workflowReconcileExecutor.reconcile();
95-
context.managedDependentResourceContext()
96-
.put(DefaultManagedDependentResourceContext.RECONCILE_RESULT_KEY, result);
97+
context.managedWorkflowAndDependentResourceContext().put(RECONCILE_RESULT_KEY, result);
9798
if (throwExceptionAutomatically) {
9899
result.throwAggregateExceptionIfErrorsPresent();
99100
}
@@ -105,8 +106,7 @@ public WorkflowCleanupResult cleanup(P primary, Context<P> context) {
105106
WorkflowCleanupExecutor<P> workflowCleanupExecutor =
106107
new WorkflowCleanupExecutor<>(this, primary, context);
107108
var result = workflowCleanupExecutor.cleanup();
108-
context.managedDependentResourceContext()
109-
.put(DefaultManagedDependentResourceContext.CLEANUP_RESULT_KEY, result);
109+
context.managedWorkflowAndDependentResourceContext().put(CLEANUP_RESULT_KEY, result);
110110
if (throwExceptionAutomatically) {
111111
result.throwAggregateExceptionIfErrorsPresent();
112112
}

Diff for: ‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowCleanupExecutorTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
1515
import io.javaoperatorsdk.operator.api.reconciler.Context;
1616
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
17-
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedDependentResourceContext;
17+
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedWorkflowAndDependentResourceContext;
1818
import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
1919
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
2020

@@ -44,8 +44,8 @@ void setup() {
4444
when(eventSourceContextMock.getControllerConfiguration()).thenReturn(mockControllerConfig);
4545
when(mockControllerConfig.getConfigurationService())
4646
.thenReturn(mock(ConfigurationService.class));
47-
when(mockContext.managedDependentResourceContext())
48-
.thenReturn(mock(ManagedDependentResourceContext.class));
47+
when(mockContext.managedWorkflowAndDependentResourceContext())
48+
.thenReturn(mock(ManagedWorkflowAndDependentResourceContext.class));
4949
when(mockContext.getWorkflowExecutorService()).thenReturn(executorService);
5050
when(mockContext.eventSourceRetriever()).thenReturn(eventSourceRetrieverMock);
5151
}

Diff for: ‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutorTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.javaoperatorsdk.operator.AggregatedOperatorException;
1616
import io.javaoperatorsdk.operator.api.reconciler.Context;
1717
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
18+
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedWorkflowAndDependentResourceContext;
1819
import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
1920
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
2021

@@ -36,6 +37,8 @@ class WorkflowReconcileExecutorTest extends AbstractWorkflowExecutorTest {
3637
@SuppressWarnings("unchecked")
3738
void setup(TestInfo testInfo) {
3839
log.debug("==> Starting test {}", testInfo.getDisplayName());
40+
when(mockContext.managedWorkflowAndDependentResourceContext())
41+
.thenReturn(mock(ManagedWorkflowAndDependentResourceContext.class));
3942
when(mockContext.getWorkflowExecutorService()).thenReturn(executorService);
4043
when(mockContext.eventSourceRetriever()).thenReturn(mock(EventSourceRetriever.class));
4144
}

0 commit comments

Comments
 (0)