Fixed interpolation

Signed-off-by: Helber Belmiro <[email protected]>
apache · Aug 29, 2023 · f087b5c · f087b5c
1 parent 87ba285
commit f087b5c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...s/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/config/ConfigValueExpander.java b/...s/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/config/ConfigValueExpander.java
@@ -15,6 +15,10 @@
  */
 package org.kie.kogito.addons.quarkus.k8s.config;
 
+import java.util.Arrays;
+
+import org.kie.kogito.addons.k8s.resource.catalog.KubernetesProtocol;
+
 import io.smallrye.config.ConfigValue;
 
 class ConfigValueExpander {
@@ -51,9 +55,17 @@ static String extractServiceCoordinates(String rawValue) {
         int endIndex = rawValue.indexOf("}", startIndex);
 
         if (startIndex != -1 && endIndex != -1) {
-            return rawValue.substring(startIndex + 2, endIndex);
-        } else {
-            return null;
+            String substring = rawValue.substring(startIndex + 2, endIndex);
+
+            boolean isKubernetesServiceCoordinate = Arrays.stream(KubernetesProtocol.values())
+                    .map(KubernetesProtocol::getValue)
+                    .anyMatch(protocol -> substring.startsWith(protocol + ":"));
+
+            if (isKubernetesServiceCoordinate) {
+                return substring;
+            }
         }
+
+        return null;
     }
 }
diff --git a/...ntime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/ConfigValueExpanderTest.java b/...ntime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/ConfigValueExpanderTest.java
@@ -61,7 +61,7 @@ void expandable(String expandableValues) {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = { "https://localhost/8080", "kubernetes:pods.v1/kie/kogito", "openshift:pods.v1/kie/kogito", "knative:kie/kogito" })
+    @ValueSource(strings = { "https://localhost/8080", "kubernetes:pods.v1/kie/kogito", "openshift:pods.v1/kie/kogito", "knative:kie/kogito", "${something}" })
     void nonExpandable(String nonExpandableValue) {
         ConfigValueExpander expander = new ConfigValueExpander(new FakeKubeDiscoveryConfigCache("should not be returned"));