bulks sample + fixes

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

Author: csviri

src/main/java/io/javaoperatorsdk/operator/glue/Utils.java

@@ -146,7 +146,13 @@ private static Optional<String> getOptionalPropertyValueFromTemplate(String reso
       String property) {
     var finalProp = property + ":";
     var targetLine = resourceTemplate.lines().filter(l -> l.contains(finalProp)).findFirst();
-    return targetLine.map(l -> l.replace(finalProp, "").trim());
+    return targetLine.map(l -> {
+      int index = l.indexOf(finalProp);
+      if (index > 0) {
+        l = l.substring(index);
+      }
+      return l.replace(finalProp, "").trim();
+    });
   }
 
   private static String getPropertyValueFromTemplate(String resourceTemplate, String property) {

src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java

@@ -28,6 +28,7 @@
 import io.javaoperatorsdk.operator.glue.reconciler.ValidationAndErrorHandler;
 import io.javaoperatorsdk.operator.glue.reconciler.operator.GlueOperatorReconciler;
 import io.javaoperatorsdk.operator.glue.templating.GenericTemplateHandler;
+import io.javaoperatorsdk.operator.processing.dependent.BulkDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.KubernetesResourceDeletedCondition;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowBuilder;
@@ -184,9 +185,11 @@ private void createAndAddDependentToWorkflow(Glue primary, Context<Glue> context
     var dr = createDependentResource(spec, leafDependent, resourceInSameNamespaceAsPrimary);
     var gvk = dr.getGroupVersionKind();
 
-    dr.setResourceDiscriminator(new GenericResourceDiscriminator(dr.getGroupVersionKind(),
-        genericTemplateHandler.processTemplate(Utils.getName(spec), primary, context),
-        targetNamespace.orElse(null)));
+    if (!(dr instanceof BulkDependentResource<?, ?>)) {
+      dr.setResourceDiscriminator(new GenericResourceDiscriminator(dr.getGroupVersionKind(),
+          genericTemplateHandler.processTemplate(Utils.getName(spec), primary, context),
+          targetNamespace.orElse(null)));
+    }
 
     var es = informerRegister.registerInformer(context, gvk, primary);
     dr.configureWith(es);

src/test/java/io/javaoperatorsdk/operator/glue/GlueTest.java

@@ -368,6 +368,31 @@ void customizeMatcher() {
     });
   }
 
+  @Test
+  void simpleBulk() {
+    var glue = createGlue("/glue/" + "SimpleBulk.yaml");
+
+    await().untilAsserted(() -> {
+      var configMaps = getRelatedConfigMaps(glue.getMetadata().getName());
+      assertThat(configMaps).hasSize(3);
+      assertThat(configMaps)
+          .allMatch(cm -> cm.getMetadata().getName().startsWith("simple-glue-configmap-"));
+    });
+
+    delete(glue);
+
+    await().untilAsserted(
+        () -> assertThat(getRelatedConfigMaps(glue.getMetadata().getName())).isEmpty());
+  }
+
+  List<ConfigMap> getRelatedConfigMaps(String ownerName) {
+    return list(ConfigMap.class).stream()
+        .filter(cm -> !cm.getMetadata().getOwnerReferences().isEmpty()
+            && cm.getMetadata().getOwnerReferences()
+                .get(0).getName().equals(ownerName))
+        .toList();
+  }
+
   private List<Glue> testWorkflowList(int num) {
     List<Glue> res = new ArrayList<>();
     IntStream.range(0, num).forEach(index -> {

src/test/java/io/javaoperatorsdk/operator/glue/TestBase.java

@@ -1,6 +1,7 @@
 package io.javaoperatorsdk.operator.glue;
 
 import java.time.Duration;
+import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -70,6 +71,10 @@ protected <T extends HasMetadata> T get(Class<T> clazz, String name) {
     return client.resources(clazz).inNamespace(testNamespace).withName(name).get();
   }
 
+  protected <T extends HasMetadata> List<T> list(Class<T> clazz) {
+    return client.resources(clazz).inNamespace(testNamespace).list().getItems();
+  }
+
   protected <T extends HasMetadata> T update(T resource) {
     resource.getMetadata().setResourceVersion(null);
     return client.resource(resource).inNamespace(testNamespace).update();

src/test/java/io/javaoperatorsdk/operator/glue/UtilsTest.java

@@ -0,0 +1,39 @@
+package io.javaoperatorsdk.operator.glue;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+class UtilsTest {
+
+
+  @Test
+  void getAPIVersionFromListResource() {
+    String apiVersion = Utils.getApiVersionFromTemplate("""
+        - apiVersion: v1
+          kind: ConfigMap
+          metadata:
+             name: simple-glue-configmap-{i}
+          data:
+             key: "value1"
+        """);
+
+    assertThat(apiVersion).isEqualTo("v1");
+  }
+
+  @Test
+  void getAPIVersionPFromResource() {
+    String apiVersion = Utils.getApiVersionFromTemplate("""
+        apiVersion: v1
+        kind: ConfigMap
+        metadata:
+           name: simple-glue-configmap-{i}
+        data:
+           key: "value1"
+        """);
+
+    assertThat(apiVersion).isEqualTo("v1");
+  }
+
+}

src/test/resources/glue/SimpleBulk.yaml

@@ -0,0 +1,19 @@
+# Invalid GLUE, presents resources with non-unique name
+apiVersion: io.javaoperatorsdk.operator.glue/v1beta1
+kind: Glue
+metadata:
+  name: simple-glue
+spec:
+  childResources:
+    - name: configMaps
+      bulk: true
+      resourceTemplate: |
+        items:
+        {#for i in 3}
+        - apiVersion: v1
+          kind: ConfigMap
+          metadata:
+            name: simple-glue-configmap-{i}
+          data:
+            key: "value1"
+        {/for}