wip

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

@@ -747,11 +747,8 @@ public <R extends HasMetadata> R resourcePatch(
       UnaryOperator<R> updateOperation,
       ManagedInformerEventSource<R, P, ?> ies,
       Options options) {
-    R originalResource = null;
-    if (options.getMatcher().isPresent()) {
-      originalResource = ies.get(ResourceID.fromResource(desired)).orElse(null);
-    }
-    return resourcePatch(desired, originalResource, updateOperation, ies, options);
+
+    return resourcePatch(desired, null, updateOperation, ies, options);
   }
 
   public <R extends HasMetadata> R resourcePatch(
@@ -765,9 +762,12 @@ public <R extends HasMetadata> R resourcePatch(
     boolean matches = false;
     if (matcher != null) {
       if (actualResource == null) {
-        throw new IllegalArgumentException("Actual most be present for matching update/patch.");
+        actualResource = ies.get(ResourceID.fromResource(desiredResource)).orElse(null);
+      }
+      // todo describe might require optimistic locking
+      if (actualResource != null) {
+        matches = matcher.matches(desiredResource, actualResource, context);
       }
-      matches = matcher.matches(desiredResource, actualResource, context);
     }
     if (options.requiresMatcher() && matcher == null) {
       throw new IllegalArgumentException("Mode : " + options.mode + " requires matcher");

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/ResourceOperationsTest.java

@@ -384,23 +384,6 @@ void matcherNotMatchingProceedsToEventFilteringUpdate() {
         .eventFilteringUpdateAndCacheResource(eq(desired), any(UnaryOperator.class));
   }
 
-  @Test
-  void matcherRequiresActualToBePresent() {
-    var desired = TestUtils.testCustomResource1();
-    var ies = mock(ManagedInformerEventSource.class);
-    var matcher = mock(Matcher.class);
-
-    assertThrows(
-        IllegalArgumentException.class,
-        () ->
-            resourceOperations.resourcePatch(
-                desired,
-                null,
-                UnaryOperator.identity(),
-                ies,
-                ResourceOperations.Options.matchAndFilter(matcher)));
-  }
-
   @Test
   void onlyCacheModeSkipsEventFiltering() {
     var desired = TestUtils.testCustomResource1();