updating the integration test

also testing the exclusion in the ssa matching

Author: shawkins

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

@@ -148,9 +148,10 @@ public R update(R actual, R target, P primary, Context<P> context) {
   }
 
   void addPreviousAnnotation(String resourceVersion, HasMetadata target) {
-    String id = ((InformerEventSource<HasMetadata, HasMetadata>) eventSource().orElseThrow()).getId();
+    String id =
+        ((InformerEventSource<HasMetadata, HasMetadata>) eventSource().orElseThrow()).getId();
     target.getMetadata().getAnnotations().put(PREVIOUS_ANNOTATION_KEY,
-        id + resourceVersion != null ? ("," + resourceVersion) : "");
+        id + Optional.ofNullable(resourceVersion).map(rv -> "," + rv).orElse(""));
   }
 
   @Override

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

@@ -40,6 +40,7 @@
 // see also: https://kubernetes.slack.com/archives/C0123CNN8F3/p1686141087220719
 public class SSABasedGenericKubernetesResourceMatcher<R extends HasMetadata> {
 
+  private static final String ANNOTATIONS_KEY = "annotations";
   @SuppressWarnings("rawtypes")
   private static final SSABasedGenericKubernetesResourceMatcher INSTANCE =
       new SSABasedGenericKubernetesResourceMatcher<>();
@@ -101,9 +102,10 @@ public boolean matches(R actual, R desired, Context<?> context) {
     return prunedActual.equals(desiredMap);
   }
 
-  private void removeSDKAnnotations(HashMap<String, Object> prunedActual) {
+  @SuppressWarnings("unchecked")
+  private static void removeSDKAnnotations(HashMap<String, Object> prunedActual) {
     Optional.ofNullable(((Map<String, Object>) prunedActual.get(METADATA_KEY)))
-        .ifPresent(m -> m.computeIfPresent("annotations",
+        .ifPresent(m -> m.computeIfPresent(ANNOTATIONS_KEY,
             (k, v) -> {
               var annotations = (Map<String, Object>) v;
               annotations.remove(KubernetesDependentResource.PREVIOUS_ANNOTATION_KEY);

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

@@ -82,15 +82,20 @@ void skipsEventPropagationIfResourceWithSameVersionInResourceCache() {
   @Test
   void skipsAddEventPropagationViaAnnotation() {
     informerEventSource.onAdd(new DeploymentBuilder(testDeployment()).editMetadata()
-        .addToAnnotations(KubernetesDependentResource.PREVIOUS_ANNOTATION_KEY, informerEventSource.getId()).endMetadata().build());
+        .addToAnnotations(KubernetesDependentResource.PREVIOUS_ANNOTATION_KEY,
+            informerEventSource.getId())
+        .endMetadata().build());
 
     verify(eventHandlerMock, never()).handleEvent(any());
   }
 
   @Test
   void skipsUpdateEventPropagationViaAnnotation() {
-    informerEventSource.onUpdate(testDeployment(), new DeploymentBuilder(testDeployment()).editMetadata()
-        .addToAnnotations(KubernetesDependentResource.PREVIOUS_ANNOTATION_KEY, informerEventSource.getId() + ",1").endMetadata().build());
+    informerEventSource.onUpdate(testDeployment(),
+        new DeploymentBuilder(testDeployment()).editMetadata()
+            .addToAnnotations(KubernetesDependentResource.PREVIOUS_ANNOTATION_KEY,
+                informerEventSource.getId() + ",1")
+            .endMetadata().build());
 
     verify(eventHandlerMock, never()).handleEvent(any());
   }
@@ -105,7 +110,8 @@ void processEventPropagationWithoutAnnotation() {
   @Test
   void processEventPropagationWithIncorrectAnnotation() {
     informerEventSource.onAdd(new DeploymentBuilder(testDeployment()).editMetadata()
-        .addToAnnotations(KubernetesDependentResource.PREVIOUS_ANNOTATION_KEY, "invalid").endMetadata().build());
+        .addToAnnotations(KubernetesDependentResource.PREVIOUS_ANNOTATION_KEY, "invalid")
+        .endMetadata().build());
 
     verify(eventHandlerMock, times(1)).handleEvent(any());
   }

operator-framework-core/src/test/resources/io/javaoperatorsdk/operator/processing/dependent/kubernetes/deployment-with-managed-fields.yaml

@@ -3,12 +3,17 @@ kind: Deployment
 metadata:
   annotations:
     deployment.kubernetes.io/revision: "1"
+    javaoperatorsdk.io/previous: "abc,400"
   creationTimestamp: "2023-06-01T08:43:47Z"
   generation: 1
   managedFields:
     - apiVersion: apps/v1
       fieldsType: FieldsV1
       fieldsV1:
+        f:metadata:
+          f:annotations:
+            .: {}
+            f:javaoperatorsdk.io/previous: {}
         f:spec:
           f:progressDeadlineSeconds: {}
           f:replicas: {}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java

@@ -16,7 +16,7 @@
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 import io.javaoperatorsdk.operator.junit.KubernetesClientAware;
-import io.javaoperatorsdk.operator.processing.event.ResourceID;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
 
@@ -26,10 +26,35 @@ public class CreateUpdateEventFilterTestReconciler
     EventSourceInitializer<CreateUpdateEventFilterTestCustomResource>,
     KubernetesClientAware {
 
+  private static final class DirectConfigMapDependentResource
+      extends
+      CRUDKubernetesDependentResource<ConfigMap, CreateUpdateEventFilterTestCustomResource> {
+
+    private ConfigMap desired;
+
+    private DirectConfigMapDependentResource(Class<ConfigMap> resourceType) {
+      super(resourceType);
+    }
+
+    @Override
+    protected ConfigMap desired(CreateUpdateEventFilterTestCustomResource primary,
+        Context<CreateUpdateEventFilterTestCustomResource> context) {
+      return desired;
+    }
+
+    @Override
+    public void setEventSource(
+        io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource<ConfigMap, CreateUpdateEventFilterTestCustomResource> eventSource) {
+      super.setEventSource(eventSource);
+    }
+  }
+
   public static final String CONFIG_MAP_TEST_DATA_KEY = "key";
   private KubernetesClient client;
   private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
   private InformerEventSource<ConfigMap, CreateUpdateEventFilterTestCustomResource> informerEventSource;
+  private DirectConfigMapDependentResource configMapDR =
+      new DirectConfigMapDependentResource(ConfigMap.class);
 
   @Override
   public UpdateControl<CreateUpdateEventFilterTestCustomResource> reconcile(
@@ -44,28 +69,14 @@ public UpdateControl<CreateUpdateEventFilterTestCustomResource> reconcile(
             .withName(resource.getMetadata().getName())
             .get();
     if (configMap == null) {
-      var configMapToCreate = createConfigMap(resource);
-      final var resourceID = ResourceID.fromResource(configMapToCreate);
-      configMap =
-          client
-              .configMaps()
-              .inNamespace(resource.getMetadata().getNamespace())
-              .resource(configMapToCreate)
-              .create();
-      informerEventSource.handleRecentResourceCreate(resourceID, configMap);
+      configMapDR.desired = createConfigMap(resource);
+      configMapDR.reconcile(resource, context);
     } else {
-      ResourceID resourceID = ResourceID.fromResource(configMap);
       if (!Objects.equals(
           configMap.getData().get(CONFIG_MAP_TEST_DATA_KEY), resource.getSpec().getValue())) {
         configMap.getData().put(CONFIG_MAP_TEST_DATA_KEY, resource.getSpec().getValue());
-        var newConfigMap =
-            client
-                .configMaps()
-                .inNamespace(resource.getMetadata().getNamespace())
-                .resource(configMap)
-                .replace();
-        informerEventSource.handleRecentResourceUpdate(resourceID,
-            newConfigMap, configMap);
+        configMapDR.desired = configMap;
+        configMapDR.reconcile(resource, context);
       }
     }
     return UpdateControl.noUpdate();
@@ -94,6 +105,10 @@ public Map<String, EventSource> prepareEventSources(
             .build();
     informerEventSource =
         new InformerEventSource<>(informerConfiguration, client);
+
+    this.configMapDR.setKubernetesClient(context.getClient());
+    this.configMapDR.setEventSource(informerEventSource);
+
     return EventSourceInitializer.nameEventSources(informerEventSource);
   }