wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-core/pom.xml

@@ -79,6 +79,11 @@
       <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kube-api-test-client-inject</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

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

@@ -10,9 +10,10 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.base.PatchContext;
 import io.fabric8.kubernetes.client.dsl.base.PatchType;
-import io.javaoperatorsdk.operator.api.reconciler.support.UserPrimaryResourceCache;
+import io.javaoperatorsdk.operator.api.reconciler.support.PrimaryResourceCache;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
+// todo javadoc
 public class PrimaryUpdateAndCacheUtils {
 
   private PrimaryUpdateAndCacheUtils() {}
@@ -70,7 +71,7 @@ public static <P extends HasMetadata> P ssaPatchAndCacheStatusWithLock(
   }
 
   public static <P extends HasMetadata> P ssaPatchAndCacheStatus(
-      P primary, P freshResource, Context<P> context, UserPrimaryResourceCache<P> cache) {
+      P primary, P freshResource, Context<P> context, PrimaryResourceCache<P> cache) {
     logWarnIfResourceVersionPresent(freshResource);
     return patchAndCacheStatus(
         primary,
@@ -90,7 +91,7 @@ public static <P extends HasMetadata> P ssaPatchAndCacheStatus(
   public static <P extends HasMetadata> P patchAndCacheStatus(
       P primary,
       KubernetesClient client,
-      UserPrimaryResourceCache<P> cache,
+      PrimaryResourceCache<P> cache,
       BiFunction<P, KubernetesClient, P> patch) {
     var updatedResource = patch.apply(primary, client);
     cache.cacheResource(primary, updatedResource);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/support/UserPrimaryResourceCache.java renamed to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/support/PrimaryResourceCache.java

@@ -6,12 +6,12 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
-public class UserPrimaryResourceCache<P extends HasMetadata> {
+public class PrimaryResourceCache<P extends HasMetadata> {
 
   private final BiPredicate<Pair<P>, P> evictionPredicate;
   private final ConcurrentHashMap<ResourceID, Pair<P>> cache = new ConcurrentHashMap<>();
 
-  public UserPrimaryResourceCache(BiPredicate<Pair<P>, P> evictionPredicate) {
+  public PrimaryResourceCache(BiPredicate<Pair<P>, P> evictionPredicate) {
     this.evictionPredicate = evictionPredicate;
   }
 

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

@@ -0,0 +1,52 @@
+package io.javaoperatorsdk.operator.api.reconciler.support;
+
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceSpec;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class PrimaryResourceCacheTest {
+
+  @Test
+  void flowWithResourceVersionParsingEvictionPredicate() {
+    var cache =
+        new PrimaryResourceCache<TestCustomResource>(
+            new PrimaryResourceCache.ResourceVersionParsingEvictionPredicate<>());
+
+    var newCR = customResource("2");
+    var cr = cache.getFreshResource(newCR);
+    assertThat(cr).isSameAs(newCR);
+    // todo break these down by spec
+    cache.cacheResource(newCR);
+    cr = cache.getFreshResource(customResource("1"));
+
+    assertThat(cr).isSameAs(newCR);
+
+    var newestCR = customResource("3");
+    cr = cache.getFreshResource(newestCR);
+
+    assertThat(cr).isSameAs(newestCR);
+  }
+
+  @Test
+  void customResourceSpecificEvictionPredicate() {
+    // todo
+  }
+
+  private TestCustomResource customResource(String resourceVersion) {
+    var cr = new TestCustomResource();
+    cr.setMetadata(
+        new ObjectMetaBuilder()
+            .withName("test1")
+            .withNamespace("default")
+            .withUid("uid")
+            .withResourceVersion(resourceVersion)
+            .build());
+    cr.setSpec(new TestCustomResourceSpec());
+    cr.getSpec().setKey("key");
+    return cr;
+  }
+}

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

@@ -19,7 +19,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class TemporaryUserPrimaryResourceCacheTest {
+class TemporaryPrimaryResourceCacheTest {
 
   public static final String RESOURCE_VERSION = "2";