#117 improve configureComponents to only use one yq command

cloudogu · Dec 7, 2023 · 24518ed · 24518ed
1 parent 939faed
commit 24518ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/com/cloudogu/ces/cesbuildlib/K3d.groovy b/src/com/cloudogu/ces/cesbuildlib/K3d.groovy
@@ -228,13 +228,17 @@ class K3d {
         }
     }
 
-    void appendToYamlFile(String file, String key, String value) {
+    void yqEvalYamlFile(String file, String eval) {
         createEmptySetupValuesYamlIfItDoesNotExists()
         doInYQContainer {
-            script.sh("yq -i \"${key} = \\\"${value}\\\"\" ${file}")
+            script.sh("yq -i \"${eval}\" ${file}")
         }
     }
 
+    void appendToYamlFile(String file, String key, String value) {
+        yqEvalYamlFile(file, "${key} = \\\"${value}\\\"")
+    }
+
     void appendFileToYamlFile(String file, String key, String fileName) {
         createEmptySetupValuesYamlIfItDoesNotExists()
         doInYQContainer {
@@ -283,12 +287,16 @@ class K3d {
     }
 
     void configureComponents(components = [:]) {
-        // TODO better solution
+        def evals = []
         components.each { componentName, componentConfig ->
             componentConfig.each { configKey, configValue ->
-                appendToYamlFile(K3D_VALUES_YAML_FILE, ".components.${componentName}.${configKey}", configValue as String)
+                evals << ".components.${componentName}.${configKey} = \\\"${configValue}\\\""
             }
         }
+
+        if (evals.size() > 0) {
+            yqEvalYamlFile(K3D_VALUES_YAML_FILE, evals.join(" | "))
+        }
     }
 
     void configureLogLevel(String loglevel) {

diff --git a/test/com/cloudogu/ces/cesbuildlib/K3dTest.groovy b/test/com/cloudogu/ces/cesbuildlib/K3dTest.groovy
@@ -610,15 +610,6 @@ spec:
         // then
         assertThat(scriptMock.allActualArgs[0].trim()).isEqualTo("whoami".trim())
         assertThat(scriptMock.allActualArgs[1].trim()).isEqualTo("cat /etc/passwd | grep jenkins".trim())
-        assertThat(scriptMock.allActualArgs[2].trim()).isEqualTo("yq -i \".components.k8s-etcd.version = \\\"latest\\\"\" k3d_values.yaml".trim())
-        assertThat(scriptMock.allActualArgs[3].trim()).isEqualTo("whoami".trim())
-        assertThat(scriptMock.allActualArgs[4].trim()).isEqualTo("cat /etc/passwd | grep jenkins".trim())
-        assertThat(scriptMock.allActualArgs[5].trim()).isEqualTo("yq -i \".components.k8s-etcd.helmRepositoryNamespace = \\\"k8s\\\"\" k3d_values.yaml".trim())
-        assertThat(scriptMock.allActualArgs[6].trim()).isEqualTo("whoami".trim())
-        assertThat(scriptMock.allActualArgs[7].trim()).isEqualTo("cat /etc/passwd | grep jenkins".trim())
-        assertThat(scriptMock.allActualArgs[8].trim()).isEqualTo("yq -i \".components.k8s-promtail.version = \\\"1.2.3\\\"\" k3d_values.yaml".trim())
-        assertThat(scriptMock.allActualArgs[9].trim()).isEqualTo("whoami".trim())
-        assertThat(scriptMock.allActualArgs[10].trim()).isEqualTo("cat /etc/passwd | grep jenkins".trim())
-        assertThat(scriptMock.allActualArgs[11].trim()).isEqualTo("yq -i \".components.k8s-promtail.helmRepositoryNamespace = \\\"test_ns\\\"\" k3d_values.yaml".trim())
+        assertThat(scriptMock.allActualArgs[2].trim()).isEqualTo("yq -i \".components.k8s-etcd.version = \\\"latest\\\" | .components.k8s-etcd.helmRepositoryNamespace = \\\"k8s\\\" | .components.k8s-promtail.version = \\\"1.2.3\\\" | .components.k8s-promtail.helmRepositoryNamespace = \\\"test_ns\\\"\" k3d_values.yaml".trim())
     }
 }