From 4f4bf28c5e6b192d7245d0a7b758fd5e0235fe81 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_vgw.py                 | 10 +++++-----
 plugins/modules/ec2_vpc_vgw_info.py            | 18 +++++++++---------
 .../targets/ec2_vpc_vgw/tasks/main.yml         |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/modules/ec2_vpc_vgw.py b/plugins/modules/ec2_vpc_vgw.py
index a8ba032058c..8fce681bbe8 100644
--- a/plugins/modules/ec2_vpc_vgw.py
+++ b/plugins/modules/ec2_vpc_vgw.py
@@ -62,8 +62,8 @@
     type: dict
 author: Nick Aslanidis (@naslanidis)
 extends_documentation_fragment:
-- ansible.amazon.ec2
-- ansible.amazon.aws
+- amazon.aws.ec2
+- amazon.aws.aws
 
 '''
 
@@ -125,10 +125,10 @@
 except ImportError:
     HAS_BOTO3 = False
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import is_boto3_error_code
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.waiters import get_waiter
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.aws.waiters import get_waiter
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO3, boto3_conn, ec2_argument_spec, get_aws_connection_info, AWSRetry
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3, boto3_conn, ec2_argument_spec, get_aws_connection_info, AWSRetry
 from ansible.module_utils._text import to_native
 
 
diff --git a/plugins/modules/ec2_vpc_vgw_info.py b/plugins/modules/ec2_vpc_vgw_info.py
index e6b9b96ffd0..64f522d80db 100644
--- a/plugins/modules/ec2_vpc_vgw_info.py
+++ b/plugins/modules/ec2_vpc_vgw_info.py
@@ -32,8 +32,8 @@
     elements: str
 author: "Nick Aslanidis (@naslanidis)"
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -101,13 +101,13 @@
     pass  # will be captured by imported HAS_BOTO3
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (ec2_argument_spec,
-                                                                         get_aws_connection_info,
-                                                                         boto3_conn,
-                                                                         camel_dict_to_snake_dict,
-                                                                         ansible_dict_to_boto3_filter_list,
-                                                                         HAS_BOTO3,
-                                                                         )
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ec2_argument_spec,
+                                                                     get_aws_connection_info,
+                                                                     boto3_conn,
+                                                                     camel_dict_to_snake_dict,
+                                                                     ansible_dict_to_boto3_filter_list,
+                                                                     HAS_BOTO3,
+                                                                     )
 
 
 def get_virtual_gateway_info(virtual_gateway):
diff --git a/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml b/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml
index d272342c4ca..641f6563cc2 100644
--- a/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml
+++ b/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: ec2_vpc_net tests
   collections:
-    - ansible.amazon
+    - amazon.aws
   block:
 
     # ============================================================