From 1e2242920a24ead67a992a86ca39281770209d90 Mon Sep 17 00:00:00 2001 From: lokeshMavs Date: Wed, 7 Aug 2024 15:34:41 -0500 Subject: [PATCH 1/2] The -force flag is deprecated, and the correct flag to use is -auto-approve. This change ensures Terraform does not prompt for approval during the destroy process. --- python_terraform/terraform.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/python_terraform/terraform.py b/python_terraform/terraform.py index 590dcec..55082e0 100644 --- a/python_terraform/terraform.py +++ b/python_terraform/terraform.py @@ -152,7 +152,7 @@ def destroy( :return: ret_code, stdout, stderr """ default = kwargs.copy() - default["force"] = force + default["auto_approve"] = True options = self._generate_default_options(default) args = self._generate_default_args(dir_or_plan) return self.cmd("destroy", *args, **options) @@ -362,7 +362,8 @@ def cmd( err = None if ret_code and raise_on_error: - raise TerraformCommandError(ret_code, " ".join(cmds), out=out, err=err) + raise TerraformCommandError( + ret_code, " ".join(cmds), out=out, err=err) return ret_code, out, err @@ -414,7 +415,8 @@ def read_state_file(self, file_path=None) -> None: file_path = file_path or self.state or "" if not file_path: - backend_path = os.path.join(file_path, ".terraform", "terraform.tfstate") + backend_path = os.path.join( + file_path, ".terraform", "terraform.tfstate") if os.path.exists(os.path.join(working_dir, backend_path)): file_path = backend_path @@ -458,7 +460,7 @@ def show_workspace(self, **kwargs) -> CommandOutput: def list_workspace(self) -> List[str]: """List of workspaces - + :return: workspaces :example: >>> tf = Terraform() From 9ce1653269918d36556c983c5475e0c79afcef44 Mon Sep 17 00:00:00 2001 From: lokeshMavs Date: Wed, 7 Aug 2024 15:37:43 -0500 Subject: [PATCH 2/2] Added comment --- python_terraform/terraform.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python_terraform/terraform.py b/python_terraform/terraform.py index 55082e0..3c8d6ac 100644 --- a/python_terraform/terraform.py +++ b/python_terraform/terraform.py @@ -152,6 +152,7 @@ def destroy( :return: ret_code, stdout, stderr """ default = kwargs.copy() + """Updated to handle TF upgrades""" default["auto_approve"] = True options = self._generate_default_options(default) args = self._generate_default_args(dir_or_plan)