Merge pull request ansible-collections#536 from tremble/ec2_vpc_peeri…

…ng_info/retries

ec2_vpc_peering_info - Add AWSRetry decorator

Reviewed-by: https://github.com/apps/ansible-zuul

changelogs/fragments/536-ec2_vpc_peering_info-retry.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- ec2_vpc_peering_info - add retries on common AWS failures (https://github.com/ansible-collections/community.aws/pull/536).

plugins/modules/ec2_vpc_peering_info.py

@@ -208,26 +208,24 @@
 except ImportError:
     pass  # Handled by AnsibleAWSModule
 
-from ansible.module_utils._text import to_native
 from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.core import normalize_boto3_result
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict
 
 
-def date_handler(obj):
-    return obj.isoformat() if hasattr(obj, 'isoformat') else obj
-
-
 def get_vpc_peers(client, module):
     params = dict()
     params['Filters'] = ansible_dict_to_boto3_filter_list(module.params.get('filters'))
     if module.params.get('peer_connection_ids'):
         params['VpcPeeringConnectionIds'] = module.params.get('peer_connection_ids')
     try:
-        result = json.loads(json.dumps(client.describe_vpc_peering_connections(**params), default=date_handler))
-    except Exception as e:
-        module.fail_json(msg=to_native(e))
+        result = client.describe_vpc_peering_connections(aws_retry=True, **params)
+        result = normalize_boto3_result(result)
+    except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
+        module.fail_json_aws(e, msg="Failed to describe peering connections")
 
     return result['VpcPeeringConnections']
 
@@ -244,7 +242,7 @@ def main():
         module.deprecate("The 'ec2_vpc_peering_facts' module has been renamed to 'ec2_vpc_peering_info'", date='2021-12-01', collection_name='community.aws')
 
     try:
-        ec2 = module.client('ec2')
+        ec2 = module.client('ec2', retry_decorator=AWSRetry.jittered_backoff())
     except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
         module.fail_json_aws(e, msg='Failed to connect to AWS')