wip

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/ManagedInformerEventSource.java

@@ -359,9 +359,19 @@ private Stream<R> mergeWithWithTempCacheResources(
     return Stream.concat(tempResourceStream, upToDateList.stream());
   }
 
+  /**
+   * {@inheritDoc}
+   *
+   * <p>This implementation is read-cache-after-write consistent. Keys from the temporary resource
+   * cache (ghost resources) are included in the result.
+   */
   @Override
   public Stream<ResourceID> keys() {
-    return cache.keys();
+    if (!comparableResourceVersions || temporaryResourceCache.isEmpty()) {
+      return manager().keys();
+    }
+    var tempKeys = temporaryResourceCache.getResources().keySet();
+    return Stream.concat(manager().keys(), tempKeys.stream().filter(k -> !manager().contains(k)));
   }
 
   @Override

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

@@ -669,6 +669,49 @@ void listAddsGhostResources() {
     assertThat(result).containsExactlyInAnyOrder(resource, ghostResource);
   }
 
+  @Test
+  void keysIncludesGhostResourceKeys() {
+    var resource = testDeployment();
+    var ghostResource = testDeployment();
+    ghostResource.getMetadata().setName("ghost");
+
+    var resourceId = ResourceID.fromResource(resource);
+    var ghostResourceId = ResourceID.fromResource(ghostResource);
+
+    when(temporaryResourceCache.getResources()).thenReturn(Map.of(ghostResourceId, ghostResource));
+    when(temporaryResourceCache.isEmpty()).thenReturn(false);
+
+    var mim = mock(InformerManager.class);
+    when(mim.keys()).thenReturn(Stream.of(resourceId));
+    when(mim.contains(ghostResourceId)).thenReturn(false);
+    doReturn(mim).when(informerEventSource).manager();
+
+    var result = informerEventSource.keys().toList();
+
+    assertThat(result).containsExactlyInAnyOrder(resourceId, ghostResourceId);
+  }
+
+  @Test
+  void keysDoesNotDuplicateExistingKeys() {
+    var resource = testDeployment();
+    var newerResource = testDeployment();
+    newerResource.getMetadata().setResourceVersion("5");
+
+    var resourceId = ResourceID.fromResource(resource);
+
+    when(temporaryResourceCache.getResources()).thenReturn(Map.of(resourceId, newerResource));
+    when(temporaryResourceCache.isEmpty()).thenReturn(false);
+
+    var mim = mock(InformerManager.class);
+    when(mim.keys()).thenReturn(Stream.of(resourceId));
+    when(mim.contains(resourceId)).thenReturn(true);
+    doReturn(mim).when(informerEventSource).manager();
+
+    var result = informerEventSource.keys().toList();
+
+    assertThat(result).containsExactly(resourceId);
+  }
+
   Deployment testDeployment() {
     Deployment deployment = new Deployment();
     deployment.setMetadata(new ObjectMeta());