Adds the possibility to deepmerge null values if necessary (#254)

* feat: allowing to merge null values into maps via deepMerge
bug: fixing scm path

Author: nihussmann

src/main/groovy/com/cloudogu/gitops/features/CertManager.groovy

@@ -102,7 +102,7 @@ class CertManager extends Feature implements FeatureWithImage {
         if (config.scmm.internal) {
             new URI('http://scmm-scm-manager.default.svc.cluster.local/scm')
         } else {
-            new URI("${config.scmm.url}/scm")
+            new URI("${config.scmm.url}")
         }
     }
 

src/main/groovy/com/cloudogu/gitops/features/ExternalSecretsOperator.groovy

@@ -99,7 +99,7 @@ class ExternalSecretsOperator extends Feature implements FeatureWithImage {
         if (config.scmm.internal) {
             new URI('http://scmm-scm-manager.default.svc.cluster.local/scm')
         } else {
-            new URI("${config.scmm.url}/scm")
+            new URI("${config.scmm.url}")
         }
     }
 

src/main/groovy/com/cloudogu/gitops/features/IngressNginx.groovy

@@ -97,7 +97,7 @@ class IngressNginx extends Feature implements FeatureWithImage {
         if (config.scmm.internal) {
             new URI('http://scmm-scm-manager.default.svc.cluster.local/scm')
         } else {
-            new URI("${config.scmm.url}/scm")
+            new URI("${config.scmm.url}")
         }
     }
 }

src/main/groovy/com/cloudogu/gitops/features/Mailhog.groovy

@@ -115,7 +115,7 @@ class Mailhog extends Feature implements FeatureWithImage {
         if (config.scmm.internal) {
             new URI('http://scmm-scm-manager.default.svc.cluster.local/scm')
         } else {
-            new URI("${config.scmm.url}/scm")
+            new URI("${config.scmm.url}")
         }
     }
 }

src/main/groovy/com/cloudogu/gitops/features/PrometheusStack.groovy

@@ -187,7 +187,7 @@ class PrometheusStack extends Feature implements FeatureWithImage {
         if (config.scmm.internal) {
             new URI('http://scmm-scm-manager.default.svc.cluster.local/scm')
         } else {
-            new URI("${config.scmm.url}/scm")
+            new URI("${config.scmm.url}")
         }
     }
 

src/main/groovy/com/cloudogu/gitops/features/Vault.groovy

@@ -160,7 +160,7 @@ class Vault extends Feature implements FeatureWithImage {
         if (config.scmm.internal) {
             new URI('http://scmm-scm-manager.default.svc.cluster.local/scm')
         } else {
-            new URI("${config.scmm.url}/scm")
+            new URI("${config.scmm.url}")
         }
     }
 }

src/main/groovy/com/cloudogu/gitops/utils/MapUtils.groovy

@@ -1,20 +1,32 @@
 package com.cloudogu.gitops.utils 
 
 class MapUtils {
-    
+
     static Map deepMerge(Map src, Map target) {
-        src.forEach(
-                (key, value) -> { if (value != null) target.merge(key, value, (oldVal, newVal) -> {
-                    if (oldVal instanceof Map) {
-                        if (!newVal instanceof Map) {
-                            throw new RuntimeException("Can't merge config, different types, map vs other: Map ${oldVal}; Other ${newVal}")
-                        }
-                        return deepMerge(newVal as Map, oldVal)
-                    } else {
+        src.each { key, value ->
+            if (value == null) {
+                // If the value in src is null, set the key in target to null
+                target[key] = null
+            } else {
+                target.merge(key, value) { oldVal, newVal ->
+                    // Case 1: If both values are Maps, perform a deep merge
+                    if (oldVal instanceof Map && newVal instanceof Map) {
+                        return deepMerge(newVal, oldVal)  // Recursively merge the maps
+                    }
+                    // Case 2: If newVal is null, set the key to null in target
+                    if (newVal == null) {
+                        return null
+                    }
+                    // Case 3: If oldVal is null, use newVal
+                    if (oldVal == null) {
                         return newVal
                     }
-                })
-                })
+                    // Case 4: Default, return the new value (newVal takes priority)
+                    return newVal
+                }
+            }
+        }
         return target
     }
+
 }

src/test/groovy/com/cloudogu/gitops/features/PrometheusStackTest.groovy

@@ -7,6 +7,7 @@ import com.cloudogu.gitops.utils.*
 import groovy.yaml.YamlSlurper
 import org.junit.jupiter.api.Test
 import org.mockito.ArgumentCaptor
+
 import java.nio.file.Files
 import java.nio.file.Path
 
@@ -294,7 +295,7 @@ policies:
 
         def additionalScrapeConfigs = parseActualYaml()['prometheus']['prometheusSpec']['additionalScrapeConfigs'] as List
         assertThat(((additionalScrapeConfigs[0]['static_configs'] as List)[0]['targets'] as List)[0]).isEqualTo('localhost:9091')
-        assertThat(additionalScrapeConfigs[0]['metrics_path']).isEqualTo('/prefix/scm/api/v2/metrics/prometheus')
+        assertThat(additionalScrapeConfigs[0]['metrics_path']).isEqualTo('/prefix/api/v2/metrics/prometheus')
         assertThat(additionalScrapeConfigs[0]['scheme']).isEqualTo('https')
 
         // scrape config for jenkins is unchanged
@@ -544,9 +545,14 @@ policies:
     @Test
     void 'Merges additional helm values merged with default values'() {
         config.features.monitoring.helm.values = [
-                key: [
+                key       : [
                         some: 'thing',
                         one : 1
+                ],
+                prometheus: [
+                        prometheusSpec: [
+                                scrapeConfigSelectorNilUsesHelmValues: null
+                        ]
                 ]
         ]
 
@@ -555,6 +561,7 @@ policies:
 
         assertThat(actual['key']['some']).isEqualTo('thing')
         assertThat(actual['key']['one']).isEqualTo(1)
+        assertThat(actual['prometheus']['prometheusSpec']['scrapeConfigSelectorNilUsesHelmValues']).isEqualTo(null)
     }
 
     @Test
@@ -572,7 +579,7 @@ policies:
                 "test1-example-apps-production",
                 "test1-secrets"
         ))
-        config.application.activeNamespaces=  namespaceList
+        config.application.activeNamespaces = namespaceList
         createStack().install()
         def actual = parseActualYaml()