Return the deployment result in exit code for all failures (aws#6258)

Co-authored-by: Wing Fung Lau <[email protected]> Co-authored-by: Haresh Nasit <[email protected]> Co-authored-by: Daniel Mil <[email protected]>
valerena · Nov 29, 2023 · f18b4cc · f18b4cc
1 parent 91ad69f
commit f18b4cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/samcli/commands/deploy/deploy_context.py b/samcli/commands/deploy/deploy_context.py
@@ -280,10 +280,9 @@ def deploy(
                 click.echo(str(ex))
             except deploy_exceptions.DeployFailedError:
                 # Failed to deploy, check for DELETE action otherwise skip
-                if self.on_failure != FailureMode.DELETE:
-                    raise
-
-                self.deployer.rollback_delete_stack(stack_name)
+                if self.on_failure == FailureMode.DELETE:
+                    self.deployer.rollback_delete_stack(stack_name)
+                raise
 
         else:
             try:

diff --git a/tests/unit/commands/deploy/test_deploy_context.py b/tests/unit/commands/deploy/test_deploy_context.py
@@ -248,7 +248,8 @@ def test_on_failure_delete_rollback_stack(self, mock_client, mock_session):
 
             self.deploy_command_context.on_failure = FailureMode.DELETE
 
-            self.deploy_command_context.run()
+            with self.assertRaises(DeployFailedError):
+                self.deploy_command_context.run()
 
             self.assertEqual(self.deploy_command_context.deployer.rollback_delete_stack.call_count, 1)