Move synchrounous pop uphill, so it doesn't end up as a flag in the actual terraform command

This commit is contained in:
Stephan Zaria 2019-06-10 09:59:40 -07:00
parent 813d23d759
commit 7056a853da

View file

@ -272,6 +272,8 @@ class Terraform(object):
""" """
capture_output = kwargs.pop('capture_output', True) capture_output = kwargs.pop('capture_output', True)
raise_on_error = kwargs.pop('raise_on_error', False) raise_on_error = kwargs.pop('raise_on_error', False)
synchronous = kwargs.pop('synchronous', True)
if capture_output is True: if capture_output is True:
stderr = subprocess.PIPE stderr = subprocess.PIPE
stdout = subprocess.PIPE stdout = subprocess.PIPE
@ -291,7 +293,6 @@ class Terraform(object):
p = subprocess.Popen(cmds, stdout=stdout, stderr=stderr, p = subprocess.Popen(cmds, stdout=stdout, stderr=stderr,
cwd=working_folder, env=environ_vars) cwd=working_folder, env=environ_vars)
synchronous = kwargs.pop('synchronous', True)
if not synchronous: if not synchronous:
return p, None, None return p, None, None