[Resolve #1169] Add detect-stack-drift command

integration-tests/steps/stacks.py

@@ -522,10 +522,16 @@ def wait_for_final_state(context, stack_name):
     delay = 2
     max_retries = 300
     attempts = 0
+    rollback_printed = False
     while attempts < max_retries:
         retry_boto_call(stack.load)
         if not stack.stack_status.endswith("IN_PROGRESS"):
             return
+        if stack.stack_status == "ROLLBACK_IN_PROGRESS" and not rollback_printed:
+            client = boto3.client("cloudformation")
+            response = client.describe_stack_events(StackName=stack_name)
+            print(response)
+            rollback_printed = True
         attempts += 1
         print("Stack in status", stack.stack_status)
         time.sleep(delay)

sceptre/cli/drift.py

@@ -51,14 +51,16 @@ def drift_detect(ctx: Context, path: str):
     plan = SceptrePlan(context)
     responses = plan.drift_detect()
 
+    output_format = "yaml" if context.output_format == "text" else context.output_format
+
     exit_status = 0
     for stack, response in responses.items():
         status = response["DetectionStatus"]
         if status in BAD_STATUSES:
             exit_status += 1
         for key in ["Timestamp", "ResponseMetadata"]:
             response.pop(key, None)
-        write({stack.external_name: response}, context.output_format)
+        write({stack.external_name: response}, output_format)
 
     exit(exit_status)
 
@@ -91,11 +93,13 @@ def drift_show(ctx, path):
     plan = SceptrePlan(context)
     responses = plan.drift_show()
 
+    output_format = "yaml" if context.output_format == "text" else context.output_format
+
     exit_status = 0
     for stack, (status, response) in responses.items():
         if status in BAD_STATUSES:
             exit_status += 1
         response.pop("ResponseMetadata", None)
-        write({stack.external_name: response}, context.output_format)
+        write({stack.external_name: response}, output_format)
 
     exit(exit_status)

sceptre/cli/helpers.py

@@ -134,6 +134,8 @@ def _generate_yaml(stream):
             [yaml.load(item, Loader=CfnYamlLoader) for item in items],
             default_flow_style=False, explicit_start=True
         )
+    elif isinstance(stream, dict):
+        return yaml.dump(stream, default_flow_style=False)
     else:
         try:
             return yaml.safe_loads(stream)

sceptre/plan/actions.py

@@ -1069,7 +1069,7 @@ def _wait_for_drift_status(self, detection_id: str) -> dict:
             if elapsed >= timeout:
                 raise TimeoutError(f"Timed out after {elapsed} seconds")
 
-            self.logger.debug(f"{self.stack.name} - Waiting for drift detection")
+            self.logger.info(f"{self.stack.name} - Waiting for drift detection")
             response = self._describe_stack_drift_detection_status(detection_id)
             detection_status = response["DetectionStatus"]
 
@@ -1095,15 +1095,15 @@ def _log_drift_status(self, response: dict) -> None:
 
         for key in keys:
             if key in response:
-                self.logger.debug(
+                self.logger.info(
                     f"{self.stack.name} - {key} - {response[key]}"
                 )
 
     def _detect_stack_drift(self) -> dict:
         """
         Run detect_stack_drift.
         """
-        self.logger.debug(f"{self.stack.name} - Detecting Stack Drift")
+        self.logger.info(f"{self.stack.name} - Detecting Stack Drift")
 
         return self.connection_manager.call(
             service="cloudformation",
@@ -1117,7 +1117,7 @@ def _describe_stack_drift_detection_status(self, detection_id: str) -> dict:
         """
         Run describe_stack_drift_detection_status.
         """
-        self.logger.debug(f"{self.stack.name} - Describing Stack Drift Detection Status")
+        self.logger.info(f"{self.stack.name} - Describing Stack Drift Detection Status")
 
         return self.connection_manager.call(
             service="cloudformation",
@@ -1131,7 +1131,7 @@ def _describe_stack_resource_drifts(self) -> dict:
         """
         Detects stack resource_drifts for a running stack.
         """
-        self.logger.debug(f"{self.stack.name} - Describing Stack Resource Drifts")
+        self.logger.info(f"{self.stack.name} - Describing Stack Resource Drifts")
 
         return self.connection_manager.call(
             service="cloudformation",

tests/test_cli.py

@@ -876,8 +876,8 @@ def test_setup_logging_without_debug(self):
         "output_format,no_colour,expected_output", [
             ("json", True, '{\n    "stack": "CREATE_COMPLETE"\n}'),
             ("json", False, '{\n    "stack": "\x1b[32mCREATE_COMPLETE\x1b[0m\"\n}'),
-            ("yaml", True, {'stack': 'CREATE_COMPLETE'}),
-            ("yaml", False, '{\'stack\': \'\x1b[32mCREATE_COMPLETE\x1b[0m\'}')
+            ("yaml", True, 'stack: CREATE_COMPLETE\n'),
+            ("yaml", False, 'stack: \x1b[32mCREATE_COMPLETE\x1b[0m\n')
         ]
     )
     def test_write_formats(
@@ -1010,13 +1010,14 @@ def test_drift_detect(self):
             cli, ["drift", "detect", "dev/vpc.yaml"]
         )
         assert result.exit_code == 0
-        assert result.output == " ".join([
-            "{'fake_stack': {'StackId': 'fake-stack-id',",
-            "'StackDriftDetectionId': '3fb76910-f660-11eb-80ac-0246f7a6da62',",
-            "'StackDriftStatus': 'IN_SYNC',",
-            "'DetectionStatus': 'DETECTION_COMPLETE',",
-            "'DriftedStackResourceCount': 0}}\n"
-        ])
+        assert result.output == (
+            'fake_stack:\n'
+            '  DetectionStatus: DETECTION_COMPLETE\n'
+            '  DriftedStackResourceCount: 0\n'
+            '  StackDriftDetectionId: 3fb76910-f660-11eb-80ac-0246f7a6da62\n'
+            '  StackDriftStatus: IN_SYNC\n'
+            '  StackId: fake-stack-id\n\n'
+        )
 
     def test_drift_show(self):
         self.mock_stack_actions.drift_show.return_value = (
@@ -1026,4 +1027,4 @@ def test_drift_show(self):
             cli, ["drift", "show", "dev/vpc.yaml"]
         )
         assert result.exit_code == 0
-        assert result.output == "{'fake_stack': {'some': 'json'}}\n"
+        assert result.output == "fake_stack:\n  some: json\n\n"