Merge pull request #34792 from radcortez/fix-34759

Ignore unmapped build time properties in KubernetesServiceBindingConfig
quarkusio · Jul 18, 2023 · be46227 · be46227
2 parents 581cec3 + bec7a73
commit be46227
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/...arkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfigSourceFactory.java b/...arkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfigSourceFactory.java
@@ -18,28 +18,37 @@
 import org.jboss.logging.Logger;
 
 import io.smallrye.config.ConfigSourceContext;
-import io.smallrye.config.ConfigSourceFactory.ConfigurableConfigSourceFactory;
+import io.smallrye.config.ConfigSourceFactory;
+import io.smallrye.config.SmallRyeConfig;
+import io.smallrye.config.SmallRyeConfigBuilder;
 
-public class KubernetesServiceBindingConfigSourceFactory
-        implements ConfigurableConfigSourceFactory<KubernetesServiceBindingConfig> {
+public class KubernetesServiceBindingConfigSourceFactory implements ConfigSourceFactory {
 
     private static final Logger log = Logger.getLogger(KubernetesServiceBindingConfigSourceFactory.class);
 
     @Override
-    public Iterable<ConfigSource> getConfigSources(final ConfigSourceContext context,
-            final KubernetesServiceBindingConfig config) {
-        if (!config.enabled()) {
+    public Iterable<ConfigSource> getConfigSources(final ConfigSourceContext context) {
+        SmallRyeConfig config = new SmallRyeConfigBuilder()
+                .withSources(new ConfigSourceContext.ConfigSourceContextConfigSource(context))
+                .withMapping(KubernetesServiceBindingConfig.class)
+                .withMappingIgnore("quarkus.**")
+                .build();
+
+        KubernetesServiceBindingConfig kubernetesServiceBindingConfig = config
+                .getConfigMapping(KubernetesServiceBindingConfig.class);
+
+        if (!kubernetesServiceBindingConfig.enabled()) {
             log.debug(
                     "No attempt will be made to bind configuration based on Kubernetes ServiceBinding because the feature was not enabled.");
             return emptyList();
         }
-        if (config.root().isEmpty()) {
+        if (kubernetesServiceBindingConfig.root().isEmpty()) {
             log.debug(
                     "No attempt will be made to bind configuration based on Kubernetes Service Binding because the binding root was not specified.");
             return emptyList();
         }
 
-        List<ServiceBinding> serviceBindings = getServiceBindings(config.root().get());
+        List<ServiceBinding> serviceBindings = getServiceBindings(kubernetesServiceBindingConfig.root().get());
         if (serviceBindings.isEmpty()) {
             return emptyList();
         }