awslabs.cloudwatch-mcp-server 0.0.6__tar.gz → 0.0.7__tar.gz

{awslabs_cloudwatch_mcp_server-0.0.6 → awslabs_cloudwatch_mcp_server-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.cloudwatch-mcp-server
-Version: 0.0.6
+Version: 0.0.7
 Summary: An AWS Labs Model Context Protocol (MCP) server for cloudwatch
 Project-URL: homepage, https://awslabs.github.io/mcp/
 Project-URL: docs, https://awslabs.github.io/mcp/servers/cloudwatch-mcp-server/

{awslabs_cloudwatch_mcp_server-0.0.6 → awslabs_cloudwatch_mcp_server-0.0.7}/awslabs/cloudwatch_mcp_server/cloudwatch_logs/tools.py

@@ -451,6 +451,7 @@ class CloudWatchLogsTools:
                     query_string='pattern @message | sort @sampleCount desc | limit 5',
                     limit=5,
                     max_timeout=30,
+                    region=region,
                 ),
                 self.execute_log_insights_query(
                     ctx,
@@ -461,6 +462,7 @@ class CloudWatchLogsTools:
                     query_string='fields @timestamp, @message | filter @message like /(?i)(error|exception|fail|timeout|fatal)/ | pattern @message | limit 5',
                     limit=5,
                     max_timeout=30,
+                    region=region,
                 ),
             )
 

{awslabs_cloudwatch_mcp_server-0.0.6 → awslabs_cloudwatch_mcp_server-0.0.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "awslabs.cloudwatch-mcp-server"
-version = "0.0.6"
+version = "0.0.7"
 description = "An AWS Labs Model Context Protocol (MCP) server for cloudwatch"
 readme = "README.md"
 requires-python = ">=3.10"

{awslabs_cloudwatch_mcp_server-0.0.6 → awslabs_cloudwatch_mcp_server-0.0.7}/tests/cloudwatch_logs/test_logs_error_handling.py

@@ -386,3 +386,151 @@ class TestEdgeCases:
             assert params['logGroupNames'] is None
             assert params['logGroupIdentifiers'] == ['arn:test']
             assert params['limit'] is None
+
+
+class TestRegionHandling:
+    """Test region parameter handling across tools."""
+
+    def test_get_logs_client_region_parameter(self):
+        """Test that _get_logs_client creates client with correct region."""
+        with patch(
+            'awslabs.cloudwatch_mcp_server.cloudwatch_logs.tools.boto3.Session'
+        ) as mock_session:
+            mock_client = Mock()
+            mock_session.return_value.client.return_value = mock_client
+
+            tools = CloudWatchLogsTools()
+            result = tools._get_logs_client('ap-northeast-1')
+
+            # Verify session was created with correct region
+            mock_session.assert_called_with(region_name='ap-northeast-1')
+            mock_session.return_value.client.assert_called_with(
+                'logs', config=mock_session.return_value.client.call_args[1]['config']
+            )
+            assert result == mock_client
+
+    def test_get_logs_client_with_aws_profile(self):
+        """Test _get_logs_client with AWS_PROFILE environment variable."""
+        with patch.dict('os.environ', {'AWS_PROFILE': 'test-profile'}):
+            with patch(
+                'awslabs.cloudwatch_mcp_server.cloudwatch_logs.tools.boto3.Session'
+            ) as mock_session:
+                mock_client = Mock()
+                mock_session.return_value.client.return_value = mock_client
+
+                tools = CloudWatchLogsTools()
+                result = tools._get_logs_client('ca-central-1')
+
+                # Verify session was created with profile and region
+                mock_session.assert_called_with(
+                    profile_name='test-profile', region_name='ca-central-1'
+                )
+                assert result == mock_client
+
+    @pytest.mark.asyncio
+    async def test_execute_log_insights_query_region_parameter(self, mock_context):
+        """Test that execute_log_insights_query uses correct region for client creation."""
+        with patch(
+            'awslabs.cloudwatch_mcp_server.cloudwatch_logs.tools.boto3.Session'
+        ) as mock_session:
+            mock_client = Mock()
+            mock_client.start_query.return_value = {'queryId': 'test-query-id'}
+            mock_client.get_query_results.return_value = {
+                'status': 'Complete',
+                'results': [],
+                'statistics': {},
+            }
+            mock_session.return_value.client.return_value = mock_client
+
+            tools = CloudWatchLogsTools()
+
+            # Mock _get_logs_client to capture the region parameter
+            with patch.object(
+                tools, '_get_logs_client', return_value=mock_client
+            ) as mock_get_client:
+                await tools.execute_log_insights_query(
+                    mock_context,
+                    log_group_names=['test-group'],
+                    log_group_identifiers=None,
+                    start_time='2023-01-01T00:00:00+00:00',
+                    end_time='2023-01-01T01:00:00+00:00',
+                    query_string='fields @message',
+                    region='ap-southeast-2',
+                )
+
+                # Verify _get_logs_client was called with correct region
+                mock_get_client.assert_called_once_with('ap-southeast-2')
+
+    @pytest.mark.asyncio
+    async def test_get_logs_insight_query_results_region_parameter(self, mock_context):
+        """Test that get_logs_insight_query_results uses correct region for client creation."""
+        with patch(
+            'awslabs.cloudwatch_mcp_server.cloudwatch_logs.tools.boto3.Session'
+        ) as mock_session:
+            mock_client = Mock()
+            mock_client.get_query_results.return_value = {
+                'status': 'Complete',
+                'results': [],
+                'statistics': {},
+            }
+            mock_session.return_value.client.return_value = mock_client
+
+            tools = CloudWatchLogsTools()
+
+            # Mock _get_logs_client to capture the region parameter
+            with patch.object(
+                tools, '_get_logs_client', return_value=mock_client
+            ) as mock_get_client:
+                await tools.get_logs_insight_query_results(
+                    mock_context, query_id='test-query-id', region='eu-central-1'
+                )
+
+                # Verify _get_logs_client was called with correct region
+                mock_get_client.assert_called_once_with('eu-central-1')
+
+    @pytest.mark.asyncio
+    async def test_cancel_logs_insight_query_region_parameter(self, mock_context):
+        """Test that cancel_logs_insight_query uses correct region for client creation."""
+        with patch(
+            'awslabs.cloudwatch_mcp_server.cloudwatch_logs.tools.boto3.Session'
+        ) as mock_session:
+            mock_client = Mock()
+            mock_client.stop_query.return_value = {'success': True}
+            mock_session.return_value.client.return_value = mock_client
+
+            tools = CloudWatchLogsTools()
+
+            # Mock _get_logs_client to capture the region parameter
+            with patch.object(
+                tools, '_get_logs_client', return_value=mock_client
+            ) as mock_get_client:
+                await tools.cancel_logs_insight_query(
+                    mock_context, query_id='test-query-id', region='sa-east-1'
+                )
+
+                # Verify _get_logs_client was called with correct region
+                mock_get_client.assert_called_once_with('sa-east-1')
+
+    @pytest.mark.asyncio
+    async def test_describe_log_groups_region_parameter(self, mock_context):
+        """Test that describe_log_groups uses correct region for client creation."""
+        with patch(
+            'awslabs.cloudwatch_mcp_server.cloudwatch_logs.tools.boto3.Session'
+        ) as mock_session:
+            mock_client = Mock()
+            mock_paginator = Mock()
+            mock_paginator.paginate.return_value = [{'logGroups': []}]
+            mock_client.get_paginator.return_value = mock_paginator
+            mock_client.describe_query_definitions.return_value = {'queryDefinitions': []}
+            mock_session.return_value.client.return_value = mock_client
+
+            tools = CloudWatchLogsTools()
+
+            # Mock _get_logs_client to capture the region parameter
+            with patch.object(
+                tools, '_get_logs_client', return_value=mock_client
+            ) as mock_get_client:
+                await tools.describe_log_groups(mock_context, region='us-west-1')
+
+                # Verify _get_logs_client was called with correct region
+                mock_get_client.assert_called_once_with('us-west-1')

{awslabs_cloudwatch_mcp_server-0.0.6 → awslabs_cloudwatch_mcp_server-0.0.7}/tests/cloudwatch_logs/test_logs_server.py

@@ -392,3 +392,63 @@ class TestAnalyzeLogGroup:
         assert result.log_anomaly_results.anomaly_detectors[0].detectorName == 'test-detector'
         assert 'results' in result.top_patterns
         assert 'results' in result.top_patterns_containing_errors
+
+    async def test_analyze_log_group_region_parameter(self, ctx, cloudwatch_tools):
+        """Test that analyze_log_group passes region parameter to execute_log_insights_query calls."""
+        log_group_arn = 'arn:aws:logs:eu-west-1:123456789012:log-group:/aws/test/group1'
+
+        # Mock anomaly detection
+        cloudwatch_tools.logs_client.get_paginator = MagicMock()
+
+        # Mock list_log_anomaly_detectors paginator
+        anomaly_paginator = MagicMock()
+        anomaly_paginator.paginate.return_value = [{'anomalyDetectors': []}]
+
+        # Mock list_anomalies paginator
+        anomalies_paginator = MagicMock()
+        anomalies_paginator.paginate.return_value = [{'anomalies': []}]
+
+        def get_paginator_side_effect(operation_name):
+            if operation_name == 'list_log_anomaly_detectors':
+                return anomaly_paginator
+            elif operation_name == 'list_anomalies':
+                return anomalies_paginator
+            else:
+                return MagicMock()
+
+        cloudwatch_tools.logs_client.get_paginator.side_effect = get_paginator_side_effect
+
+        # Mock execute_log_insights_query to capture the region parameter
+        executed_queries = []
+
+        async def mock_execute_query(*args, **kwargs):
+            executed_queries.append(kwargs)
+            return {
+                'queryId': 'test-query-id',
+                'status': 'Complete',
+                'results': [{'@message': 'Test pattern', '@sampleCount': '10'}],
+            }
+
+        # Patch the execute_log_insights_query method
+        with patch.object(
+            cloudwatch_tools, 'execute_log_insights_query', side_effect=mock_execute_query
+        ):
+            # Call analyze_log_group with specific region
+            await cloudwatch_tools.analyze_log_group(
+                ctx,
+                log_group_arn=log_group_arn,
+                start_time='2023-01-01T00:00:00+00:00',
+                end_time='2023-01-01T01:00:00+00:00',
+                region='eu-west-1',
+            )
+
+        # Verify that both execute_log_insights_query calls received the correct region
+        assert len(executed_queries) == 2
+        assert executed_queries[0]['region'] == 'eu-west-1'
+        assert executed_queries[1]['region'] == 'eu-west-1'
+
+        # Verify other parameters are passed correctly
+        for query in executed_queries:
+            assert query['log_group_identifiers'] == [log_group_arn]
+            assert query['start_time'] == '2023-01-01T00:00:00+00:00'
+            assert query['end_time'] == '2023-01-01T01:00:00+00:00'