From f493937ce19bd6245113099938db537cc4e98ed2 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_igw.py                 | 10 +++++-----
 plugins/modules/ec2_vpc_igw_info.py            | 18 +++++++++---------
 .../targets/ec2_vpc_igw/tasks/main.yml         |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/modules/ec2_vpc_igw.py b/plugins/modules/ec2_vpc_igw.py
index 76973a6e341..43b74c163d5 100644
--- a/plugins/modules/ec2_vpc_igw.py
+++ b/plugins/modules/ec2_vpc_igw.py
@@ -36,8 +36,8 @@
     choices: [ 'present', 'absent' ]
     type: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 requirements:
   - botocore
@@ -89,9 +89,9 @@
 except ImportError:
     pass  # caught by AnsibleAWSModule
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.waiters import get_waiter
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.aws.waiters import get_waiter
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (
     AWSRetry,
     camel_dict_to_snake_dict,
     boto3_tag_list_to_ansible_dict,
diff --git a/plugins/modules/ec2_vpc_igw_info.py b/plugins/modules/ec2_vpc_igw_info.py
index 07333c1613e..1c407a36b89 100644
--- a/plugins/modules/ec2_vpc_igw_info.py
+++ b/plugins/modules/ec2_vpc_igw_info.py
@@ -32,8 +32,8 @@
     type: list
     elements: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -98,13 +98,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_internet_gateway_info(internet_gateway):
diff --git a/tests/integration/targets/ec2_vpc_igw/tasks/main.yml b/tests/integration/targets/ec2_vpc_igw/tasks/main.yml
index cd90a42b46a..56da84772a2 100644
--- a/tests/integration/targets/ec2_vpc_igw/tasks/main.yml
+++ b/tests/integration/targets/ec2_vpc_igw/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: ec2_vpc_igw tests
   collections:
-    - ansible.amazon
+    - amazon.aws
 
   block:
   - name: set up aws connection info