tests

Author: csviri

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

@@ -39,7 +39,6 @@ public class TemporaryResourceCache<T extends HasMetadata> {
   private final Map<ResourceID, T> cache = new ConcurrentHashMap<>();
   private final ManagedInformerEventSource<T, ?, ?> managedInformerEventSource;
 
-  // todo prune
   public TemporaryResourceCache(ManagedInformerEventSource<T, ?, ?> managedInformerEventSource,
       UnaryOperator<T> cachePruneFunction) {
     this.managedInformerEventSource = managedInformerEventSource;
@@ -51,14 +50,14 @@ public synchronized void removeResourceFromCache(T resource) {
   }
 
   public synchronized void unconditionallyCacheResource(T newResource) {
-    cache.put(ResourceID.fromResource(newResource), newResource);
+    putToCache(newResource, null);
   }
 
   public synchronized void putAddedResource(T newResource) {
     ResourceID resourceID = ResourceID.fromResource(newResource);
     if (managedInformerEventSource.get(resourceID).isEmpty()) {
       log.debug("Putting resource to cache with ID: {}", resourceID);
-      cache.put(resourceID, newResource);
+      putToCache(newResource, resourceID);
     } else {
       log.debug("Won't put resource into cache found already informer cache: {}", resourceID);
     }
@@ -75,15 +74,20 @@ public synchronized void putUpdatedResource(T newResource, String previousResour
     if (informerCacheResource.get().getMetadata().getResourceVersion()
         .equals(previousResourceVersion)) {
       log.debug("Putting resource to temporal cache with id: {}", resourceId);
-      cache.put(resourceId, newResource);
+      putToCache(newResource, resourceId);
     } else {
       // if something is in cache it's surely obsolete now
       log.debug("Trying to remove an obsolete resource from cache for id: {}", resourceId);
       cache.remove(resourceId);
     }
   }
 
-
+  private void putToCache(T resource, ResourceID resourceID) {
+    if (cachePruneFunction != null) {
+      resource = cachePruneFunction.apply(resource);
+    }
+    cache.put(resourceID == null ? ResourceID.fromResource(resource) : resourceID, resource);
+  }
 
   public synchronized Optional<T> getResourceFromCache(ResourceID resourceID) {
     return Optional.ofNullable(cache.get(resourceID));

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

@@ -1,7 +1,9 @@
 package io.javaoperatorsdk.operator.processing.event.source.informer;
 
+import java.util.Map;
 import java.util.Optional;
 
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
@@ -79,6 +81,26 @@ void removesResourceFromCache() {
         .isNotPresent();
   }
 
+  @Test
+  void objectIsTransformedBeforePutIntoCache() {
+    temporaryResourceCache =
+            new TemporaryResourceCache<>(informerEventSource, r->{r.getMetadata().setLabels(null);return r;});
+
+    temporaryResourceCache.putAddedResource(testResource());
+    assertLabelsIsEmpty(temporaryResourceCache);
+
+    temporaryResourceCache.unconditionallyCacheResource(testResource());
+    assertLabelsIsEmpty(temporaryResourceCache);
+
+    temporaryResourceCache.unconditionallyCacheResource(testResource());
+    assertLabelsIsEmpty(temporaryResourceCache);
+  }
+
+  private void assertLabelsIsEmpty(TemporaryResourceCache<ConfigMap> temporaryResourceCache) {
+    assertThat(temporaryResourceCache.getResourceFromCache(ResourceID.fromResource(testResource()))
+            .orElseThrow().getMetadata().getLabels()).isNull();
+  }
+
   private ConfigMap propagateTestResourceToCache() {
     var testResource = testResource();
     when(informerEventSource.get(any())).thenReturn(Optional.empty());
@@ -90,7 +112,9 @@ private ConfigMap propagateTestResourceToCache() {
 
   ConfigMap testResource() {
     ConfigMap configMap = new ConfigMap();
-    configMap.setMetadata(new ObjectMeta());
+    configMap.setMetadata(new ObjectMetaBuilder()
+                    .withLabels(Map.of("k","v"))
+            .build());
     configMap.getMetadata().setName("test");
     configMap.getMetadata().setNamespace("default");
     configMap.getMetadata().setResourceVersion(RESOURCE_VERSION);