From 87ad79d9930402c33747706f97ac14eb4d5bf5c1 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_vpn.py                     |  8 ++++----
 plugins/modules/ec2_vpc_vpn_info.py                | 14 +++++++-------
 .../targets/ec2_vpc_vpn_info/tasks/main.yml        |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/modules/ec2_vpc_vpn.py b/plugins/modules/ec2_vpc_vpn.py
index 586138d3a1b..a1b6bd82b07 100644
--- a/plugins/modules/ec2_vpc_vpn.py
+++ b/plugins/modules/ec2_vpc_vpn.py
@@ -18,8 +18,8 @@
   - This module creates, modifies, and deletes VPN connections. Idempotence is achieved by using the filters
     option or specifying the VPN connection identifier.
 extends_documentation_fragment:
-- ansible.amazon.ec2
-- ansible.amazon.aws
+- amazon.aws.ec2
+- amazon.aws.aws
 
 requirements: ['boto3', 'botocore']
 author: "Sloane Hertel (@s-hertel)"
@@ -300,9 +300,9 @@
     vpn_connection_id: vpn-781e0e19
 """
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule
 from ansible.module_utils._text import to_text
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (
     camel_dict_to_snake_dict,
     boto3_tag_list_to_ansible_dict,
     compare_aws_tags,
diff --git a/plugins/modules/ec2_vpc_vpn_info.py b/plugins/modules/ec2_vpc_vpn_info.py
index bcb11b657a0..991977346d0 100644
--- a/plugins/modules/ec2_vpc_vpn_info.py
+++ b/plugins/modules/ec2_vpc_vpn_info.py
@@ -34,8 +34,8 @@
     type: list
     elements: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -169,11 +169,11 @@
 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.ec2 import (ansible_dict_to_boto3_filter_list,
-                                                                         boto3_tag_list_to_ansible_dict,
-                                                                         camel_dict_to_snake_dict,
-                                                                         )
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ansible_dict_to_boto3_filter_list,
+                                                                     boto3_tag_list_to_ansible_dict,
+                                                                     camel_dict_to_snake_dict,
+                                                                     )
 
 
 def date_handler(obj):
diff --git a/tests/integration/targets/ec2_vpc_vpn_info/tasks/main.yml b/tests/integration/targets/ec2_vpc_vpn_info/tasks/main.yml
index edd040c83c5..1d432a1740e 100644
--- a/tests/integration/targets/ec2_vpc_vpn_info/tasks/main.yml
+++ b/tests/integration/targets/ec2_vpc_vpn_info/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: ec2_vpc_vpn_info tests
   collections:
-    - ansible.amazon
+    - amazon.aws
   block:
 
   # ============================================================