hardedning obsolete cleanup conditions

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCache.java

@@ -226,7 +226,6 @@ private String getLatestResourceVersion(String namespace) {
     return managedInformerEventSource.manager().lastSyncResourceVersion(namespace);
   }
 
-  // todo obsolete is the good word?
   /**
    * There are (probably) extremely rare circumstances, when we can miss a delete event related to a
    * resources: when we create a resource that is deleted right after by third party and the related
@@ -242,11 +241,15 @@ private void checkObsoleteResources() {
       while (iterator.hasNext()) {
         var e = iterator.next();
         if (ReconcilerUtilsInternal.compareResourceVersions(
-                e.getValue().getMetadata().getResourceVersion(),
-                getLatestResourceVersion(e.getValue().getMetadata().getNamespace()))
-            < 0) {
+                    e.getValue().getMetadata().getResourceVersion(),
+                    getLatestResourceVersion(e.getValue().getMetadata().getNamespace()))
+                < 0
+            // making sure we have the situation where resource is missing from the cache
+            && managedInformerEventSource
+                .manager()
+                .get(ResourceID.fromResource(e.getValue()))
+                .isEmpty()) {
           iterator.remove();
-          // todo test delete event propagation?
           managedInformerEventSource.handleEvent(ResourceAction.DELETED, e.getValue(), null, true);
           log.debug("Removing obsolete resource with ID: {}", e.getKey());
         }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryPrimaryResourceCacheTest.java

@@ -34,7 +34,11 @@
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
@@ -339,6 +343,8 @@ void removalOfObsoleteResources() {
             () ->
                 assertThat(temporaryResourceCache.getResourceFromCache(ResourceID.fromResource(tr)))
                     .isEmpty());
+    verify(managedInformerEventSource, times(1))
+        .handleEvent(eq(ResourceAction.DELETED), eq(tr), isNull(), eq(true));
   }
 
   @Test