external resource ID

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

Author: csviri

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

@@ -119,7 +119,11 @@ protected Optional<R> selectTargetSecondaryResource(
     if (desired instanceof ExternalDependentIDProvider<?> desiredWithId) {
       targetResources =
           secondaryResources.stream()
-              .filter(r -> ((ExternalDependentIDProvider<?>) r).id().equals(desiredWithId.id()))
+              .filter(
+                  r ->
+                      ((ExternalDependentIDProvider<?>) r)
+                          .externalResourceId()
+                          .equals(desiredWithId.externalResourceId()))
               .toList();
     } else {
       throw new IllegalStateException(

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

@@ -9,5 +9,5 @@
  */
 public interface ExternalDependentIDProvider<T> {
 
-  T id();
+  T externalResourceId();
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentSameTypeIT.java

@@ -14,7 +14,7 @@
 class MultipleManagedExternalDependentSameTypeIT {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new MultipleManagedExternalDependentResourceReconciler())
           .build();
@@ -27,15 +27,15 @@ class MultipleManagedExternalDependentSameTypeIT {
 
   @Test
   void handlesExternalCrudOperations() {
-    operator.create(testResource());
+    extension.create(testResource());
     assertResourceCreatedWithData(DEFAULT_SPEC_VALUE);
 
     var updatedResource = testResource();
     updatedResource.getSpec().setValue(UPDATED_SPEC_VALUE);
-    operator.replace(updatedResource);
+    extension.replace(updatedResource);
     assertResourceCreatedWithData(UPDATED_SPEC_VALUE);
 
-    operator.delete(testResource());
+    extension.delete(testResource());
     assertExternalResourceDeleted();
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalResource.java

@@ -3,9 +3,10 @@
 import java.util.Objects;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.processing.dependent.ExternalDependentIDProvider;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
-public class ExternalResource {
+public class ExternalResource implements ExternalDependentIDProvider<String> {
 
   public static final String EXTERNAL_RESOURCE_NAME_DELIMITER = "#";
 
@@ -65,4 +66,9 @@ public static String toExternalResourceId(HasMetadata primary) {
         + EXTERNAL_RESOURCE_NAME_DELIMITER
         + primary.getMetadata().getNamespace();
   }
+
+  @Override
+  public String externalResourceId() {
+    return id;
+  }
 }

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/schema/Schema.java

@@ -42,7 +42,7 @@ public String toString() {
   }
 
   @Override
-  public String id() {
+  public String externalResourceId() {
     return name;
   }
 }