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

README.md

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

galaxy.yml

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

plugins/connection/aws_ssm.py

@@ -233,7 +233,7 @@ def chunks(lst, n):
 class Connection(ConnectionBase):
     ''' AWS SSM based connections '''
 
-    transport = 'community.amazon.aws_ssm'
+    transport = 'community.aws.aws_ssm'
     allow_executable = False
     allow_extras = True
     has_pipelining = False

plugins/modules/aws_acm.py

@@ -152,8 +152,8 @@
 author:
   - Matthew Davis (@matt-telstra) on behalf of Telstra Corporation Limited
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -226,8 +226,8 @@
 '''
 
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.acm import ACMServiceManager
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.aws.acm import ACMServiceManager
 from ansible.module_utils._text import to_text
 import base64
 import re  # regex library

plugins/modules/aws_acm_info.py

@@ -46,8 +46,8 @@
 author:
   - Will Thames (@willthames)
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -262,8 +262,8 @@
       type: str
 '''
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.acm import ACMServiceManager
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule
+from ansible_collections.amazon.aws.plugins.module_utils.aws.acm import ACMServiceManager
 
 
 def main():

plugins/modules/aws_api_gateway.py

@@ -107,8 +107,8 @@
 author:
     - 'Michael De La Rue (@mikedlr)'
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 notes:
    - A future version of this module will probably use tags or another
@@ -181,8 +181,8 @@
     pass
 
 import traceback
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (AWSRetry, 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, camel_dict_to_snake_dict)
 
 
 def main():

plugins/modules/aws_application_scaling_policy.py

@@ -105,8 +105,8 @@
         default: no
         type: bool
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -286,8 +286,8 @@
     sample: '2017-09-28T08:22:51.881000-03:00'
 '''  # NOQA
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import _camel_to_snake, 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_to_snake, camel_dict_to_snake_dict
 
 try:
     import botocore

plugins/modules/aws_batch_compute_environment.py

@@ -121,8 +121,8 @@
 requirements:
     - boto3
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -231,8 +231,8 @@
   type: dict
 '''
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import snake_dict_to_camel_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 snake_dict_to_camel_dict, camel_dict_to_snake_dict
 import re
 
 try:

plugins/modules/aws_batch_job_definition.py

@@ -175,8 +175,8 @@
 requirements:
     - boto3
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -226,9 +226,9 @@
   type: dict
 '''
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.batch import cc, set_api_params
-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.batch import cc, set_api_params
+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 ClientError, BotoCoreError

plugins/modules/aws_batch_job_queue.py

@@ -65,8 +65,8 @@
 requirements:
     - boto3
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -114,9 +114,9 @@
   type: dict
 '''
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.batch import set_api_params
-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.batch import set_api_params
+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_codebuild.py

@@ -161,8 +161,8 @@
         choices: ['present', 'absent']
         type: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -289,8 +289,8 @@
       sample: "2018-04-17T16:56:03.245000+02:00"
 '''
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, get_boto3_client_method_parameters
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict, snake_dict_to_camel_dict
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, get_boto3_client_method_parameters
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, snake_dict_to_camel_dict
 
 
 try:

plugins/modules/aws_codecommit.py

@@ -44,8 +44,8 @@
     choices: [ 'present', 'absent' ]
     type: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -144,8 +144,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 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
 
 
 class CodeCommit(object):

plugins/modules/aws_codepipeline.py

@@ -77,8 +77,8 @@
         choices: ['present', 'absent']
         type: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -200,8 +200,8 @@
 import traceback
 
 from ansible.module_utils._text import to_native
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict, compare_policies
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, compare_policies
 
 
 try:

plugins/modules/aws_config_aggregation_authorization.py

@@ -39,8 +39,8 @@
     type: str
     required: true
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -63,8 +63,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
 
 
 def resource_exists(client, module, params):

plugins/modules/aws_config_aggregator.py

@@ -74,8 +74,8 @@
     type: dict
     required: true
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -100,8 +100,8 @@
 except ImportError:
     pass  # handled by AnsibleAWSModule
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AWSRetry, camel_dict_to_snake_dict
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry, camel_dict_to_snake_dict
 
 
 def resource_exists(client, module, params):

plugins/modules/aws_config_delivery_channel.py

@@ -52,8 +52,8 @@
     choices: ['One_Hour', 'Three_Hours', 'Six_Hours', 'Twelve_Hours', 'TwentyFour_Hours']
     type: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -76,8 +76,8 @@
 except ImportError:
     pass  # handled by AnsibleAWSModule
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict, AWSRetry
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, AWSRetry
 
 
 # this waits for an IAM role to become fully available, at the cost of

plugins/modules/aws_config_recorder.py

@@ -65,8 +65,8 @@
         - Before you can set this option, you must set I(all_supported=false).
     type: dict
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -90,8 +90,8 @@
 except ImportError:
     pass  # handled by AnsibleAWSModule
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict, AWSRetry
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, AWSRetry
 
 
 def resource_exists(client, module, params):

plugins/modules/aws_config_rule.py

@@ -89,8 +89,8 @@
     choices: ['One_Hour', 'Three_Hours', 'Six_Hours', 'Twelve_Hours', 'TwentyFour_Hours']
     type: str
 extends_documentation_fragment:
-- ansible.amazon.aws
-- ansible.amazon.ec2
+- amazon.aws.aws
+- amazon.aws.ec2
 
 '''
 
@@ -118,8 +118,8 @@
 except ImportError:
     pass  # handled by AnsibleAWSModule
 
-from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
-from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AWSRetry, camel_dict_to_snake_dict
+from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code
+from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry, camel_dict_to_snake_dict
 
 
 def rule_exists(client, module, params):