Added project install by release name with context and tests

galaxyproject · Oct 28, 2020 · 2ea90b0 · 2ea90b0
1 parent 1e41a8e
commit 2ea90b0
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/cloudman/helmsman/tests/mock_helm.py b/cloudman/helmsman/tests/mock_helm.py
@@ -64,6 +64,12 @@ def __init__(self):
                 'CHART VERSION': '3.0.0',
                 'APP VERSION': '10.01',
                 'DESCRIPTION': 'Another dummy chart'
+            },
+            {
+                'NAME': 'cloudve/jupyterhub\\v',
+                'CHART VERSION': '3.0.0',
+                'APP VERSION': '10.01',
+                'DESCRIPTION': 'Another dummy chart'
             }
         ]
         self.chart_list_field_names = ["NAME", "REVISION", "UPDATED", "STATUS",
@@ -220,7 +226,7 @@ def _helm_list(self, args):
 
     def _helm_install(self, args):
         repo_name, chart_name = args.chart.split('/')
-        release_name = '%s-%s' % (chart_name, uuid.uuid4().hex[:6])
+        release_name = args.name or '%s-%s' % (chart_name, uuid.uuid4().hex[:6])
         revision = {
             'NAME': release_name,
             'REVISION': 1,

diff --git a/cloudman/projman/management/commands/install_template_in_project.py b/cloudman/projman/management/commands/install_template_in_project.py
@@ -54,7 +54,10 @@ def install_template_in_project(project_name, template_name,
                 print("Cannot find project {}.")
                 return None
             try:
-                existing = proj.charts.find(release_name or template_name)
+                if release_name:
+                    existing = proj.charts.get(release_name)
+                else:
+                    existing = proj.charts.find(template_name)
                 if existing and upgrade_chart:
                     ch = proj.charts.update(existing, values, context=context)
                     print(f"Successfully updated template '{template_name}' "

diff --git a/cloudman/projman/tests/data/helmsman_config.yaml b/cloudman/projman/tests/data/helmsman_config.yaml
@@ -15,6 +15,7 @@ install_templates:
           baseUrl: '{{context.project.access_path}}/jupyterhub'
         proxy:
           secretToken: '{{random_alphanumeric(65)}}'
+        greeting: {{context.dummy}}
     galaxy:
       repo: cloudve
       chart: galaxy

diff --git a/cloudman/projman/tests/data/projman_config.yaml b/cloudman/projman/tests/data/projman_config.yaml
@@ -8,4 +8,7 @@ projects:
       galaxy:
         install_template: galaxy
       jupyterhub:
+        release_name: jup
         install_template: jupyter
+        context:
+            dummy: "hello"
diff --git a/cloudman/projman/tests/data/projman_config_update.yaml b/cloudman/projman/tests/data/projman_config_update.yaml
@@ -13,4 +13,8 @@ projects:
             storageclass: updated-provisioner
         upgrade: true
       jupyterhub:
+        release_name: jup
         install_template: jupyter
+        upgrade: true
+        context:
+            dummy: "world"
diff --git a/cloudman/projman/tests/test_mgmt_commands.py b/cloudman/projman/tests/test_mgmt_commands.py
@@ -69,3 +69,15 @@ def test_projman_update_config(self):
         chart2 = proj2.charts.find("galaxy")
         self.assertEqual(chart2.values['postgresql']['persistence']['storageClass'],
                          "updated-provisioner")
+
+    def test_projman_context_update_by_release_name(self):
+        call_command('helmsman_load_config', self.INITIAL_HELMSMAN_DATA)
+        call_command('projman_load_config', self.INITIAL_PROJECT_DATA)
+        projman_api = ProjManAPI(PMServiceContext(
+            user=User.objects.get_or_create(username='admin', is_superuser=True)[0]))
+        proj = projman_api.projects.find("second")
+        chart = proj.charts.get("jup")
+        self.assertEqual(chart.values['greeting'], "hello")
+        call_command('projman_load_config', self.INITIAL_PROJECT_DATA_UPDATE)
+        chart = proj.charts.get("jup")
+        self.assertEqual(chart.values['greeting'], "world")