sanity + integration test fixes

ansible-collections · Nov 29, 2022 · a0fa11a · a0fa11a
1 parent fd2ef5c
commit a0fa11a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/plugins/modules/helm_get.py b/plugins/modules/helm_get.py
@@ -148,12 +148,14 @@ def __init__(self, module):
         release_revision = module.params.get("release_revision")
         release_namespace = module.params.get("release_namespace")
 
-        self.common_options = ""
+        common_options = []
         if release_revision:
-            self.common_options += f" --revision {release_revision}"
+            common_options.append("--revision " + release_revision)
 
         if release_revision:
-            self.common_options += f" --namespace {release_namespace}"
+            common_options.append("--namespace " + release_namespace)
+
+        self.common_options = " ".join(common_options)
 
     def parse_yaml_content(self, content):
 
@@ -172,7 +174,7 @@ def parse_yaml_content(self, content):
     def hooks(self):
 
         rc, out, err = run_helm(
-            self.module, self.helm_cmd + f" hooks {self.name}" + self.common_options
+            self.module, self.helm_cmd + f" hooks {self.name} " + self.common_options
         )
         if rc != 0:
             self.module.fail_json(msg=err)
@@ -182,7 +184,7 @@ def values(self):
 
         command = (
             self.helm_cmd
-            + f" values {self.name}"
+            + f" values {self.name} "
             + self.common_options
             + " --output json"
         )
@@ -199,7 +201,7 @@ def values(self):
     def manifest(self):
 
         rc, out, err = run_helm(
-            self.module, self.helm_cmd + f" manifest {self.name}" + self.common_options
+            self.module, self.helm_cmd + f" manifest {self.name} " + self.common_options
         )
         if rc != 0:
             self.module.fail_json(msg=err)
@@ -208,7 +210,7 @@ def manifest(self):
     def notes(self):
 
         rc, out, err = run_helm(
-            self.module, self.helm_cmd + f" notes {self.name}" + self.common_options
+            self.module, self.helm_cmd + f" notes {self.name} " + self.common_options
         )
         if rc != 0:
             self.module.fail_json(msg=err)

diff --git a/tests/integration/targets/helm/tasks/tests_chart.yml b/tests/integration/targets/helm/tasks/tests_chart.yml
@@ -414,6 +414,7 @@
     # Test helm set
     - name: Install helm using set_values parameters
       kubernetes.core.helm:
+        binary_path: "{{ helm_binary }}"
         chart_ref: mariadb
         chart_repo_url: https://charts.bitnami.com/bitnami
         release_name: test-mariadb
@@ -426,6 +427,7 @@
 
     - name: Get value set as string
       kubernetes.core.helm_get:
+        binary_path: "{{ helm_binary }}"
         release_name: test-mariadb
         release_namespace: "{{ helm_namespace }}"
         release_info: