From f581df928c012500eeb89e38c89cad00e6a66979 Mon Sep 17 00:00:00 2001 From: Spikeophant Date: Wed, 24 Jul 2019 17:10:08 -0700 Subject: [PATCH 1/2] Revert "Pop "synchronous" flag before it affects actual terraform command" --- python_terraform/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python_terraform/__init__.py b/python_terraform/__init__.py index 146dcae..709103b 100644 --- a/python_terraform/__init__.py +++ b/python_terraform/__init__.py @@ -273,8 +273,6 @@ def cmd(self, cmd, *args, **kwargs): """ capture_output = kwargs.pop('capture_output', True) raise_on_error = kwargs.pop('raise_on_error', False) - synchronous = kwargs.pop('synchronous', True) - if capture_output is True: stderr = subprocess.PIPE stdout = subprocess.PIPE @@ -294,6 +292,7 @@ def cmd(self, cmd, *args, **kwargs): p = subprocess.Popen(cmds, stdout=stdout, stderr=stderr, cwd=working_folder, env=environ_vars) + synchronous = kwargs.pop('synchronous', True) if not synchronous: return p, None, None From 0fa058971591f5550f75859ddbf2cc3872130a7d Mon Sep 17 00:00:00 2001 From: Yuriy Zhigulskiy Date: Fri, 24 Jul 2020 15:12:38 +0300 Subject: [PATCH 2/2] add: Add workspace list functionality --- python_terraform/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python_terraform/__init__.py b/python_terraform/__init__.py index 709103b..0508b16 100644 --- a/python_terraform/__init__.py +++ b/python_terraform/__init__.py @@ -421,7 +421,14 @@ def show_workspace(self): :return: workspace """ - return self.cmd('workspace', 'show') + return self.cmd('workspace', 'show') + + def list_workspaces(self): + """ + list workspaces + :return: workspaces + """ + return self.cmd('workspace', 'list') def __exit__(self, exc_type, exc_value, traceback): self.temp_var_files.clean_up()