awslabs.cfn-mcp-server 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

awslabs/cfn_mcp_server/cloud_control_utils.py

@@ -33,19 +33,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 +54,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/server.py

@@ -202,7 +202,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 +253,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 +305,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 +347,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.3.dist-info → awslabs_cfn_mcp_server-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.cfn-mcp-server
-Version: 1.0.3
+Version: 1.0.4
 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.3.dist-info → awslabs_cfn_mcp_server-1.0.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
 awslabs/__init__.py,sha256=47wJeKcStxEJwX7SVVV2pnAWYR8FxcaYoT3YTmZ5Plg,674
 awslabs/cfn_mcp_server/__init__.py,sha256=83bE3XbvOF6sigHPxEk0J9k7lNU9bzTwoCLde-IKQNA,611
 awslabs/cfn_mcp_server/aws_client.py,sha256=w0cwuQq7b34IUaABEwZYpEols1QoMjO2gd3T98K5FcE,2783
-awslabs/cfn_mcp_server/cloud_control_utils.py,sha256=wUDT-J9iEAOYnqZAG2vDtBsXUp0EUZ__jQzJ4RJ6AvM,2973
+awslabs/cfn_mcp_server/cloud_control_utils.py,sha256=LI7gEcQlQuHxEjfIKYaKwgN0Yha336n7GazVBCyx_rI,3714
 awslabs/cfn_mcp_server/context.py,sha256=YpJZPjyzHW7df9O-lyj2j8yuenZI-yPxLuVuyvmnAnE,777
 awslabs/cfn_mcp_server/errors.py,sha256=0ADg9EesPyvjNZD-J89QLQ5OFcD6aSKDaMfW_4RQjfo,4481
 awslabs/cfn_mcp_server/iac_generator.py,sha256=iTZ6tM92m430GHM60lH1qR5nlRdhSbx2m0_WTbkU1f8,7881
 awslabs/cfn_mcp_server/schema_manager.py,sha256=7dw2W2hgdn1ODRU5PrUmOG9_rvnKUhGD51q8Wz4Ksks,6775
-awslabs/cfn_mcp_server/server.py,sha256=Fw7vMYfzxGCTaJD_MHj1EmGVlTO_CmtOKjzicGj8uYw,16737
-awslabs_cfn_mcp_server-1.0.3.dist-info/METADATA,sha256=rnKRPLiaG5-n1zVWpwJ5WtbUL_41ChoqlCqsdjjnd64,9121
-awslabs_cfn_mcp_server-1.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-awslabs_cfn_mcp_server-1.0.3.dist-info/entry_points.txt,sha256=Hartc24s_fYgi3o2m2tBHahod0pqXYwpebQy2_tXL7s,78
-awslabs_cfn_mcp_server-1.0.3.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-awslabs_cfn_mcp_server-1.0.3.dist-info/licenses/NOTICE,sha256=bcw4NZAgn5eQZzrtuDiwOe23BRSm_JiRzn0gxBLDzlg,90
-awslabs_cfn_mcp_server-1.0.3.dist-info/RECORD,,
+awslabs/cfn_mcp_server/server.py,sha256=TFadYC3k1fa0h42dZnhE07DBSgmOvyncGWvDwYWpQaw,16797
+awslabs_cfn_mcp_server-1.0.4.dist-info/METADATA,sha256=IVY_ukqh5kV3rQVwLlVONnPA_eG5Cqkg9KgsGRLVXns,9121
+awslabs_cfn_mcp_server-1.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+awslabs_cfn_mcp_server-1.0.4.dist-info/entry_points.txt,sha256=Hartc24s_fYgi3o2m2tBHahod0pqXYwpebQy2_tXL7s,78
+awslabs_cfn_mcp_server-1.0.4.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+awslabs_cfn_mcp_server-1.0.4.dist-info/licenses/NOTICE,sha256=bcw4NZAgn5eQZzrtuDiwOe23BRSm_JiRzn0gxBLDzlg,90
+awslabs_cfn_mcp_server-1.0.4.dist-info/RECORD,,