KOGITO-9757 Fixed regex

Signed-off-by: Helber Belmiro <[email protected]>
apache · Aug 28, 2023 · d4f728a · d4f728a
1 parent 8608672
commit d4f728a
Showing 1 changed file with 11 additions and 1 deletion.
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,14 +15,24 @@
  */
 package org.kie.kogito.addons.quarkus.k8s.config;
 
+import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import io.smallrye.config.ConfigValue;
+import org.kie.kogito.addons.k8s.resource.catalog.KubernetesProtocol;
 
 class ConfigValueExpander {
 
-    private static final Pattern placeholderPattern = Pattern.compile("\\$\\{([^}]+)}");
+    private static final Pattern placeholderPattern = createPlaceholderPattern();
+
+    private static Pattern createPlaceholderPattern() {
+        String protocols = Arrays.stream(KubernetesProtocol.values())
+                .map(KubernetesProtocol::getValue)
+                .collect(Collectors.joining("|"));
+        return Pattern.compile("\\$\\{(" + protocols + "):.+}");
+    }
 
     private final KubeDiscoveryConfigCache kubeDiscoveryConfigCache;