🔊 Log all Pulumi messages containing 'error:' or 'stderr:' in log_exc…

…eption method

data_safe_haven/infrastructure/project_manager.py

@@ -274,6 +274,7 @@ def destroy(self) -> None:
                     ):
                         time.sleep(10)
                     else:
+                        self.log_exception(exc)
                         msg = "Pulumi resource destruction failed."
                         raise DataSafeHavenPulumiError(msg) from exc
         except DataSafeHavenError as exc:
@@ -309,9 +310,11 @@ def install_plugins(self, workspace: automation.Workspace) -> None:
             raise DataSafeHavenPulumiError(msg) from exc
 
     def log_exception(self, exc: automation.CommandError) -> None:
-        with suppress(IndexError):
-            stderr = str(exc).split("\n")[3].replace(" stderr: ", "")
-            self.log_message(f"Pulumi output: {stderr}")
+        for error_line in str(exc).split("\n"):
+            if any(word in error_line for word in ["error:", "stderr:"]):
+                message = error_line.replace("error:", "").replace("stderr:", "").strip()
+                if message:
+                    self.log_message(f"Pulumi error: {message}")
 
     def log_message(self, message: str) -> None:
         return from_ansi(self.logger, message)
@@ -383,7 +386,6 @@ def teardown(self, *, force: bool = False) -> None:
             self.destroy()
             self.cleanup()
         except Exception as exc:
-            self.log_exception(exc)
             msg = "Tearing down Pulumi infrastructure failed.."
             raise DataSafeHavenPulumiError(msg) from exc