test fixes and improvements

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceOperations.java

@@ -543,7 +543,7 @@ public <R extends HasMetadata> R jsonPatch(
     return resourcePatch(
         desired,
         actualResource,
-        r -> context.getClient().resource(actualResource).edit(unaryOperator),
+        r -> context.getClient().resource(actualResource).edit(rr -> desired),
         options);
   }
 
@@ -607,7 +607,7 @@ public <R extends HasMetadata> R jsonPatchStatus(
     return resourcePatch(
         desired,
         actualResource,
-        r -> context.getClient().resource(r).editStatus(unaryOperator),
+        r -> context.getClient().resource(actualResource).editStatus(rr -> desired),
         options);
   }
 
@@ -632,7 +632,7 @@ public <R extends HasMetadata> R jsonPatchStatus(
     return resourcePatch(
         desired,
         actualResource,
-        r -> context.getClient().resource(r).editStatus(unaryOperator),
+        r -> context.getClient().resource(actualResource).editStatus(rr -> desired),
         informerEventSource,
         options);
   }
@@ -667,7 +667,7 @@ public P jsonPatchPrimary(P actualResource, UnaryOperator<P> unaryOperator, Opti
     return resourcePatch(
         desired,
         actualResource,
-        r -> context.getClient().resource(actualResource).edit(unaryOperator),
+        r -> context.getClient().resource(actualResource).edit(rr -> desired),
         context.eventSourceRetriever().getControllerEventSource(),
         options);
   }
@@ -971,25 +971,24 @@ <R extends HasMetadata> R resourcePatch(
       throw new IllegalArgumentException("Mode : " + options.mode + " requires matcher");
     }
     // this is to cover special case for jsonPatch were we should use actual resource as base
-    var targetBaseResource = desiredResource != null ? desiredResource : actualResource;
     if (matches) {
       if (log.isDebugEnabled()) {
         log.debug(
             "Resource match resource id: {}, type: {}, version: {}",
-            ResourceID.fromResource(targetBaseResource),
-            targetBaseResource.getClass().getSimpleName(),
-            targetBaseResource.getMetadata().getResourceVersion());
+            ResourceID.fromResource(desiredResource),
+            desiredResource.getClass().getSimpleName(),
+            desiredResource.getMetadata().getResourceVersion());
       }
       return actualResource;
     }
 
-    boolean optimisticLocking = targetBaseResource.getMetadata().getResourceVersion() != null;
+    boolean optimisticLocking = desiredResource.getMetadata().getResourceVersion() != null;
 
     if (options.getMode() == Mode.CACHE_ONLY
         || (options.getMode() == Mode.FILTER_IF_OPTIMISTIC_LOCKING && !optimisticLocking)) {
-      return ies.updateAndCacheResource(targetBaseResource, updateOperation);
+      return ies.updateAndCacheResource(desiredResource, updateOperation);
     } else {
-      return ies.eventFilteringUpdateAndCacheResource(targetBaseResource, updateOperation);
+      return ies.eventFilteringUpdateAndCacheResource(desiredResource, updateOperation);
     }
   }
 
@@ -1381,15 +1380,12 @@ enum Mode {
 
   private <T extends HasMetadata> T desiredForJsonPatch(
       T actualResource, UnaryOperator<T> unaryOperator, Options options) {
-    if (options.getMatcher().isPresent()) {
-      var cloned =
-          context
-              .getControllerConfiguration()
-              .getConfigurationService()
-              .getResourceCloner()
-              .clone(actualResource);
-      return unaryOperator.apply(cloned);
-    }
-    return null;
+    var cloned =
+        context
+            .getControllerConfiguration()
+            .getConfigurationService()
+            .getResourceCloner()
+            .clone(actualResource);
+    return unaryOperator.apply(cloned);
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/specchangeduringstatuspatch/SpecChangeDuringStatusPatchIT.java

@@ -49,7 +49,7 @@ class SpecChangeDuringStatusPatchIT {
   LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder().withReconciler(reconciler).build();
 
-  @RepeatedTest(10)
+  @RepeatedTest(3)
   void specChangeDuringStatusPatchIsReconciled() throws InterruptedException {
     var res = extension.create(testResource());
     var statusRes = testResource();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/subresource/SubResourceTestCustomReconciler.java

@@ -44,9 +44,17 @@ public UpdateControl<SubResourceTestCustomResource> reconcile(
     log.info("Value: " + resource.getSpec().getValue());
 
     ensureStatusExists(resource);
-    resource.getStatus().setState(SubResourceTestCustomResourceStatus.State.SUCCESS);
+
     waitXms(RECONCILER_MIN_EXEC_TIME);
-    return UpdateControl.patchStatus(resource);
+    context
+        .resourceOperations()
+        .jsonPatchPrimaryStatus(
+            resource,
+            r -> {
+              r.getStatus().setState(SubResourceTestCustomResourceStatus.State.SUCCESS);
+              return r;
+            });
+    return UpdateControl.noUpdate();
   }
 
   private void ensureStatusExists(SubResourceTestCustomResource resource) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowmultipleactivation/WorkflowMultipleActivationIT.java

@@ -16,6 +16,7 @@
 package io.javaoperatorsdk.operator.workflow.workflowmultipleactivation;
 
 import java.time.Duration;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -115,10 +116,7 @@ void deactivatingAndReactivatingDependent() {
               assertThat(cm.getData()).containsEntry(DATA_KEY, CHANGED_VALUE);
             });
 
-    var numOfReconciliation =
-        extension
-            .getReconcilerOfType(WorkflowMultipleActivationReconciler.class)
-            .getNumberOfReconciliationExecution();
+    var numOfReconciliation = awaitStableReconciliationCount();
     var actualCM = extension.get(ConfigMap.class, TEST_RESOURCE1);
     actualCM.getData().put("data2", "additionaldata");
     extension.replace(actualCM);
@@ -146,6 +144,27 @@ void deactivatingAndReactivatingDependent() {
             });
   }
 
+  /**
+   * Snapshots the reconciliation count only once it has stopped changing. The framework adds the
+   * finalizer with a cache-only (non event-filtered) write, so each (re)creation of the resource
+   * emits a finalizer-add event that drives a follow-up reconciliation. A few of these may still be
+   * trailing from the preceding create/delete/recreate and spec changes; capturing the count before
+   * they settle would race with them and inflate the later assertion.
+   */
+  private int awaitStableReconciliationCount() {
+    var reconciler = extension.getReconcilerOfType(WorkflowMultipleActivationReconciler.class);
+    var lastSeen = new AtomicInteger(-1);
+    await()
+        .pollInterval(Duration.ofMillis(POLL_DELAY))
+        .atMost(Duration.ofSeconds(10))
+        .until(
+            () -> {
+              int current = reconciler.getNumberOfReconciliationExecution();
+              return current == lastSeen.getAndSet(current);
+            });
+    return lastSeen.get();
+  }
+
   WorkflowMultipleActivationCustomResource testResource(String name) {
     var res = new WorkflowMultipleActivationCustomResource();
     res.setMetadata(new ObjectMetaBuilder().withName(name).build());