Rename collection (ansible-collections#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: ansible-collections/community.aws@235c5db
goneri · Jun 25, 2021 · c4c80ab · c4c80ab
1 parent 93a9fa1
commit c4c80ab
Show file tree

Hide file tree

Showing 17 changed files with 116 additions and 116 deletions.
diff --git a/plugins/modules/ec2_vpc_egress_igw.py b/plugins/modules/ec2_vpc_egress_igw.py
@@ -30,8 +30,8 @@
     choices: [ 'present', 'absent' ]
     type: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -61,8 +61,8 @@
 '''
 
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import 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 camel_dict_to_snake_dict
 
 try:
     import botocore

diff --git a/plugins/modules/ec2_vpc_endpoint.py b/plugins/modules/ec2_vpc_endpoint.py
@@ -95,8 +95,8 @@
     type: str
 author: Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -190,12 +190,12 @@
     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 (get_aws_connection_info,
-                                                                         boto3_conn,
-                                                                         ec2_argument_spec,
-                                                                         HAS_BOTO3,
-                                                                         camel_dict_to_snake_dict,
-                                                                         )
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (get_aws_connection_info,
+                                                                     boto3_conn,
+                                                                     ec2_argument_spec,
+                                                                     HAS_BOTO3,
+                                                                     camel_dict_to_snake_dict,
+                                                                     )
 from ansible.module_utils.six import string_types
 
 

diff --git a/plugins/modules/ec2_vpc_endpoint_info.py b/plugins/modules/ec2_vpc_endpoint_info.py
@@ -39,8 +39,8 @@
     type: dict
 author: Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -117,14 +117,14 @@
     pass  # will be picked up from imported HAS_BOTO3
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (ec2_argument_spec,
-                                                                         boto3_conn,
-                                                                         get_aws_connection_info,
-                                                                         ansible_dict_to_boto3_filter_list,
-                                                                         HAS_BOTO3,
-                                                                         camel_dict_to_snake_dict,
-                                                                         AWSRetry,
-                                                                         )
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ec2_argument_spec,
+                                                                     boto3_conn,
+                                                                     get_aws_connection_info,
+                                                                     ansible_dict_to_boto3_filter_list,
+                                                                     HAS_BOTO3,
+                                                                     camel_dict_to_snake_dict,
+                                                                     AWSRetry,
+                                                                     )
 
 
 def date_handler(obj):

diff --git 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
@@ -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/plugins/modules/ec2_vpc_nacl.py b/plugins/modules/ec2_vpc_nacl.py
@@ -80,8 +80,8 @@
     default: present
 author: Mike Mochan (@mmochan)
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 requirements: [ botocore, boto3, json ]
 '''
@@ -159,8 +159,8 @@
 except ImportError:
     pass  # Handled by AnsibleAWSModule
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AWSRetry
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry
 
 # VPC-supported IANA protocol numbers
 # http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml

diff --git a/plugins/modules/ec2_vpc_nacl_info.py b/plugins/modules/ec2_vpc_nacl_info.py
@@ -39,8 +39,8 @@
   - By default, the module will return all Network ACLs.
 
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -112,13 +112,13 @@
 except ImportError:
     pass  # caught by AnsibleAWSModule
 
-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_native
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (AWSRetry,
-                                                                         ansible_dict_to_boto3_filter_list,
-                                                                         camel_dict_to_snake_dict,
-                                                                         boto3_tag_list_to_ansible_dict,
-                                                                         )
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (AWSRetry,
+                                                                     ansible_dict_to_boto3_filter_list,
+                                                                     camel_dict_to_snake_dict,
+                                                                     boto3_tag_list_to_ansible_dict,
+                                                                     )
 
 
 # VPC-supported IANA protocol numbers

diff --git a/plugins/modules/ec2_vpc_nat_gateway.py b/plugins/modules/ec2_vpc_nat_gateway.py
@@ -80,8 +80,8 @@
   - Jon Hadfield (@jonhadfield)
   - Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -209,12 +209,12 @@
     pass  # caught 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,
-                                                                         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,
+                                                                     HAS_BOTO3,
+                                                                     )
 
 
 DRY_RUN_GATEWAYS = [

diff --git a/plugins/modules/ec2_vpc_nat_gateway_info.py b/plugins/modules/ec2_vpc_nat_gateway_info.py
@@ -32,8 +32,8 @@
     type: dict
 author: Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -88,14 +88,14 @@
     pass  # will be detected 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,
-                                                                         boto3_tag_list_to_ansible_dict,
-                                                                         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,
+                                                                     boto3_tag_list_to_ansible_dict,
+                                                                     HAS_BOTO3,
+                                                                     )
 
 
 def date_handler(obj):

diff --git 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
@@ -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):

diff --git a/plugins/modules/ec2_vpc_route_table.py b/plugins/modules/ec2_vpc_route_table.py
@@ -79,8 +79,8 @@
     - Required when I(state=present) or I(lookup=tag).
     type: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -229,12 +229,12 @@
 
 import re
 from time import sleep
-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 ansible_dict_to_boto3_filter_list
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict, snake_dict_to_camel_dict
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import compare_aws_tags, AWSRetry
+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 ansible_dict_to_boto3_filter_list
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, snake_dict_to_camel_dict
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags, AWSRetry
 
 
 try:

diff --git a/plugins/modules/ec2_vpc_route_table_info.py b/plugins/modules/ec2_vpc_route_table_info.py
@@ -26,8 +26,8 @@
         See U(https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeRouteTables.html) for possible filters.
     type: dict
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -62,7 +62,7 @@
     HAS_BOTO = False
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AnsibleAWSError, connect_to_aws, ec2_argument_spec, get_aws_connection_info
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AnsibleAWSError, connect_to_aws, ec2_argument_spec, get_aws_connection_info
 
 
 def get_route_table_info(route_table):

diff --git 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