From 279f0ba9b42d4fe1f0ef23f18836ca513ecf300d Mon Sep 17 00:00:00 2001
From: Jill R <4121322+jillr@users.noreply.github.com>
Date: Wed, 25 Mar 2020 15:39:40 -0700
Subject: [PATCH] Rename collection (#12)

* Rename core collection

Rename references to ansible.amazon to amazon.aws.

* Rename community.amazon to community.aws
Fix pep8 line lengths for rewritten amazon.aws imports

* Missed a path in shippable.sh
* Dependency repos moved

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: https://github.com/ansible-collections/community.aws/commit/235c5db571cc45db5839476c94356c9b91e1f228
---
 plugins/modules/ec2_vpc_peer.py         |  8 ++++----
 plugins/modules/ec2_vpc_peering_info.py | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/modules/ec2_vpc_peer.py b/plugins/modules/ec2_vpc_peer.py
index 9e1cdd06112..28de7788ef0 100644
--- a/plugins/modules/ec2_vpc_peer.py
+++ b/plugins/modules/ec2_vpc_peer.py
@@ -57,8 +57,8 @@
     type: str
 author: Mike Mochan (@mmochan)
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 requirements: [ botocore, boto3, json ]
 '''
@@ -229,8 +229,8 @@
 import traceback
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info, HAS_BOTO3
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info, HAS_BOTO3
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import is_boto3_error_code
 
 
 def tags_changed(pcx_id, client, module):
diff --git a/plugins/modules/ec2_vpc_peering_info.py b/plugins/modules/ec2_vpc_peering_info.py
index b30fb43bf59..2561a209283 100644
--- a/plugins/modules/ec2_vpc_peering_info.py
+++ b/plugins/modules/ec2_vpc_peering_info.py
@@ -31,8 +31,8 @@
     type: dict
 author: Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -78,14 +78,14 @@
     pass  # will be picked up by imported HAS_BOTO3
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (boto3_tag_list_to_ansible_dict,
-                                                                         ec2_argument_spec,
-                                                                         boto3_conn,
-                                                                         get_aws_connection_info,
-                                                                         ansible_dict_to_boto3_filter_list,
-                                                                         HAS_BOTO3,
-                                                                         camel_dict_to_snake_dict,
-                                                                         )
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (boto3_tag_list_to_ansible_dict,
+                                                                     ec2_argument_spec,
+                                                                     boto3_conn,
+                                                                     get_aws_connection_info,
+                                                                     ansible_dict_to_boto3_filter_list,
+                                                                     HAS_BOTO3,
+                                                                     camel_dict_to_snake_dict,
+                                                                     )
 
 
 def date_handler(obj):