wip

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

Author: csviri

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/cachingfilteringupdate/CachingFilteringUpdateReconciler.java

@@ -36,21 +36,25 @@
 public class CachingFilteringUpdateReconciler
     implements Reconciler<CachingFilteringUpdateCustomResource> {
 
+  public static final String RESOURCE_VERSION_INDEX = "resourceVersionIndex";
   private final AtomicBoolean issueFound = new AtomicBoolean(false);
 
+  InformerEventSource<ConfigMap, CachingFilteringUpdateCustomResource> configMapEventSource;
+
   @Override
   public UpdateControl<CachingFilteringUpdateCustomResource> reconcile(
       CachingFilteringUpdateCustomResource resource,
       Context<CachingFilteringUpdateCustomResource> context) {
 
-    context.resourceOperations().serverSideApply(prepareCM(resource, 1));
+    var updated = context.resourceOperations().serverSideApply(prepareCM(resource, 1));
     var cachedCM = context.getSecondaryResource(ConfigMap.class);
     if (cachedCM.isEmpty()) {
       issueFound.set(true);
       throw new IllegalStateException("Error for resource: " + ResourceID.fromResource(resource));
     }
-
-    var updated = context.resourceOperations().serverSideApply(prepareCM(resource, 2));
+    checkListContainsCM(updated);
+    checkIfResourceVersionIndexContainsUpdated(updated);
+    updated = context.resourceOperations().serverSideApply(prepareCM(resource, 2));
     cachedCM = context.getSecondaryResource(ConfigMap.class);
     if (!cachedCM
         .orElseThrow()
@@ -61,12 +65,43 @@ public UpdateControl<CachingFilteringUpdateCustomResource> reconcile(
       throw new IllegalStateException(
           "Update error for resource: " + ResourceID.fromResource(resource));
     }
+    checkListContainsCM(updated);
+    checkIfResourceVersionIndexContainsUpdated(updated);
 
     ensureStatusExists(resource);
     resource.getStatus().setUpdated(true);
     return UpdateControl.patchStatus(resource);
   }
 
+  private void checkIfResourceVersionIndexContainsUpdated(ConfigMap updated) {
+    if (configMapEventSource
+        .byIndex(RESOURCE_VERSION_INDEX, updated.getMetadata().getResourceVersion())
+        .stream()
+        .noneMatch(
+            r ->
+                ResourceID.fromResource(r).equals(ResourceID.fromResource(updated))
+                    && r.getMetadata()
+                        .getResourceVersion()
+                        .equals(updated.getMetadata().getResourceVersion()))) {
+      throw new IllegalStateException(
+          "Index does not contain resource: " + ResourceID.fromResource(updated));
+    }
+  }
+
+  private void checkListContainsCM(ConfigMap updated) {
+    if (configMapEventSource
+        .list()
+        .noneMatch(
+            r ->
+                ResourceID.fromResource(r).equals(ResourceID.fromResource(updated))
+                    && r.getMetadata()
+                        .getResourceVersion()
+                        .equals(updated.getMetadata().getResourceVersion()))) {
+      throw new IllegalStateException(
+          "List does not contain resource: " + ResourceID.fromResource(updated));
+    }
+  }
+
   private static ConfigMap prepareCM(CachingFilteringUpdateCustomResource p, int num) {
     var cm =
         new ConfigMapBuilder()
@@ -84,13 +119,15 @@ private static ConfigMap prepareCM(CachingFilteringUpdateCustomResource p, int n
   @Override
   public List<EventSource<?, CachingFilteringUpdateCustomResource>> prepareEventSources(
       EventSourceContext<CachingFilteringUpdateCustomResource> context) {
-    InformerEventSource<ConfigMap, CachingFilteringUpdateCustomResource> cmES =
+    configMapEventSource =
         new InformerEventSource<>(
             InformerEventSourceConfiguration.from(
                     ConfigMap.class, CachingFilteringUpdateCustomResource.class)
                 .build(),
             context);
-    return List.of(cmES);
+    configMapEventSource.addIndexers(
+        Map.of(RESOURCE_VERSION_INDEX, cm -> List.of(cm.getMetadata().getResourceVersion())));
+    return List.of(configMapEventSource);
   }
 
   private void ensureStatusExists(CachingFilteringUpdateCustomResource resource) {