Support configuration with the root alias already set

Relates quarkiverse/quarkus-helm#168
dekorateio · Feb 1, 2023 · 9ef6565 · 9ef6565
1 parent 2e66217
commit 9ef6565
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/...s/helm-annotations/src/main/java/io/dekorate/helm/listener/HelmWriterSessionListener.java b/...s/helm-annotations/src/main/java/io/dekorate/helm/listener/HelmWriterSessionListener.java
@@ -132,8 +132,7 @@ public Map<String, String> writeHelmFiles(Session session, Project project,
     Map<String, String> artifacts = new HashMap<>();
     if (helmConfig.isEnabled()) {
       validateHelmConfig(helmConfig);
-      List<ConfigReference> valuesReferences = mergeValuesReferencesFromDecorators(configReferences,
-          helmConfig.getAddIfStatements(), session);
+      List<ConfigReference> valuesReferences = mergeValuesReferencesFromDecorators(helmConfig, configReferences, session);
 
       try {
         LOGGER.info(String.format("Creating Helm Chart \"%s\"", helmConfig.getName()));
@@ -243,14 +242,15 @@ private Map<String, String> createEmptyChartFolder(HelmChartConfig helmConfig, P
     return Collections.singletonMap(emptyChartsDir.toString(), EMPTY);
   }
 
-  private List<ConfigReference> mergeValuesReferencesFromDecorators(List<ConfigReference> configReferencesFromConfig,
-      AddIfStatement[] addIfStatements, Session session) {
+  private List<ConfigReference> mergeValuesReferencesFromDecorators(HelmChartConfig helmConfig,
+      List<ConfigReference> configReferencesFromConfig, Session session) {
     List<ConfigReference> configReferences = new LinkedList<>();
     // From user
     configReferences.addAll(configReferencesFromConfig);
     // From if statements: these are boolean values
-    for (AddIfStatement addIfStatement : addIfStatements) {
-      configReferences.add(new ConfigReference(addIfStatement.getProperty(), null, addIfStatement.getWithDefaultValue()));
+    for (AddIfStatement addIfStatement : helmConfig.getAddIfStatements()) {
+      configReferences.add(new ConfigReference(deductProperty(helmConfig, addIfStatement.getProperty()),
+          null, addIfStatement.getWithDefaultValue()));
     }
     // From decorators: We need to reverse the order as the latest decorator was the latest applied and hence the one
     // we should use.
@@ -319,7 +319,10 @@ private Map<String, String> createValuesYaml(HelmChartConfig helmConfig, List<Co
 
   private String deductProperty(HelmChartConfig helmConfig, String property) {
     if (!startWithDependencyPrefix(property, helmConfig.getDependencies())) {
-      property = helmConfig.getValuesRootAlias() + "." + property;
+      String prefix = helmConfig.getValuesRootAlias() + ".";
+      if (!property.startsWith(prefix)) {
+        property = prefix + property;
+      }
     }
 
     return property;
@@ -527,12 +530,12 @@ private List<Map<Object, Object>> replaceValuesInYamls(HelmChartConfig helmConfi
       Map<String, Object> seen = new HashMap<>();
 
       for (ConfigReference valueReference : valuesReferences) {
-        String valueReferenceProperty = helmConfig.getValuesRootAlias() + "." + valueReference.getProperty();
+        String valueReferenceProperty = deductProperty(helmConfig, valueReference.getProperty());
 
-        if (seen.containsKey(valueReference.getProperty())) {
+        if (seen.containsKey(valueReferenceProperty)) {
           if (Strings.isNotNullOrEmpty(valueReference.getProfile())) {
             Object value = Optional.ofNullable(valueReference.getValue())
-                .orElse(seen.get(valueReference.getProperty()));
+                .orElse(seen.get(valueReferenceProperty));
             getValues(prodValues, valuesByProfile, valueReference).put(valueReferenceProperty, value);
           }
 
@@ -549,7 +552,7 @@ private List<Map<Object, Object>> replaceValuesInYamls(HelmChartConfig helmConfi
 
           Object value = Optional.ofNullable(valueReference.getValue()).orElse(found);
           if (value != null) {
-            seen.put(valueReference.getProperty(), value);
+            seen.put(valueReferenceProperty, value);
             getValues(prodValues, valuesByProfile, valueReference).put(valueReferenceProperty, value);
           }
         }

diff --git a/examples/helm-on-kubernetes-example/src/main/resources/application.properties b/examples/helm-on-kubernetes-example/src/main/resources/application.properties
@@ -19,7 +19,7 @@ dekorate.helm.values[2].property=vcs-url
 dekorate.helm.values[2].paths=(kind == Deployment).spec.template.metadata.annotations.'app.dekorate.io/vcs-url'
 dekorate.helm.values[2].value=Overridden
 # Using values with profile
-dekorate.helm.values[3].property=vcs-url
+dekorate.helm.values[3].property=app.vcs-url
 dekorate.helm.values[3].paths=(kind == Deployment).spec.template.metadata.annotations.'app.dekorate.io/vcs-url'
 dekorate.helm.values[3].value=Only for DEV!
 dekorate.helm.values[3].profile=dev