Rename collection (#13)

* Rename collection

Content collections may not be published to the ansible namespace. As such,
rename collection, imports, and other relevant paths to amazon.aws.

* Remove unused GH action from readme

* Workaround setuptools bug pypa/setuptools#2041

* Missed some paths that needed to change in unit tests

* Test pulling community collection from a PR with modified imports

README.md

@@ -1,4 +1,2 @@
-[![GitHub Actions CI/CD build status — Collection test suite](https://github.com/ansible-collection-migration/ansible.amazon/workflows/Collection%20test%20suite/badge.svg?branch=master)](https://github.com/ansible-collection-migration/ansible.amazon/actions?query=workflow%3A%22Collection%20test%20suite%22)
-
-Ansible Collection: ansible.amazon
-=================================================
+Ansible Collection: amazon.aws
+=================================================

galaxy.yml

@@ -1,5 +1,5 @@
-namespace: ansible
-name: amazon
+namespace: amazon
+name: aws
 version: 0.1.0
 readme: README.md
 authors: null
@@ -9,7 +9,7 @@ license_file: COPYING
 tags: null
 dependencies:
   ansible.netcommon: '>=0.1.0'
-repository: [email protected]:ansible-collection-migration/ansible.amazon.git
-documentation: https://github.com/ansible-collection-migration/ansible.amazon/tree/master/docs
-homepage: https://github.com/ansible-collection-migration/ansible.amazon
-issues: https://github.com/ansible-collection-migration/ansible.amazon/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc
+repository: [email protected]:ansible-collections/amazon.aws.git
+documentation: https://github.com/ansible-collections/amazon.aws/tree/master/docs
+homepage: https://github.com/ansible-collections/amazon.ws
+issues: https://github.com/ansible-collections/amazon.aws/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc

plugins/callback/aws_resource_actions.py

@@ -42,7 +42,7 @@
 class CallbackModule(CallbackBase):
     CALLBACK_VERSION = 2.8
     CALLBACK_TYPE = 'aggregate'
-    CALLBACK_NAME = 'ansible.amazon.aws_resource_actions'
+    CALLBACK_NAME = 'amazon.aws.aws_resource_actions'
     CALLBACK_NEEDS_WHITELIST = True
 
     def __init__(self):

plugins/inventory/aws_ec2.py

@@ -14,7 +14,7 @@
     extends_documentation_fragment:
     - inventory_cache
     - constructed
-    - ansible.amazon.aws_credentials
+    - amazon.aws.aws_credentials
 
     description:
         - Get inventory hosts from Amazon Web Services EC2.
@@ -151,8 +151,8 @@
 
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_native, to_text
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list, boto3_tag_list_to_ansible_dict
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list, boto3_tag_list_to_ansible_dict
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
 from ansible.utils.display import Display
 
@@ -259,7 +259,7 @@
 
 class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
 
-    NAME = 'ansible.amazon.aws_ec2'
+    NAME = 'amazon.aws.aws_ec2'
 
     def __init__(self):
         super(InventoryModule, self).__init__()

plugins/inventory/aws_rds.py

@@ -39,7 +39,7 @@
     extends_documentation_fragment:
     - inventory_cache
     - constructed
-    - ansible.amazon.aws_credentials
+    - amazon.aws.aws_credentials
 
     requirements:
         - boto3
@@ -63,9 +63,9 @@
 
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_native
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import is_boto3_error_code
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list, boto3_tag_list_to_ansible_dict
-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 is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_filter_list, boto3_tag_list_to_ansible_dict
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
 
 try:
@@ -77,7 +77,7 @@
 
 class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
 
-    NAME = 'ansible.amazon.aws_rds'
+    NAME = 'amazon.aws.aws_rds'
 
     def __init__(self):
         super(InventoryModule, self).__init__()

plugins/lookup/aws_account_attribute.py

@@ -11,8 +11,8 @@
   - boto3
   - botocore
 extends_documentation_fragment:
-- ansible.amazon.aws_credentials
-- ansible.amazon.aws_region
+- amazon.aws.aws_credentials
+- amazon.aws.aws_region
 
 short_description: Look up AWS account attributes.
 description:
@@ -62,7 +62,7 @@
 
 from ansible.plugins import AnsiblePlugin
 from ansible.plugins.lookup import LookupBase
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import boto3_conn, get_aws_connection_info
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, get_aws_connection_info
 from ansible.module_utils._text import to_native
 from ansible.module_utils.six import string_types
 import os

plugins/lookup/aws_secret.py

@@ -12,8 +12,8 @@
   - boto3
   - botocore>=1.10.0
 extends_documentation_fragment:
-- ansible.amazon.aws_credentials
-- ansible.amazon.aws_region
+- amazon.aws.aws_credentials
+- amazon.aws.aws_region
 
 short_description: Look up secrets stored in AWS Secrets Manager.
 description:

plugins/lookup/aws_ssm.py

@@ -106,7 +106,7 @@
 '''
 
 from ansible.module_utils._text import to_native
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO3, boto3_tag_list_to_ansible_dict
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3, boto3_tag_list_to_ansible_dict
 from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.display import Display

plugins/module_utils/aws/acm.py

@@ -30,12 +30,12 @@
 Common Amazon Certificate Manager facts shared between modules
 """
 import traceback
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (camel_dict_to_snake_dict,
-                                                                         AWSRetry,
-                                                                         HAS_BOTO3,
-                                                                         boto3_tag_list_to_ansible_dict,
-                                                                         ansible_dict_to_boto3_tag_list)
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (camel_dict_to_snake_dict,
+                                                                     AWSRetry,
+                                                                     HAS_BOTO3,
+                                                                     boto3_tag_list_to_ansible_dict,
+                                                                     ansible_dict_to_boto3_tag_list)
 from ansible.module_utils._text import to_bytes
 
 

plugins/module_utils/aws/batch.py

@@ -32,7 +32,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn, snake_dict_to_camel_dict
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn, snake_dict_to_camel_dict
 
 try:
     from botocore.exceptions import ClientError

plugins/module_utils/aws/cloudfront_facts.py

@@ -29,8 +29,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, camel_dict_to_snake_dict
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, camel_dict_to_snake_dict
 
 try:
     import botocore

plugins/module_utils/aws/core.py

@@ -75,8 +75,8 @@
 
 from ansible.module_utils.basic import AnsibleModule, missing_required_lib
 from ansible.module_utils._text import to_native
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO3, camel_dict_to_snake_dict, ec2_argument_spec, boto3_conn
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import get_aws_connection_info, get_aws_region
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3, camel_dict_to_snake_dict, ec2_argument_spec, boto3_conn
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info, get_aws_region
 
 # We will also export HAS_BOTO3 so end user modules can use it.
 __all__ = ('AnsibleAWSModule', 'HAS_BOTO3', 'is_boto3_error_code')

plugins/module_utils/aws/direct_connect.py

@@ -37,7 +37,7 @@
     import botocore
 except ImportError:
     pass
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict
 
 
 class DirectConnectError(Exception):

plugins/module_utils/aws/elb_utils.py

@@ -4,7 +4,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AWSRetry
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry
 
 # Non-ansible imports
 try:

plugins/module_utils/aws/elbv2.py

@@ -5,10 +5,10 @@
 __metaclass__ = type
 
 # Ansible imports
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict, get_ec2_security_group_ids_from_names, \
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, get_ec2_security_group_ids_from_names, \
     ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict, compare_policies as compare_dicts, \
     AWSRetry
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.elb_utils import get_elb, get_elb_listener, convert_tg_name_to_arn
+from ansible_collections.amazon.aws.plugins.module_utils.aws.elb_utils import get_elb, get_elb_listener, convert_tg_name_to_arn
 
 # Non-ansible imports
 try:

plugins/module_utils/aws/rds.py

@@ -5,12 +5,12 @@
 __metaclass__ = type
 
 from ansible.module_utils._text import to_text
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.waiters import get_waiter
+from ansible_collections.amazon.aws.plugins.module_utils.aws.waiters import get_waiter
 from ansible.module_utils.common.dict_transformations import snake_dict_to_camel_dict
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (compare_aws_tags,
-                                                                         AWSRetry,
-                                                                         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,
+                                                                     ansible_dict_to_boto3_tag_list,
+                                                                     boto3_tag_list_to_ansible_dict)
 
 try:
     from botocore.exceptions import BotoCoreError, ClientError, WaiterError

plugins/module_utils/aws/urls.py

@@ -10,7 +10,7 @@
 import operator
 
 from ansible.module_utils.urls import open_url
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import boto3_conn, get_aws_connection_info, HAS_BOTO3
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, get_aws_connection_info, HAS_BOTO3
 from ansible.module_utils.six.moves.urllib.parse import urlencode
 
 try:

plugins/module_utils/aws/waf.py

@@ -32,8 +32,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict, AWSRetry
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.waiters import get_waiter
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, AWSRetry
+from ansible_collections.amazon.aws.plugins.module_utils.aws.waiters import get_waiter
 
 try:
     import botocore

plugins/module_utils/ec2.py

@@ -37,7 +37,7 @@
 from ansible.module_utils.ansible_release import __version__
 from ansible.module_utils.basic import missing_required_lib, env_fallback
 from ansible.module_utils._text import to_native, to_text
-from ansible_collections.ansible.amazon.plugins.module_utils.cloud import CloudRetry
+from ansible_collections.amazon.aws.plugins.module_utils.cloud import CloudRetry
 from ansible.module_utils.six import string_types, binary_type, text_type
 from ansible.module_utils.common.dict_transformations import (
     camel_dict_to_snake_dict, snake_dict_to_camel_dict,

plugins/modules/aws_az_info.py

@@ -29,8 +29,8 @@
     default: {}
     type: dict
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 requirements: [botocore, boto3]
 '''
@@ -70,8 +70,8 @@
     ]"
 '''
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AWSRetry, ansible_dict_to_boto3_filter_list, 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 AWSRetry, ansible_dict_to_boto3_filter_list, camel_dict_to_snake_dict
 
 try:
     from botocore.exceptions import ClientError, BotoCoreError

plugins/modules/aws_caller_info.py

@@ -26,8 +26,8 @@
 
 requirements: [ 'botocore', 'boto3' ]
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -64,8 +64,8 @@
     sample: 123456789012:my-federated-user-name
 '''
 
-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:
     from botocore.exceptions import BotoCoreError, ClientError

plugins/modules/aws_s3.py

@@ -147,8 +147,8 @@
     - "Lester Wade (@lwade)"
     - "Sloane Hertel (@s-hertel)"
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -283,9 +283,9 @@
 from ansible.module_utils.six.moves.urllib.parse import urlparse
 from ssl import SSLError
 from ansible.module_utils.basic import to_text, to_native
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.s3 import calculate_etag, HAS_MD5
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.aws.s3 import calculate_etag, HAS_MD5
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn
 
 try:
     import botocore

plugins/modules/cloudformation.py

@@ -164,8 +164,8 @@
 
 author: "James S. Martin (@jsmartin)"
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 requirements: [ boto3, botocore>=1.5.45 ]
 '''
@@ -334,13 +334,13 @@
 except ImportError:
     HAS_BOTO3 = False
 
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (ansible_dict_to_boto3_tag_list,
-                                                                         AWSRetry,
-                                                                         boto3_conn,
-                                                                         boto_exception,
-                                                                         ec2_argument_spec,
-                                                                         get_aws_connection_info,
-                                                                         )
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ansible_dict_to_boto3_tag_list,
+                                                                     AWSRetry,
+                                                                     boto3_conn,
+                                                                     boto_exception,
+                                                                     ec2_argument_spec,
+                                                                     get_aws_connection_info,
+                                                                     )
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils._text import to_bytes, to_native
 

plugins/modules/cloudformation_info.py

@@ -61,8 +61,8 @@
         type: bool
         default: false
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -174,8 +174,8 @@
 
 from functools import partial
 from ansible.module_utils._text import to_native
-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, AWSRetry, boto3_tag_list_to_ansible_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, AWSRetry, boto3_tag_list_to_ansible_dict)
 
 try:
     import botocore