Merge branch 'main' into fix/redshift-mcp-directory-requirements

MD-Mushfiqur123 · web-flow · commit 1daf7413238a · 2026-05-15T05:31:56.000+06:00
diff --git a/src/aws-transform-mcp-server/README.md b/src/aws-transform-mcp-server/README.md
@@ -1,5 +1,7 @@
 # AWS Transform MCP Server
 
+[![PyPI Downloads](https://static.pepy.tech/personalized-badge/awslabs-aws-transform-mcp-server?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/awslabs-aws-transform-mcp-server) [![PyPI Downloads/month](https://static.pepy.tech/personalized-badge/awslabs-aws-transform-mcp-server?period=month&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads/month)](https://pepy.tech/projects/awslabs-aws-transform-mcp-server)
+
 An MCP server for [AWS Transform](https://aws.amazon.com/transform/) that enables AI assistants to manage transformation workspaces, jobs, connectors, human-in-the-loop (HITL) tasks, artifacts, and chat directly from the IDE.
 
 AWS Transform accelerates migration and modernization of enterprise workloads using specialized AI agents across discovery, planning, and execution. This MCP server exposes the Transform lifecycle through 19 tools, supporting mainframe modernization, VMware migration, .NET modernization, and custom code transformations.
diff --git a/src/aws-transform-mcp-server/awslabs/aws_transform_mcp_server/__init__.py b/src/aws-transform-mcp-server/awslabs/aws_transform_mcp_server/__init__.py
@@ -14,4 +14,4 @@
 
 """awslabs.aws-transform-mcp-server."""
 
-__version__ = '0.1.2'
+__version__ = '0.1.3'
diff --git a/src/aws-transform-mcp-server/pyproject.toml b/src/aws-transform-mcp-server/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "awslabs.aws-transform-mcp-server"
-version = "0.1.2"
+version = "0.1.3"
 description = "An AWS Labs Model Context Protocol (MCP) server for AWS Transform — manage transformation workspaces, jobs, connectors, HITL tasks, artifacts, and chat"
 readme = "README.md"
 requires-python = ">=3.10"
diff --git a/src/aws-transform-mcp-server/uv.lock b/src/aws-transform-mcp-server/uv.lock
diff --git a/src/cloudwatch-mcp-server/awslabs/cloudwatch_mcp_server/__init__.py b/src/cloudwatch-mcp-server/awslabs/cloudwatch_mcp_server/__init__.py
@@ -14,5 +14,5 @@
 
 """awslabs.cloudwatch-mcp-server"""
 
-__version__ = '0.1.1'
+__version__ = '0.1.2'
 MCP_SERVER_VERSION = __version__
diff --git a/src/cloudwatch-mcp-server/pyproject.toml b/src/cloudwatch-mcp-server/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "awslabs.cloudwatch-mcp-server"
-version = "0.1.1"
+version = "0.1.2"
 description = "An AWS Labs Model Context Protocol (MCP) server for cloudwatch"
 readme = "README.md"
 requires-python = ">=3.10"
diff --git a/src/cloudwatch-mcp-server/uv.lock b/src/cloudwatch-mcp-server/uv.lock
diff --git a/src/eks-mcp-server/awslabs/eks_mcp_server/__init__.py b/src/eks-mcp-server/awslabs/eks_mcp_server/__init__.py
@@ -14,4 +14,4 @@
 
 """awslabs.eks-mcp-server"""
 
-__version__ = '0.1.30'
+__version__ = '0.1.31'
diff --git a/src/eks-mcp-server/awslabs/eks_mcp_server/k8s_handler.py b/src/eks-mcp-server/awslabs/eks_mcp_server/k8s_handler.py
@@ -139,6 +139,15 @@ async def apply_yaml(
             ApplyYamlResponse with operation result
         """
         try:
+            # Check if write access is disabled
+            if not self.allow_write:
+                error_msg = 'Operation apply_yaml is not allowed without write access'
+                log_with_request_id(ctx, LogLevel.ERROR, error_msg)
+                return CallToolResult(
+                    isError=True,
+                    content=[TextContent(type='text', text=error_msg)],
+                )
+
             # Validate that the path is absolute
             if not os.path.isabs(yaml_path):
                 error_msg = f'Path must be absolute: {yaml_path}'
diff --git a/src/eks-mcp-server/pyproject.toml b/src/eks-mcp-server/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "awslabs.eks-mcp-server"
-version = "0.1.30"
+version = "0.1.31"
 description = "An AWS Labs Model Context Protocol (MCP) server for EKS"
 readme = "README.md"
 requires-python = ">=3.10"
diff --git a/src/eks-mcp-server/tests/test_k8s_handler.py b/src/eks-mcp-server/tests/test_k8s_handler.py
@@ -202,14 +202,42 @@ def test_load_yaml_template_removes_checkov_annotations(self, mock_mcp, mock_cli
             # Verify other annotations were preserved
             assert 'other-annotation: This should be preserved' in result
 
+    @pytest.mark.asyncio
+    async def test_apply_yaml_write_access_disabled(
+        self, mock_context, mock_mcp, mock_client_cache
+    ):
+        """Test apply_yaml method rejects requests when write access is disabled."""
+        # Initialize the K8s handler with write access disabled
+        with patch(
+            'awslabs.eks_mcp_server.k8s_handler.K8sClientCache', return_value=mock_client_cache
+        ):
+            handler = K8sHandler(mock_mcp, allow_write=False)
+
+        # Attempt to apply YAML without write access
+        result = await handler.apply_yaml(
+            mock_context,
+            yaml_path='/absolute/path/to/manifest.yaml',
+            cluster_name='test-cluster',
+            namespace='default',
+            force=True,
+        )
+
+        # Verify the result is an error
+        assert result.isError
+        assert isinstance(result.content[0], TextContent)
+        assert 'Operation apply_yaml is not allowed without write access' in result.content[0].text
+
+        # Verify that no Kubernetes client was created (apply was blocked before reaching k8s)
+        mock_client_cache.get_client.assert_not_called()
+
     @pytest.mark.asyncio
     async def test_apply_yaml_relative_path(self, mock_context, mock_mcp, mock_client_cache):
         """Test apply_yaml method with a relative path."""
-        # Initialize the K8s handler
+        # Initialize the K8s handler with write access enabled
         with patch(
             'awslabs.eks_mcp_server.k8s_handler.K8sClientCache', return_value=mock_client_cache
         ):
-            handler = K8sHandler(mock_mcp)
+            handler = K8sHandler(mock_mcp, allow_write=True)
 
         # Mock os.path.isabs to return False for relative paths
         with patch('os.path.isabs', return_value=False):
@@ -231,11 +259,11 @@ async def test_apply_yaml_relative_path(self, mock_context, mock_mcp, mock_clien
     @pytest.mark.asyncio
     async def test_apply_yaml_success(self, mock_context, mock_mcp, mock_client_cache):
         """Test apply_yaml method with successful application."""
-        # Initialize the K8s handler
+        # Initialize the K8s handler with write access enabled
         with patch(
             'awslabs.eks_mcp_server.k8s_handler.K8sClientCache', return_value=mock_client_cache
         ):
-            handler = K8sHandler(mock_mcp)
+            handler = K8sHandler(mock_mcp, allow_write=True)
 
         # Mock get_client
         mock_k8s_apis = MagicMock()
@@ -286,11 +314,11 @@ async def test_apply_yaml_success(self, mock_context, mock_mcp, mock_client_cach
     @pytest.mark.asyncio
     async def test_apply_yaml_file_not_found(self, mock_context, mock_mcp, mock_client_cache):
         """Test apply_yaml method with file not found error."""
-        # Initialize the K8s handler
+        # Initialize the K8s handler with write access enabled
         with patch(
             'awslabs.eks_mcp_server.k8s_handler.K8sClientCache', return_value=mock_client_cache
         ):
-            handler = K8sHandler(mock_mcp)
+            handler = K8sHandler(mock_mcp, allow_write=True)
 
         # Mock get_client
         mock_k8s_apis = MagicMock()
@@ -319,11 +347,11 @@ async def test_apply_yaml_file_not_found(self, mock_context, mock_mcp, mock_clie
     @pytest.mark.asyncio
     async def test_apply_yaml_io_error(self, mock_context, mock_mcp, mock_client_cache):
         """Test apply_yaml method with IO error."""
-        # Initialize the K8s handler
+        # Initialize the K8s handler with write access enabled
         with patch(
             'awslabs.eks_mcp_server.k8s_handler.K8sClientCache', return_value=mock_client_cache
         ):
-            handler = K8sHandler(mock_mcp)
+            handler = K8sHandler(mock_mcp, allow_write=True)
 
         # Mock get_client
         mock_k8s_apis = MagicMock()
@@ -353,11 +381,11 @@ async def test_apply_yaml_io_error(self, mock_context, mock_mcp, mock_client_cac
     @pytest.mark.asyncio
     async def test_apply_yaml_create_error(self, mock_context, mock_mcp, mock_client_cache):
         """Test apply_yaml method with error from create_from_yaml."""
-        # Initialize the K8s handler
+        # Initialize the K8s handler with write access enabled
         with patch(
             'awslabs.eks_mcp_server.k8s_handler.K8sClientCache', return_value=mock_client_cache
         ):
-            handler = K8sHandler(mock_mcp)
+            handler = K8sHandler(mock_mcp, allow_write=True)
 
         # Mock get_client
         mock_k8s_apis = MagicMock()
@@ -394,11 +422,11 @@ async def test_apply_yaml_create_error(self, mock_context, mock_mcp, mock_client
     @pytest.mark.asyncio
     async def test_apply_yaml_outer_exception(self, mock_context, mock_mcp, mock_client_cache):
         """Test apply_yaml method with outer exception (Error applying YAML from file)."""
-        # Initialize the K8s handler
+        # Initialize the K8s handler with write access enabled
         with patch(
             'awslabs.eks_mcp_server.k8s_handler.K8sClientCache', return_value=mock_client_cache
         ):
-            handler = K8sHandler(mock_mcp)
+            handler = K8sHandler(mock_mcp, allow_write=True)
 
         # Mock get_client to raise an exception
         with patch.object(handler, 'get_client', side_effect=Exception('Connection error')):
diff --git a/src/eks-mcp-server/uv.lock b/src/eks-mcp-server/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`
`15`	`15`	`"""awslabs.aws-transform-mcp-server."""`
`16`	`16`
`17`		`-__version__ = '0.1.2'`
	`17`	`+__version__ = '0.1.3'`