Skip to content

Commit

Permalink
Rename collection (ansible-collections#12)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
jillr authored Mar 25, 2020
1 parent c9b757d commit 4566c3d
Show file tree
Hide file tree
Showing 172 changed files with 924 additions and 924 deletions.
8 changes: 4 additions & 4 deletions aws_acm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
'''

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions aws_acm_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
author:
- Will Thames (@willthames)
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -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():
Expand Down
8 changes: 4 additions & 4 deletions aws_api_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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():
Expand Down
8 changes: 4 additions & 4 deletions aws_application_scaling_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
default: no
type: bool
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions aws_batch_compute_environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@
requirements:
- boto3
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions aws_batch_job_definition.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@
requirements:
- boto3
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions aws_batch_job_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
requirements:
- boto3
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions aws_codebuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@
choices: ['present', 'absent']
type: str
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions aws_codecommit.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
choices: [ 'present', 'absent' ]
type: str
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -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):
Expand Down
8 changes: 4 additions & 4 deletions aws_codepipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
choices: ['present', 'absent']
type: str
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions aws_config_aggregation_authorization.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
type: str
required: true
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand All @@ -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):
Expand Down
8 changes: 4 additions & 4 deletions aws_config_aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
type: dict
required: true
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
'''

Expand All @@ -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):
Expand Down
8 changes: 4 additions & 4 deletions aws_config_delivery_channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
'''

Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions aws_config_recorder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
'''

Expand All @@ -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):
Expand Down
8 changes: 4 additions & 4 deletions aws_config_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
'''

Expand Down Expand Up @@ -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):
Expand Down
18 changes: 9 additions & 9 deletions aws_direct_connect_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
The connection may later be associated or disassociated with a link aggregation group.
author: "Sloane Hertel (@s-hertel)"
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
requirements:
- boto3
Expand Down Expand Up @@ -158,13 +158,13 @@
"""

import traceback
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)
from ansible_collections.ansible.amazon.plugins.module_utils.aws.direct_connect import (DirectConnectError,
delete_connection,
associate_connection_and_lag,
disassociate_connection_and_lag,
)
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)
from ansible_collections.amazon.aws.plugins.module_utils.aws.direct_connect import (DirectConnectError,
delete_connection,
associate_connection_and_lag,
disassociate_connection_and_lag,
)

try:
from botocore.exceptions import BotoCoreError, ClientError
Expand Down
14 changes: 7 additions & 7 deletions aws_direct_connect_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
- Attaches Virtual Gateways to Direct Connect Gateway.
- Detaches Virtual Gateways to Direct Connect Gateway.
extends_documentation_fragment:
- ansible.amazon.aws
- ansible.amazon.ec2
- amazon.aws.aws
- amazon.aws.ec2
requirements: [ boto3 ]
options:
Expand Down Expand Up @@ -110,11 +110,11 @@
HAS_BOTO3 = False

from ansible.module_utils.basic import AnsibleModule
from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (camel_dict_to_snake_dict,
ec2_argument_spec,
get_aws_connection_info,
boto3_conn,
)
from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (camel_dict_to_snake_dict,
ec2_argument_spec,
get_aws_connection_info,
boto3_conn,
)
from ansible.module_utils._text import to_native


Expand Down
Loading

0 comments on commit 4566c3d

Please sign in to comment.