(camel) branch main updated: CAMEL-21446: Fixes key resolution with default (#16259)

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 438ca24dedc CAMEL-21446: Fixes key resolution with default (#16259)
438ca24dedc is described below

commit 438ca24dedc1cc890a409bf0e3acc06b637e2ad6
Author: Marco Carletti <mcarl...@redhat.com>
AuthorDate: Wed Nov 13 14:08:41 2024 +0100

    CAMEL-21446: Fixes key resolution with default (#16259)
---
 .../camel/component/kubernetes/properties/BasePropertiesFunction.java | 4 ++++
 .../kubernetes/properties/ConfigMapPropertiesFunctionTest.java        | 3 +++
 .../component/kubernetes/properties/SecretPropertiesFunctionTest.java | 3 +++
 3 files changed, 10 insertions(+)

diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/BasePropertiesFunction.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/BasePropertiesFunction.java
index 4b27ec00127..c59eb817fe6 100644
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/BasePropertiesFunction.java
+++ 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/properties/BasePropertiesFunction.java
@@ -233,6 +233,10 @@ abstract class BasePropertiesFunction extends 
ServiceSupport implements Properti
             return defaultValue;
         }
 
+        if (key.contains(":")) {
+            key = StringHelper.before(key, ":");
+        }
+
         // local-mode will not lookup in kubernetes but as local properties
         if (localMode) {
             String localKey = name + "/" + key;
diff --git 
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
 
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
index 8b7798b02d9..7b2b2751736 100644
--- 
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
+++ 
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/ConfigMapPropertiesFunctionTest.java
@@ -69,6 +69,9 @@ public class ConfigMapPropertiesFunctionTest extends 
KubernetesTestSupport {
 
             out = cmf.apply("myconfig/bar.txt");
             Assertions.assertEquals("Moes Bar", out);
+
+            out = cmf.apply("myconfig/bar.txt:Boes Bar");
+            Assertions.assertEquals("Moes Bar", out);
         } finally {
             client.resource(cm).delete();
         }
diff --git 
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
 
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
index 4732526a0f3..ef6e6df423b 100644
--- 
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
+++ 
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/properties/SecretPropertiesFunctionTest.java
@@ -73,6 +73,9 @@ public class SecretPropertiesFunctionTest extends 
KubernetesTestSupport {
 
             out = cmf.apply("mysecret/mypass");
             Assertions.assertEquals("tiger", out);
+
+            out = cmf.apply("mysecret/mypass:lion");
+            Assertions.assertEquals("tiger", out);
         } finally {
             client.resource(sec).delete();
         }