awslabs.cfn-mcp-server 1.0.3__tar.gz → 1.0.5__tar.gz

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/Dockerfile

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 #FROM public.ecr.aws/sam/build-python3.10:1.137.1-20250411084548
 FROM public.ecr.aws/sam/build-python3.10@sha256:e78695db10ca8cb129e59e30f7dc9789b0dbd0181dba195d68419c72bac51ac1 AS uv

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.cfn-mcp-server
-Version: 1.0.3
+Version: 1.0.5
 Summary: An AWS Labs Model Context Protocol (MCP) server for doing common cloudformation tasks and for managing your resources in your AWS account
 Project-URL: homepage, https://awslabs.github.io/mcp/
 Project-URL: docs, https://awslabs.github.io/mcp/servers/cfn-mcp-server/

awslabs_cfn_mcp_server-1.0.5/awslabs/__init__.py

@@ -0,0 +1,16 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file is part of the awslabs namespace.
+# It is intentionally minimal to support PEP 420 namespace packages.

awslabs_cfn_mcp_server-1.0.5/awslabs/cfn_mcp_server/__init__.py

@@ -0,0 +1,17 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""awslabs.cfn-mcp-server"""
+
+__version__ = '1.0.3'

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/awslabs/cfn_mcp_server/aws_client.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 import botocore.config
 import sys

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/awslabs/cfn_mcp_server/cloud_control_utils.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from awslabs.cfn_mcp_server.errors import ClientError
 
@@ -33,19 +36,18 @@ def validate_patch(patch_document: list):
             raise ClientError(f"The '{patch_op['op']}' operation requires a 'from' field")
 
 
-def progress_event(response_event) -> dict[str, str]:
+def progress_event(response_event, hooks_events) -> dict[str, str]:
     """Map a CloudControl API response to a standard output format for the MCP."""
     response = {
         'status': response_event['OperationStatus'],
         'resource_type': response_event['TypeName'],
-        'is_complete': response_event['OperationStatus'] == 'SUCCESS',
+        'is_complete': response_event['OperationStatus'] == 'SUCCESS'
+        or response_event['OperationStatus'] == 'FAILED',
         'request_token': response_event['RequestToken'],
     }
 
     if response_event.get('Identifier', None):
         response['identifier'] = response_event['Identifier']
-    if response_event.get('StatusMessage', None):
-        response['status_message'] = response_event['StatusMessage']
     if response_event.get('ResourceModel', None):
         response['resource_info'] = response_event['ResourceModel']
     if response_event.get('ErrorCode', None):
@@ -55,4 +57,21 @@ def progress_event(response_event) -> dict[str, str]:
     if response_event.get('RetryAfter', None):
         response['retry_after'] = response_event['RetryAfter']
 
+    # CloudControl returns a list of hooks events which may also contain a message which should
+    # take precedent over the status message returned from CloudControl directly
+    hooks_status_message = None
+    if hooks_events:
+        failed_hook_event_messages = (
+            hook_event['HookStatusMessage']
+            for hook_event in hooks_events
+            if hook_event.get('HookStatus', None) == 'HOOK_COMPLETE_FAILED'
+            or hook_event.get('HookStatus', None) == 'HOOK_FAILED'
+        )
+        hooks_status_message = next(failed_hook_event_messages, None)
+
+    if hooks_status_message:
+        response['status_message'] = hooks_status_message
+    elif response_event.get('StatusMessage', None):
+        response['status_message'] = response_event['StatusMessage']
+
     return response

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/awslabs/cfn_mcp_server/context.py

@@ -1,3 +1,17 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 from awslabs.cfn_mcp_server.errors import ServerError
 
 

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/awslabs/cfn_mcp_server/errors.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 
 def handle_aws_api_error(e: Exception) -> Exception:

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/awslabs/cfn_mcp_server/iac_generator.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 """CloudFormation IaC Generator tool implementation."""
 

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/awslabs/cfn_mcp_server/schema_manager.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 import json
 import os

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/awslabs/cfn_mcp_server/server.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 """awslabs CFN MCP Server implementation."""
 
@@ -202,7 +205,7 @@ async def update_resource(
     except Exception as e:
         raise handle_aws_api_error(e)
 
-    return progress_event(response['ProgressEvent'])
+    return progress_event(response['ProgressEvent'], None)
 
 
 @mcp.tool()
@@ -253,7 +256,7 @@ async def create_resource(
     except Exception as e:
         raise handle_aws_api_error(e)
 
-    return progress_event(response['ProgressEvent'])
+    return progress_event(response['ProgressEvent'], None)
 
 
 @mcp.tool()
@@ -305,7 +308,7 @@ async def delete_resource(
     except Exception as e:
         raise handle_aws_api_error(e)
 
-    return progress_event(response['ProgressEvent'])
+    return progress_event(response['ProgressEvent'], None)
 
 
 @mcp.tool()
@@ -347,7 +350,7 @@ async def get_resource_request_status(
     except Exception as e:
         raise handle_aws_api_error(e)
 
-    return progress_event(response['ProgressEvent'])
+    return progress_event(response['ProgressEvent'], response.get('HooksProgressEvent', None))
 
 
 @mcp.tool()

awslabs_cfn_mcp_server-1.0.5/docker-healthcheck.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [ "$(lsof +c 0 -p 1 | grep -e "^awslabs\..*\s1\s.*\sunix\s.*socket$" | wc -l)" -ne "0" ]; then
+  echo -n "$(lsof +c 0 -p 1 | grep -e "^awslabs\..*\s1\s.*\sunix\s.*socket$" | wc -l) awslabs.* streams found";
+  exit 0;
+else
+  echo -n "Zero awslabs.* streams found";
+  exit 1;
+fi;
+
+echo -n "Never should reach here";
+exit 99;

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "awslabs.cfn-mcp-server"
-version = "1.0.3"
+version = "1.0.5"
 description = "An AWS Labs Model Context Protocol (MCP) server for doing common cloudformation tasks and for managing your resources in your AWS account"
 readme = "README.md"
 requires-python = ">=3.10"

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/run_tests.sh

@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Exit on error
 set -e
 

awslabs_cfn_mcp_server-1.0.5/tests/__init__.py

@@ -0,0 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Tests for the CloudFormation MCP Server."""

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/tests/test_aws_client.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 """Tests for the cfn MCP Server."""
 
 import pytest

awslabs_cfn_mcp_server-1.0.5/tests/test_cloud_control_utils.py

@@ -0,0 +1,201 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Tests for the cfn MCP Server."""
+
+import pytest
+from awslabs.cfn_mcp_server.cloud_control_utils import progress_event, validate_patch
+from awslabs.cfn_mcp_server.errors import ClientError
+
+
+@pytest.mark.asyncio
+class TestUtils:
+    """Tests on the cloud_control_utils module."""
+
+    async def test_empty_patch(self):
+        """Testing no information in patch."""
+        validate_patch([])
+
+    async def test_patch_with_invalid_shape_1(self):
+        """Testing bad shape."""
+        with pytest.raises(ClientError):
+            validate_patch(['not_a_dict'])
+
+    async def test_patch_with_invalid_shape_2(self):
+        """Testing no operation."""
+        with pytest.raises(ClientError):
+            validate_patch([{'not-op': 'is bad'}])
+
+    async def test_patch_with_invalid_shape_3(self):
+        """Testing invalid operation."""
+        with pytest.raises(ClientError):
+            validate_patch([{'op': 'invalid'}])
+
+    async def test_patch_with_invalid_shape_4(self):
+        """Testing no path."""
+        with pytest.raises(ClientError):
+            validate_patch([{'op': 'add', 'not-path': 'is bad'}])
+
+    async def test_happy_remove(self):
+        """Testing simple remove."""
+        validate_patch([{'op': 'remove', 'path': '/property'}])
+
+    async def test_patch_with_invalid_shape_5(self):
+        """Testing no value."""
+        with pytest.raises(ClientError):
+            validate_patch([{'op': 'add', 'path': '/property', 'not-value': 'is bad'}])
+
+    async def test_happy_add(self):
+        """Testing simple add."""
+        validate_patch([{'op': 'add', 'path': '/property', 'value': '25'}])
+
+    async def test_patch_with_invalid_shape_6(self):
+        """Testing no from."""
+        with pytest.raises(ClientError):
+            validate_patch([{'op': 'move', 'path': '/property', 'not-from': 'is bad'}])
+
+    async def test_progress_event(self):
+        """Testing mapping progress event."""
+        request = {
+            'OperationStatus': 'SUCCESS',
+            'TypeName': 'AWS::CodeStarConnections::Connection',
+            'RequestToken': '25',
+        }
+
+        response = {
+            'status': 'SUCCESS',
+            'resource_type': 'AWS::CodeStarConnections::Connection',
+            'is_complete': True,
+            'request_token': '25',
+        }
+
+        assert progress_event(request, None) == response
+
+    async def test_progress_event_full(self):
+        """Testing mapping progress event with all props."""
+        request = {
+            'OperationStatus': 'SUCCESS',
+            'TypeName': 'AWS::CodeStarConnections::Connection',
+            'RequestToken': '25',
+            'Identifier': 'id',
+            'StatusMessage': 'good job',
+            'ResourceModel': 'model',
+            'ErrorCode': 'NONE',
+            'EventTime': '25',
+            'RetryAfter': '10',
+        }
+
+        response = {
+            'status': 'SUCCESS',
+            'resource_type': 'AWS::CodeStarConnections::Connection',
+            'is_complete': True,
+            'request_token': '25',
+            'identifier': 'id',
+            'status_message': 'good job',
+            'resource_info': 'model',
+            'error_code': 'NONE',
+            'event_time': '25',
+            'retry_after': '10',
+        }
+
+        assert progress_event(request, None) == response
+
+    async def test_progress_event_failed(self):
+        """Testing mapping progress event with all props."""
+        request = {
+            'OperationStatus': 'FAILED',
+            'TypeName': 'AWS::CodeStarConnections::Connection',
+            'RequestToken': '25',
+            'Identifier': 'id',
+            'StatusMessage': 'good job',
+            'ResourceModel': 'model',
+            'ErrorCode': 'NONE',
+            'EventTime': '25',
+            'RetryAfter': '10',
+        }
+
+        response = {
+            'status': 'FAILED',
+            'resource_type': 'AWS::CodeStarConnections::Connection',
+            'is_complete': True,
+            'request_token': '25',
+            'identifier': 'id',
+            'status_message': 'good job',
+            'resource_info': 'model',
+            'error_code': 'NONE',
+            'event_time': '25',
+            'retry_after': '10',
+        }
+
+        assert progress_event(request, None) == response
+
+    async def test_progress_event_empty_list_chooses_status_message(self):
+        """Testing mapping progress event."""
+        request = {
+            'OperationStatus': 'SUCCESS',
+            'TypeName': 'AWS::CodeStarConnections::Connection',
+            'RequestToken': '25',
+            'StatusMessage': 'good job',
+        }
+
+        response = {
+            'status': 'SUCCESS',
+            'resource_type': 'AWS::CodeStarConnections::Connection',
+            'is_complete': True,
+            'request_token': '25',
+            'status_message': 'good job',
+        }
+
+        assert progress_event(request, []) == response
+
+    async def test_progress_event_successful_hook_chooses_status_message(self):
+        """Testing mapping progress event."""
+        request = {
+            'OperationStatus': 'SUCCESS',
+            'TypeName': 'AWS::CodeStarConnections::Connection',
+            'RequestToken': '25',
+            'StatusMessage': 'good job',
+        }
+
+        hook = {'HookStatus': 'HOOK_COMPLETE_SUCCEEDED', 'HookStatusMessage': 'DONT SEE THIS'}
+
+        response = {
+            'status': 'SUCCESS',
+            'resource_type': 'AWS::CodeStarConnections::Connection',
+            'is_complete': True,
+            'request_token': '25',
+            'status_message': 'good job',
+        }
+
+        assert progress_event(request, [hook]) == response
+
+    async def test_progress_event_failed_hook_chooses_hook_message(self):
+        """Testing mapping progress event."""
+        request = {
+            'OperationStatus': 'SUCCESS',
+            'TypeName': 'AWS::CodeStarConnections::Connection',
+            'RequestToken': '25',
+            'StatusMessage': 'good job',
+        }
+
+        hook = {'HookStatus': 'HOOK_FAILED', 'HookStatusMessage': 'HOOK FAILED!!'}
+
+        response = {
+            'status': 'SUCCESS',
+            'resource_type': 'AWS::CodeStarConnections::Connection',
+            'is_complete': True,
+            'request_token': '25',
+            'status_message': 'HOOK FAILED!!',
+        }
+
+        assert progress_event(request, [hook]) == response

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/tests/test_errors.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 """Tests for the cfn MCP Server."""
 
 import pytest

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/tests/test_iac_generator.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 """Tests for the CloudFormation IaC Generator tool."""
 

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/tests/test_init.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 """Tests for the awslabs.cfn-mcp-server package."""
 
 import importlib

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/tests/test_main.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 """Tests for the main function in server.py."""
 
 from awslabs.cfn_mcp_server.server import main

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/tests/test_schema_manager.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 """Tests for the cfn MCP Server."""
 
 import pytest

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/tests/test_server.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 """Tests for the cfn MCP Server."""
 
 import pytest

{awslabs_cfn_mcp_server-1.0.3 → awslabs_cfn_mcp_server-1.0.5}/uv.lock

@@ -37,7 +37,7 @@ wheels = [
 
 [[package]]
 name = "awslabs-cfn-mcp-server"
-version = "1.0.0"
+version = "1.0.1"
 source = { editable = "." }
 dependencies = [
     { name = "boto3" },

awslabs_cfn_mcp_server-1.0.3/awslabs/__init__.py

@@ -1,13 +0,0 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-
-# This file is part of the awslabs namespace.
-# It is intentionally minimal to support PEP 420 namespace packages.

awslabs_cfn_mcp_server-1.0.3/awslabs/cfn_mcp_server/__init__.py

@@ -1,14 +0,0 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-
-"""awslabs.cfn-mcp-server"""
-
-__version__ = '1.0.3'

awslabs_cfn_mcp_server-1.0.3/docker-healthcheck.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "$(lsof +c 0 -p 1 | grep -e "^awslabs\..*\s1\s.*\sunix\s.*socket$" | wc -l)" -ne "0" ]; then
-  echo -n "$(lsof +c 0 -p 1 | grep -e "^awslabs\..*\s1\s.*\sunix\s.*socket$" | wc -l) awslabs.* streams found";
-  exit 0;
-else
-  echo -n "Zero awslabs.* streams found";
-  exit 1;
-fi;
-
-echo -n "Never should reach here";
-exit 99;

awslabs_cfn_mcp_server-1.0.3/tests/__init__.py

@@ -1,11 +0,0 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-"""Tests for the CloudFormation MCP Server."""

awslabs_cfn_mcp_server-1.0.3/tests/test_cloud_control_utils.py

@@ -1,108 +0,0 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
-# with the License. A copy of the License is located at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
-# and limitations under the License.
-"""Tests for the cfn MCP Server."""
-
-import pytest
-from awslabs.cfn_mcp_server.cloud_control_utils import progress_event, validate_patch
-from awslabs.cfn_mcp_server.errors import ClientError
-
-
-@pytest.mark.asyncio
-class TestUtils:
-    """Tests on the cloud_control_utils module."""
-
-    async def test_empty_patch(self):
-        """Testing no information in patch."""
-        validate_patch([])
-
-    async def test_patch_with_invalid_shape_1(self):
-        """Testing bad shape."""
-        with pytest.raises(ClientError):
-            validate_patch(['not_a_dict'])
-
-    async def test_patch_with_invalid_shape_2(self):
-        """Testing no operation."""
-        with pytest.raises(ClientError):
-            validate_patch([{'not-op': 'is bad'}])
-
-    async def test_patch_with_invalid_shape_3(self):
-        """Testing invalid operation."""
-        with pytest.raises(ClientError):
-            validate_patch([{'op': 'invalid'}])
-
-    async def test_patch_with_invalid_shape_4(self):
-        """Testing no path."""
-        with pytest.raises(ClientError):
-            validate_patch([{'op': 'add', 'not-path': 'is bad'}])
-
-    async def test_happy_remove(self):
-        """Testing simple remove."""
-        validate_patch([{'op': 'remove', 'path': '/property'}])
-
-    async def test_patch_with_invalid_shape_5(self):
-        """Testing no value."""
-        with pytest.raises(ClientError):
-            validate_patch([{'op': 'add', 'path': '/property', 'not-value': 'is bad'}])
-
-    async def test_happy_add(self):
-        """Testing simple add."""
-        validate_patch([{'op': 'add', 'path': '/property', 'value': '25'}])
-
-    async def test_patch_with_invalid_shape_6(self):
-        """Testing no from."""
-        with pytest.raises(ClientError):
-            validate_patch([{'op': 'move', 'path': '/property', 'not-from': 'is bad'}])
-
-    async def test_progress_event(self):
-        """Testing mapping progress event."""
-        request = {
-            'OperationStatus': 'SUCCESS',
-            'TypeName': 'AWS::CodeStarConnections::Connection',
-            'RequestToken': '25',
-        }
-
-        response = {
-            'status': 'SUCCESS',
-            'resource_type': 'AWS::CodeStarConnections::Connection',
-            'is_complete': True,
-            'request_token': '25',
-        }
-
-        assert progress_event(request) == response
-
-    async def test_progress_event_full(self):
-        """Testing mapping progress event with all props."""
-        request = {
-            'OperationStatus': 'SUCCESS',
-            'TypeName': 'AWS::CodeStarConnections::Connection',
-            'RequestToken': '25',
-            'Identifier': 'id',
-            'StatusMessage': 'good job',
-            'ResourceModel': 'model',
-            'ErrorCode': 'NONE',
-            'EventTime': '25',
-            'RetryAfter': '10',
-        }
-
-        response = {
-            'status': 'SUCCESS',
-            'resource_type': 'AWS::CodeStarConnections::Connection',
-            'is_complete': True,
-            'request_token': '25',
-            'identifier': 'id',
-            'status_message': 'good job',
-            'resource_info': 'model',
-            'error_code': 'NONE',
-            'event_time': '25',
-            'retry_after': '10',
-        }
-
-        assert progress_event(request) == response