From f96bbcf49d6fcd90b114c46d32e6d3ff1ce1e551 Mon Sep 17 00:00:00 2001 From: Iain Learmonth Date: Sun, 15 May 2022 18:46:14 +0100 Subject: [PATCH] auto/terraform: straight up return a string for logs --- app/terraform/terraform.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/terraform/terraform.py b/app/terraform/terraform.py index 188396c..199f2f2 100644 --- a/app/terraform/terraform.py +++ b/app/terraform/terraform.py @@ -29,7 +29,7 @@ class TerraformAutomation(BaseAutomation): def tf_apply(self, *, refresh: bool = True, parallelism: Optional[int] = None, - lock_timeout: int = 15) -> Tuple[int, List[Dict[str, Any]]]: + lock_timeout: int = 15) -> Tuple[int, str]: if not parallelism: parallelism = self.parallelism tf = subprocess.run( @@ -43,11 +43,7 @@ class TerraformAutomation(BaseAutomation): ], cwd=self.working_directory(), stdout=subprocess.PIPE) - logs = [] - for line in tf.stdout.decode('utf-8').split('\n'): - if line.strip(): - logs.append(json.loads(line)) - return tf.returncode, str(logs) + return tf.returncode, tf.stdout.decode('utf-8') def tf_generate(self): raise NotImplementedError()