Merge pull request #69 from salsadigitalauorg/fix/api-client-credentials

fix: use templar for legacy ApiClient inits
salsadigitalauorg · Nov 9, 2023 · 34a3dc8 · 34a3dc8
2 parents cece488 + 10e4394
commit 34a3dc8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/api/plugins/action/group.py b/api/plugins/action/group.py
@@ -17,8 +17,8 @@ def run(self, tmp=None, task_vars=None):
         self._display.v("Task args: %s" % self._task.args)
 
         lagoon = ApiClient(
-            task_vars.get('lagoon_api_endpoint'),
-            task_vars.get('lagoon_api_token'),
+            self._templar.template(task_vars.get('lagoon_api_endpoint')).strip(),
+            self._templar.template(task_vars.get('lagoon_api_token')).strip(),
             {'headers': self._task.args.get('headers', {})}
         )
 

diff --git a/api/plugins/action/last_deploy.py b/api/plugins/action/last_deploy.py
@@ -15,8 +15,8 @@ def run(self, tmp=None, task_vars=None):
         self._display.v("Task args: %s" % self._task.args)
 
         lagoon = ApiClient(
-            task_vars.get('lagoon_api_endpoint'),
-            task_vars.get('lagoon_api_token'),
+            self._templar.template(task_vars.get('lagoon_api_endpoint')).strip(),
+            self._templar.template(task_vars.get('lagoon_api_token')).strip(),
             {'headers': self._task.args.get('headers', {})}
         )
 

diff --git a/api/plugins/action/project_notification.py b/api/plugins/action/project_notification.py
@@ -16,8 +16,8 @@ def run(self, tmp=None, task_vars=None):
         self._display.v("Task args: %s" % self._task.args)
 
         lagoon = ApiClient(
-            task_vars.get('lagoon_api_endpoint'),
-            task_vars.get('lagoon_api_token'),
+            self._templar.template(task_vars.get('lagoon_api_endpoint')).strip(),
+            self._templar.template(task_vars.get('lagoon_api_token')).strip(),
             {'headers': self._task.args.get('headers', {})}
         )
 

diff --git a/api/plugins/action/project_update.py b/api/plugins/action/project_update.py
@@ -25,8 +25,8 @@ def run(self, tmp=None, task_vars=None):
             raise AnsibleError("No value to update.")
 
         lagoon = ApiClient(
-            task_vars.get('lagoon_api_endpoint'),
-            task_vars.get('lagoon_api_token'),
+            self._templar.template(task_vars.get('lagoon_api_endpoint')).strip(),
+            self._templar.template(task_vars.get('lagoon_api_token')).strip(),
             {'headers': self._task.args.get('headers', {})}
         )