Merge pull request #141 from galaxyproject/fix_helm_get_values

Specify format when using helm get values + tests

cloudman/helmsman/clients/helm_client.py

@@ -2,8 +2,6 @@
 import contextlib
 import shutil
 
-import yaml
-
 from enum import Enum
 
 from clusterman.clients import helpers
@@ -150,7 +148,8 @@ def get_values(self, namespace, release_name, get_all=True):
         get_all=True will also dump chart default values.
         get_all=False will only return user overridden values.
         """
-        cmd = ["helm", "get", "values", "--namespace", namespace, release_name]
+        cmd = ["helm", "get", "values", "-o", "yaml",
+               "--namespace", namespace, release_name]
         if get_all:
             cmd += ["--all"]
         return helpers.run_yaml_command(cmd)

cloudman/helmsman/tests/mock_helm.py

@@ -172,6 +172,10 @@ def _create_parser(self):
             'values', help='download values for a release')
         p_get_values.add_argument(
             'release', type=str, help='release name')
+        p_get_values.add_argument(
+            '-o', '--output', type=str, help='output format',
+            choices=['table', 'json', 'yaml'], default='table',
+            const='all', nargs='?')
         p_get_values.add_argument(
             '--all', action='store_true', help='dump all values')
         p_get_values.add_argument(
@@ -328,7 +332,11 @@ def _helm_get_values(self, args):
             return 'Error: release: "%s" not found' % args.release
         latest_release = revisions[-1]
         with StringIO() as output:
-            yaml.safe_dump(latest_release.get('VALUES'), output, allow_unicode=True)
+            if args.output == "yaml":
+                yaml.safe_dump(latest_release.get('VALUES'), output, allow_unicode=True)
+            else:
+                output.write("USER-SUPPLIED VALUES:")
+                yaml.safe_dump(latest_release.get('VALUES'), output, allow_unicode=True)
             return output.getvalue()
 
     def _helm_get_manifest(self, args):