Address PR comments

Author: jutyler1

awscli/customizations/ecs/expressgateway/display_strategy.py

@@ -17,6 +17,7 @@
 import time
 
 from botocore.exceptions import ClientError
+from colorama import Style
 
 from awscli.customizations.ecs.exceptions import MonitoringError
 from awscli.customizations.ecs.expressgateway.stream_display import (
@@ -63,13 +64,16 @@ def __init__(self, display, use_color):
 
     def execute_monitoring(self, collector, start_time, timeout_minutes):
         """Execute async monitoring with spinner and keyboard controls."""
-        final_output, timed_out = asyncio.run(
-            self._execute_async(collector, start_time, timeout_minutes)
-        )
-        if timed_out:
-            uni_print(final_output + "\nMonitoring timed out!\n")
-        else:
-            uni_print(final_output + "\nMonitoring Complete!\n")
+        try:
+            final_output, timed_out = asyncio.run(
+                self._execute_async(collector, start_time, timeout_minutes)
+            )
+            if timed_out:
+                uni_print(final_output + "\nMonitoring timed out!\n")
+            else:
+                uni_print(final_output + "\nMonitoring Complete!\n")
+        finally:
+            uni_print(Style.RESET_ALL)
 
     async def _execute_async(self, collector, start_time, timeout_minutes):
         """Async execution with dual tasks for data and spinner."""
@@ -233,3 +237,4 @@ def execute_monitoring(self, collector, start_time, timeout_minutes):
             self.stream_display.show_error_message(e)
         finally:
             self.stream_display.show_completion_message()
+            uni_print(Style.RESET_ALL)

awscli/customizations/ecs/monitorexpressgatewayservice.py

@@ -57,7 +57,6 @@
 from awscli.customizations.ecs.prompt_toolkit_display import Display
 from awscli.customizations.ecs.serviceviewcollector import ServiceViewCollector
 from awscli.customizations.utils import uni_print
-from awscli.utils import write_exception
 
 
 class ECSMonitorExpressGatewayService(BasicCommand):
@@ -79,7 +78,7 @@ class ECSMonitorExpressGatewayService(BasicCommand):
         "Choose ``--mode INTERACTIVE`` for real-time display with keyboard navigation (requires TTY), "
         "or ``--mode TEXT-ONLY`` for text output with timestamps (works without TTY). "
         "The monitoring session continues until manually stopped by the user or the specified timeout is reached. "
-        "In interactive mode, use keyboard shortcuts: up/down to scroll through resources, 'q' to quit. "
+        "In INTERACTIVE mode, use keyboard shortcuts: up/down to scroll through resources, 'q' to quit. "
         "In TEXT-ONLY mode, press Ctrl+C to stop monitoring."
     )
 
@@ -147,7 +146,7 @@ def _run_main(self, parsed_args, parsed_globals):
         try:
             display_mode = self._determine_display_mode(parsed_args.mode)
         except ValueError as e:
-            write_exception(e, sys.stderr)
+            uni_print(f"aws: [ERROR]: {str(e)}", sys.stderr)
             return 1
 
         try:
@@ -194,7 +193,7 @@ def _determine_display_mode(self, requested_mode):
         if requested_mode == 'INTERACTIVE':
             if not sys.stdout.isatty():
                 raise ValueError(
-                    "Error: Interactive mode requires a TTY (terminal). "
+                    "Interactive mode requires a TTY (terminal). "
                     "Use --mode TEXT-ONLY for non-interactive environments."
                 )
             return 'INTERACTIVE'

tests/functional/ecs/test_monitorexpressgatewayservice.py

@@ -40,12 +40,11 @@ def command(mock_session, mock_watcher_class):
 def mock_client(mock_session):
     """Fixture that provides a mock ECS client."""
     client = Mock()
-    mock_session.create_client.return_value = client
     return client
 
 
 class TestECSMonitorExpressGatewayService:
-    def test_init(self, command, mock_session, mock_watcher_class):
+    def test_init(self, command):
         assert command.name == 'monitor-express-gateway-service'
         assert command.DESCRIPTION.startswith('Monitors the progress')
 
@@ -70,6 +69,7 @@ def test_add_arguments(self, command):
     def test_run_main_with_text_only_mode(
         self, mock_isatty, command, mock_watcher_class, mock_client
     ):
+        command._session.create_client.return_value = mock_client
         mock_watcher = Mock()
         mock_watcher_class.return_value = mock_watcher
 
@@ -105,6 +105,7 @@ def test_run_main_with_text_only_mode(
     def test_run_main_with_interactive_mode(
         self, mock_isatty, command, mock_watcher_class, mock_client
     ):
+        command._session.create_client.return_value = mock_client
         mock_watcher = Mock()
         mock_watcher_class.return_value = mock_watcher
 
@@ -137,6 +138,7 @@ def test_run_main_with_interactive_mode(
     def test_run_main_auto_mode_with_tty(
         self, mock_isatty, command, mock_watcher_class, mock_client
     ):
+        command._session.create_client.return_value = mock_client
         mock_watcher = Mock()
         mock_watcher_class.return_value = mock_watcher
 
@@ -163,6 +165,7 @@ def test_run_main_auto_mode_with_tty(
     def test_run_main_auto_mode_without_tty(
         self, mock_isatty, command, mock_watcher_class, mock_client
     ):
+        command._session.create_client.return_value = mock_client
         mock_watcher = Mock()
         mock_watcher_class.return_value = mock_watcher
 
@@ -189,6 +192,7 @@ def test_run_main_auto_mode_without_tty(
     def test_run_main_with_color_on(
         self, mock_isatty, command, mock_watcher_class, mock_client
     ):
+        command._session.create_client.return_value = mock_client
         mock_watcher = Mock()
         mock_watcher_class.return_value = mock_watcher
 
@@ -220,6 +224,7 @@ def test_run_main_creates_ecs_client(
         mock_watcher_class,
         mock_client,
     ):
+        command._session.create_client.return_value = mock_client
         mock_watcher = Mock()
         mock_watcher_class.return_value = mock_watcher
 
@@ -254,6 +259,7 @@ def test_run_main_creates_ecs_client(
     def test_run_main_with_default_resource_view(
         self, mock_isatty, command, mock_watcher_class, mock_client
     ):
+        command._session.create_client.return_value = mock_client
         mock_watcher = Mock()
         mock_watcher_class.return_value = mock_watcher
 

tests/unit/customizations/ecs/test_monitorexpressgatewayservice.py

@@ -104,6 +104,7 @@ def test_interactive_mode_requires_tty(self, mock_isatty, capsys):
 
         captured = capsys.readouterr()
         assert "Interactive mode requires a TTY" in captured.err
+        assert "aws: [ERROR]:" in captured.err
         assert result == 1
 
     @patch('sys.stdout.isatty')

tests/unit/customizations/ecs/test_prompt_toolkit_display.py

@@ -13,7 +13,7 @@ class TestPromptToolkitDisplay:
     @pytest.fixture
     def display(self):
         with create_app_session(output=DummyOutput()):
-            return Display()
+            yield Display()
 
     def test_init(self, display):
         """Test Display initialization."""