integration test

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

@@ -88,7 +88,7 @@ private SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
       return (SecondaryToPrimaryMapper<R>) this;
     } else if (garbageCollected) {
       return Mappers.fromOwnerReference();
-    } else if (useDefaultAnnotationsToIdentifyPrimary()) {
+    } else if (useAnnotationsToIdentifyPrimary()) {
       return Mappers.fromDefaultAnnotations();
     } else {
       throw new OperatorException("Provide a SecondaryToPrimaryMapper to associate " +
@@ -238,7 +238,7 @@ protected Resource<R> prepare(R desired, P primary, String actionName) {
   protected void addReferenceHandlingMetadata(R desired, P primary) {
     if (addOwnerReference()) {
       desired.addOwnerReference(primary);
-    } else if (useDefaultAnnotationsToIdentifyPrimary()) {
+    } else if (useAnnotationsToIdentifyPrimary()) {
       addSecondaryToPrimaryMapperAnnotations(desired, primary);
     }
   }
@@ -269,8 +269,8 @@ protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> cont
     return eventSource().orElseThrow();
   }
 
-  private boolean useDefaultAnnotationsToIdentifyPrimary() {
-    return !(this instanceof SecondaryToPrimaryMapper) && !garbageCollected && isCreatable();
+  private boolean useAnnotationsToIdentifyPrimary() {
+    return !garbageCollected && isCreatable();
   }
 
   protected void addSecondaryToPrimaryMapperAnnotations(R desired, P primary) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/DependentCustomMappingAnnotationIT.java

@@ -1,4 +1,72 @@
 package io.javaoperatorsdk.operator;
 
-public class DependentCustomMappingAnnotationIT {
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
+import io.javaoperatorsdk.operator.sample.dependentcustommappingannotation.CustomMappingConfigMapDependentResource;
+import io.javaoperatorsdk.operator.sample.dependentcustommappingannotation.DependentCustomMappingCustomResource;
+import io.javaoperatorsdk.operator.sample.dependentcustommappingannotation.DependentCustomMappingReconciler;
+import io.javaoperatorsdk.operator.sample.dependentcustommappingannotation.DependentCustomMappingSpec;
+
+import static io.javaoperatorsdk.operator.sample.dependentcustommappingannotation.CustomMappingConfigMapDependentResource.CUSTOM_NAMESPACE_KEY;
+import static io.javaoperatorsdk.operator.sample.dependentcustommappingannotation.CustomMappingConfigMapDependentResource.CUSTOM_NAME_KEY;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+class DependentCustomMappingAnnotationIT {
+
+  public static final String INITIAL_VALUE = "initial value";
+  public static final String CHANGED_VALUE = "changed value";
+  public static final String TEST_RESOURCE_NAME = "test1";
+
+  @RegisterExtension
+  LocallyRunOperatorExtension extension =
+      LocallyRunOperatorExtension.builder()
+          .withReconciler(DependentCustomMappingReconciler.class)
+          .build();
+
+
+  @Test
+  void testCustomMappingAnnotationForDependent() {
+    var cr = extension.create(testResource());
+    assertConfigMapData(INITIAL_VALUE);
+
+    cr.getSpec().setValue(CHANGED_VALUE);
+    cr = extension.replace(cr);
+    assertConfigMapData(CHANGED_VALUE);
+
+    extension.delete(cr);
+
+    await().untilAsserted(()->{
+      var resource = extension.get(ConfigMap.class, TEST_RESOURCE_NAME);
+      assertThat(resource).isNull();
+    });
+  }
+
+  private void assertConfigMapData(String val) {
+    await().untilAsserted(() -> {
+      var resource = extension.get(ConfigMap.class, TEST_RESOURCE_NAME);
+      assertThat(resource).isNotNull();
+      assertThat(resource.getMetadata().getAnnotations())
+              .containsKey(CUSTOM_NAME_KEY)
+              .containsKey(CUSTOM_NAMESPACE_KEY);
+      assertThat(resource.getData()).containsEntry(CustomMappingConfigMapDependentResource.KEY,
+          INITIAL_VALUE);
+    });
+  }
+
+
+  DependentCustomMappingCustomResource testResource() {
+    var dr = new DependentCustomMappingCustomResource();
+    dr.setMetadata(new ObjectMetaBuilder().withName(TEST_RESOURCE_NAME).build());
+    dr.setSpec(new DependentCustomMappingSpec());
+    dr.getSpec().setValue(INITIAL_VALUE);
+
+    return dr;
+  }
+
+
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentcustommappingannotation/CustomMappingConfigMapDependentResource.java

@@ -16,8 +16,12 @@ public class CustomMappingConfigMapDependentResource
     extends CRUDNoGCKubernetesDependentResource<ConfigMap, DependentCustomMappingCustomResource>
     implements SecondaryToPrimaryMapper<ConfigMap> {
 
+  public static final String CUSTOM_NAME_KEY = "customNameKey";
+  public static final String CUSTOM_NAMESPACE_KEY = "customNamespaceKey";
+  public static final String KEY = "key";
+
   private SecondaryToPrimaryMapper<ConfigMap> mapper =
-      Mappers.fromAnnotation("customNameKey", "customNamespaceKey");
+      Mappers.fromAnnotation(CUSTOM_NAME_KEY, CUSTOM_NAMESPACE_KEY);
 
   public CustomMappingConfigMapDependentResource() {
     super(ConfigMap.class);
@@ -31,12 +35,18 @@ protected ConfigMap desired(DependentCustomMappingCustomResource primary,
             .withName(primary.getMetadata().getName())
             .withNamespace(primary.getMetadata().getNamespace())
             .build())
-        .withData(Map.of("key", "val"))
+        .withData(Map.of(KEY, primary.getSpec().getValue()))
         .build();
   }
 
   @Override
   public Set<ResourceID> toPrimaryResourceIDs(ConfigMap resource) {
     return mapper.toPrimaryResourceIDs(resource);
   }
+
+  @Override
+  protected void addSecondaryToPrimaryMapperAnnotations(ConfigMap desired,
+      DependentCustomMappingCustomResource primary) {
+    addSecondaryToPrimaryMapperAnnotations(desired, primary, CUSTOM_NAME_KEY, CUSTOM_NAMESPACE_KEY);
+  }
 }