Fixes

Signed-off-by: Alina Buzachis <abuzachis@redhat.com>

plugins/module_utils/ec2.py

@@ -1354,20 +1354,11 @@ def _is_missing(cls):
 
 @EC2TransitGatewayVPCAttachmentErrorHandler.common_error_handler("describe transit gateway attachments")
 @AWSRetry.jittered_backoff()
-def paginated_describe_transit_gateway_vpc_attachments(
+def describe_vpc_attachments(
     client, **params: Dict[str, Union[List[str], bool, List[Dict[str, Union[str, List[str]]]]]]
 ) -> Dict[str, Any]:
     paginator = client.get_paginator("describe_transit_gateway_vpc_attachments")
-    return paginator.paginate(**params).build_full_result()
-
-
-@EC2TransitGatewayVPCAttachmentErrorHandler.common_error_handler("describe transit gateway attachments")
-@AWSRetry.jittered_backoff()
-def describe_vpc_attachments(
-    client, **params: Dict[str, Union[List[str], bool, List[Dict[str, Union[str, List[str]]]]]]
-) -> Optional[List[Dict[str, Any]]]:
-    result = client._paginated_describe_transit_gateway_vpc_attachments(**params)
-    return result.get("TransitGatewayVpcAttachments", None)
+    return paginator.paginate(**params).build_full_result()["TransitGatewayVpcAttachments"]
 
 
 @EC2TransitGatewayVPCAttachmentErrorHandler.common_error_handler("create transit gateway vpc attachment")
@@ -1397,10 +1388,14 @@ def delete_vpc_attachment(
     return result.get("TransitGatewayVpcAttachment", None)
 
 
-def get_tgw_vpc_attachment(client, **params: Any) -> Optional[Dict[str, Any]]:
+def get_tgw_vpc_attachment(client, module, **params: Any) -> Optional[Dict[str, Any]]:
     # Only for use with a single attachment, use describe_vpc_attachments for
     # multiple tables.
-    attachments = client.describe_vpc_attachments(**params)
+    try:
+        attachments = describe_vpc_attachments(client, **params)
+    except AnsibleEC2Error as e:
+        module.fail_json_aws_error(e)
+
     if not attachments:
         return None
 

plugins/module_utils/waiters.py

@@ -817,12 +817,12 @@ def route53_model(name):
     ("EC2", "transit_gateway_vpc_attachment_available"): lambda ec2: core_waiter.Waiter(
         "transit_gateway_vpc_attachment_available",
         ec2_model("TGWVpcAttachmentAvailable"),
-        core_waiter.NormalizedOperationMethod(ec2.describe_vpc_attachments),
+        core_waiter.NormalizedOperationMethod(ec2.describe_transit_gateway_vpc_attachments),
     ),
     ("EC2", "transit_gateway_vpc_attachment_deleted"): lambda ec2: core_waiter.Waiter(
         "transit_gateway_vpc_attachment_deleted",
         ec2_model("TGWVpcAttachmentDeleted"),
-        core_waiter.NormalizedOperationMethod(ec2.describe_vpc_attachments),
+        core_waiter.NormalizedOperationMethod(ec2.describe_transit_gateway_vpc_attachments),
     ),
     ("EC2", "network_interface_attached"): lambda ec2: core_waiter.Waiter(
         "network_interface_attached",