improve: resource creation api in JUnit extension

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

Author: csviri

caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/BoundedCacheTestBase.java

@@ -63,7 +63,7 @@ private void updateTestResources() {
     IntStream.range(0, NUMBER_OF_RESOURCE_TO_TEST).forEach(i -> {
       var cm = extension().get(ConfigMap.class, RESOURCE_NAME_PREFIX + i);
       cm.getData().put(DATA_KEY, UPDATED_PREFIX + i);
-      extension().replace(cm);
+      extension().createOrUpdate(cm);
     });
   }
 

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/AbstractOperatorExtension.java

@@ -20,6 +20,7 @@
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.utils.Utils;
@@ -107,6 +108,16 @@ public <T extends HasMetadata> T get(Class<T> type, String name) {
     return kubernetesClient.resources(type).inNamespace(namespace).withName(name).get();
   }
 
+  public <T extends HasMetadata> T createOr(T resource,
+      Function<NonDeletingOperation<T>, T> conflictAction) {
+    return kubernetesClient.resource(resource).inNamespace(namespace).createOr(conflictAction);
+  }
+
+  public <T extends HasMetadata> T createOrUpdate(T resource) {
+    return kubernetesClient.resource(resource).inNamespace(namespace)
+        .createOr(NonDeletingOperation::update);
+  }
+
   public <T extends HasMetadata> T create(T resource) {
     return kubernetesClient.resource(resource).inNamespace(namespace).create();
   }
@@ -116,6 +127,10 @@ public <T extends HasMetadata> T create(Class<T> type, T resource) {
     return create(resource);
   }
 
+  /**
+   * Use createOrUpdate instead.
+   */
+  @Deprecated(forRemoval = true)
   public <T extends HasMetadata> T replace(T resource) {
     return kubernetesClient.resource(resource).inNamespace(namespace).replace();
   }

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

@@ -71,7 +71,7 @@ void addNewAndRemoveOldNamespaceTest() {
 
     ConfigMap firstMap = operator.get(ConfigMap.class, TEST_RESOURCE_NAME_1);
     firstMap.setData(Map.of("data", "newdata"));
-    operator.replace(firstMap);
+    operator.createOrUpdate(firstMap);
     assertReconciled(reconciler, defaultNamespaceResource);
   }
 

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

@@ -39,7 +39,7 @@ void cleanupRemovesFinalizerWithoutConflict() throws InterruptedException {
     testResource = operator.get(CleanupConflictCustomResource.class, TEST_RESOURCE_NAME);
     testResource.getMetadata().getFinalizers().remove(ADDITIONAL_FINALIZER);
     testResource.getMetadata().setResourceVersion(null);
-    operator.replace(testResource);
+    operator.createOrUpdate(testResource);
 
     await().pollDelay(Duration.ofMillis(WAIT_TIME * 2)).untilAsserted(
         () -> assertThat(operator.getReconcilerOfType(CleanupConflictReconciler.class)

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

@@ -40,7 +40,7 @@ void crudOperationOnClusterScopedCustomResource() {
     });
 
     resource.getSpec().setData(UPDATED_DATA);
-    operator.replace(resource);
+    operator.createOrUpdate(resource);
     await().untilAsserted(() -> {
       var cm = operator.get(ConfigMap.class, TEST_NAME);
       assertThat(cm).isNotNull();

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

@@ -37,7 +37,7 @@ void updateEventNotReceivedAfterCreateOrUpdate() {
         operator.get(CreateUpdateEventFilterTestCustomResource.class,
             resource.getMetadata().getName());
     actualCreatedResource.getSpec().setValue("2");
-    operator.replace(actualCreatedResource);
+    operator.createOrUpdate(actualCreatedResource);
 
     assertData(operator, actualCreatedResource, 2, 2);
   }

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

@@ -46,7 +46,7 @@ void mapsSecondaryByAnnotation() {
     assertThat(configMap.getMetadata().getOwnerReferences()).isEmpty();
 
     configMap.getData().put("additional_data", "data");
-    operator.replace(configMap);
+    operator.createOrUpdate(configMap);
 
     await().pollDelay(Duration.ofMillis(150))
         .untilAsserted(() -> assertThat(reconciler.getNumberOfExecutions()).isEqualTo(2));

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

@@ -35,7 +35,7 @@ void testCustomMappingAnnotationForDependent() {
     assertConfigMapData(INITIAL_VALUE);
 
     cr.getSpec().setValue(CHANGED_VALUE);
-    cr = extension.replace(cr);
+    cr = extension.createOrUpdate(cr);
     assertConfigMapData(CHANGED_VALUE);
 
     extension.delete(cr);

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

@@ -38,7 +38,7 @@ void managesCRUDOperationsForDependentInDifferentNamespace() {
     });
 
     resource.getSpec().setValue(CHANGED_VALUE);
-    resource = extension.replace(resource);
+    resource = extension.createOrUpdate(resource);
 
     await().untilAsserted(() -> {
       var cm = getDependentConfigMap();

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

@@ -39,7 +39,7 @@ void filtersUpdateOnConfigMap() {
 
     var configMap = operator.get(ConfigMap.class, RESOURCE_NAME);
     configMap.setData(Map.of(CM_VALUE_KEY, CONFIG_MAP_FILTER_VALUE));
-    operator.replace(configMap);
+    operator.createOrUpdate(configMap);
 
     await().pollDelay(Duration.ofMillis(150)).untilAsserted(() -> {
       assertThat(operator.getReconcilerOfType(DependentFilterTestReconciler.class)