CFn v2: better handle deploy errors (#12601)

simonrw · web-flow · commit 0921a73bf9d6 · 2025-05-12T19:25:08.000+01:00
diff --git a/localstack-core/localstack/services/cloudformation/v2/provider.py b/localstack-core/localstack/services/cloudformation/v2/provider.py
@@ -271,15 +271,26 @@ def execute_change_set(
         )
 
         def _run(*args):
-            result = change_set_executor.execute()
-            new_stack_status = StackStatus.UPDATE_COMPLETE
-            if change_set.change_set_type == ChangeSetType.CREATE:
-                new_stack_status = StackStatus.CREATE_COMPLETE
-            change_set.stack.set_stack_status(new_stack_status)
-            change_set.set_execution_status(ExecutionStatus.EXECUTE_COMPLETE)
-            change_set.stack.resolved_resources = result.resources
-            change_set.stack.resolved_parameters = result.parameters
-            change_set.stack.resolved_outputs = result.outputs
+            try:
+                result = change_set_executor.execute()
+                new_stack_status = StackStatus.UPDATE_COMPLETE
+                if change_set.change_set_type == ChangeSetType.CREATE:
+                    new_stack_status = StackStatus.CREATE_COMPLETE
+                change_set.stack.set_stack_status(new_stack_status)
+                change_set.set_execution_status(ExecutionStatus.EXECUTE_COMPLETE)
+                change_set.stack.resolved_resources = result.resources
+                change_set.stack.resolved_parameters = result.parameters
+                change_set.stack.resolved_outputs = result.outputs
+            except Exception as e:
+                LOG.error(
+                    "Execute change set failed: %s", e, exc_info=LOG.isEnabledFor(logging.WARNING)
+                )
+                new_stack_status = StackStatus.UPDATE_FAILED
+                if change_set.change_set_type == ChangeSetType.CREATE:
+                    new_stack_status = StackStatus.CREATE_FAILED
+
+                change_set.stack.set_stack_status(new_stack_status)
+                change_set.set_execution_status(ExecutionStatus.EXECUTE_FAILED)
 
         start_worker_thread(_run)
 
