diff --git a/README.md b/README.md index 8813483bb4e..db2fb407000 100644 --- a/README.md +++ b/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 -================================================= \ No newline at end of file +Ansible Collection: community.aws +================================================= diff --git a/galaxy.yml b/galaxy.yml index cf7301f5a43..888eb3b5bd2 100644 --- a/galaxy.yml +++ b/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: git@github.com: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: git@github.com: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 diff --git a/plugins/connection/aws_ssm.py b/plugins/connection/aws_ssm.py index d11db4785e8..83545374c01 100644 --- a/plugins/connection/aws_ssm.py +++ b/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 diff --git a/plugins/modules/aws_acm.py b/plugins/modules/aws_acm.py index 421c9e6ad76..3e24adfd364 100644 --- a/plugins/modules/aws_acm.py +++ b/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 diff --git a/plugins/modules/aws_acm_info.py b/plugins/modules/aws_acm_info.py index 31c4ddef370..094d8a2ac6c 100644 --- a/plugins/modules/aws_acm_info.py +++ b/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(): diff --git a/plugins/modules/aws_api_gateway.py b/plugins/modules/aws_api_gateway.py index 86cfbf129e0..fe3cd969e6f 100644 --- a/plugins/modules/aws_api_gateway.py +++ b/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(): diff --git a/plugins/modules/aws_application_scaling_policy.py b/plugins/modules/aws_application_scaling_policy.py index 563a94f2c76..6fefaee2c3d 100644 --- a/plugins/modules/aws_application_scaling_policy.py +++ b/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 diff --git a/plugins/modules/aws_batch_compute_environment.py b/plugins/modules/aws_batch_compute_environment.py index a41e8249ecd..6329bba214c 100644 --- a/plugins/modules/aws_batch_compute_environment.py +++ b/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: diff --git a/plugins/modules/aws_batch_job_definition.py b/plugins/modules/aws_batch_job_definition.py index b443e6199a7..07bcf127295 100644 --- a/plugins/modules/aws_batch_job_definition.py +++ b/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 diff --git a/plugins/modules/aws_batch_job_queue.py b/plugins/modules/aws_batch_job_queue.py index 0d4828ac576..77726175510 100644 --- a/plugins/modules/aws_batch_job_queue.py +++ b/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 diff --git a/plugins/modules/aws_codebuild.py b/plugins/modules/aws_codebuild.py index ae0726aa1d4..219289ee2db 100644 --- a/plugins/modules/aws_codebuild.py +++ b/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: diff --git a/plugins/modules/aws_codecommit.py b/plugins/modules/aws_codecommit.py index c946a95aa7d..f8d7df05d2a 100644 --- a/plugins/modules/aws_codecommit.py +++ b/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): diff --git a/plugins/modules/aws_codepipeline.py b/plugins/modules/aws_codepipeline.py index 703f905af20..84afe1a4dc1 100644 --- a/plugins/modules/aws_codepipeline.py +++ b/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: diff --git a/plugins/modules/aws_config_aggregation_authorization.py b/plugins/modules/aws_config_aggregation_authorization.py index be29aa1a3ad..78126794905 100644 --- a/plugins/modules/aws_config_aggregation_authorization.py +++ b/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): diff --git a/plugins/modules/aws_config_aggregator.py b/plugins/modules/aws_config_aggregator.py index 065a5505a09..3f39f57cbc9 100644 --- a/plugins/modules/aws_config_aggregator.py +++ b/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): diff --git a/plugins/modules/aws_config_delivery_channel.py b/plugins/modules/aws_config_delivery_channel.py index 54fdb6f7ede..0005d68d462 100644 --- a/plugins/modules/aws_config_delivery_channel.py +++ b/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 diff --git a/plugins/modules/aws_config_recorder.py b/plugins/modules/aws_config_recorder.py index 7ba1b0db535..a614748e739 100644 --- a/plugins/modules/aws_config_recorder.py +++ b/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): diff --git a/plugins/modules/aws_config_rule.py b/plugins/modules/aws_config_rule.py index d3eed699cab..e2a328ce1d3 100644 --- a/plugins/modules/aws_config_rule.py +++ b/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): diff --git a/plugins/modules/aws_direct_connect_connection.py b/plugins/modules/aws_direct_connect_connection.py index 395ac4478d8..601745de4ff 100644 --- a/plugins/modules/aws_direct_connect_connection.py +++ b/plugins/modules/aws_direct_connect_connection.py @@ -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 @@ -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 diff --git a/plugins/modules/aws_direct_connect_gateway.py b/plugins/modules/aws_direct_connect_gateway.py index d157e56a34f..d2fc624d747 100644 --- a/plugins/modules/aws_direct_connect_gateway.py +++ b/plugins/modules/aws_direct_connect_gateway.py @@ -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: @@ -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 diff --git a/plugins/modules/aws_direct_connect_link_aggregation_group.py b/plugins/modules/aws_direct_connect_link_aggregation_group.py index f7bb86ec077..dd7d57dcded 100644 --- a/plugins/modules/aws_direct_connect_link_aggregation_group.py +++ b/plugins/modules/aws_direct_connect_link_aggregation_group.py @@ -18,8 +18,8 @@ - Create, delete, or modify a Direct Connect 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 @@ -164,19 +164,19 @@ returned: when I(state=present) """ -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (camel_dict_to_snake_dict, - ec2_argument_spec, - HAS_BOTO3, - get_aws_connection_info, - boto3_conn, - AWSRetry, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (camel_dict_to_snake_dict, + ec2_argument_spec, + HAS_BOTO3, + get_aws_connection_info, + boto3_conn, + AWSRetry, + ) from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.aws.direct_connect import (DirectConnectError, - delete_connection, - delete_virtual_interface, - disassociate_connection_and_lag, - ) +from ansible_collections.amazon.aws.plugins.module_utils.aws.direct_connect import (DirectConnectError, + delete_connection, + delete_virtual_interface, + disassociate_connection_and_lag, + ) import traceback import time diff --git a/plugins/modules/aws_direct_connect_virtual_interface.py b/plugins/modules/aws_direct_connect_virtual_interface.py index 96616532587..4a5276631ba 100644 --- a/plugins/modules/aws_direct_connect_virtual_interface.py +++ b/plugins/modules/aws_direct_connect_virtual_interface.py @@ -81,8 +81,8 @@ - The virtual interface ID. type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -238,9 +238,9 @@ ''' import traceback -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule -from ansible_collections.ansible.amazon.plugins.module_utils.aws.direct_connect import DirectConnectError, delete_virtual_interface -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.aws.direct_connect import DirectConnectError, delete_virtual_interface +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry, camel_dict_to_snake_dict try: from botocore.exceptions import ClientError, BotoCoreError diff --git a/plugins/modules/aws_eks_cluster.py b/plugins/modules/aws_eks_cluster.py index 19bf5ed62d5..1b1693be225 100644 --- a/plugins/modules/aws_eks_cluster.py +++ b/plugins/modules/aws_eks_cluster.py @@ -61,8 +61,8 @@ requirements: [ 'botocore', 'boto3' ] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -163,9 +163,9 @@ ''' -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, get_ec2_security_group_ids_from_names -from ansible_collections.ansible.amazon.plugins.module_utils.aws.waiters import get_waiter +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, get_ec2_security_group_ids_from_names +from ansible_collections.amazon.aws.plugins.module_utils.aws.waiters import get_waiter try: import botocore.exceptions diff --git a/plugins/modules/aws_elasticbeanstalk_app.py b/plugins/modules/aws_elasticbeanstalk_app.py index ae69e45092c..c7f45a34e86 100644 --- a/plugins/modules/aws_elasticbeanstalk_app.py +++ b/plugins/modules/aws_elasticbeanstalk_app.py @@ -45,8 +45,8 @@ - Harpreet Singh (@hsingh) - Stephen Granger (@viper233) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -92,7 +92,7 @@ except ImportError: pass # handled 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 def describe_app(ebs, app_name, module): diff --git a/plugins/modules/aws_glue_connection.py b/plugins/modules/aws_glue_connection.py index ae9446a7963..ef1f753abf9 100644 --- a/plugins/modules/aws_glue_connection.py +++ b/plugins/modules/aws_glue_connection.py @@ -64,8 +64,8 @@ - The subnet ID used by the connection. type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -132,8 +132,8 @@ sample: {'subnet-id':'subnet-aabbccddee'} ''' -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, get_ec2_security_group_ids_from_names +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, get_ec2_security_group_ids_from_names # Non-ansible imports import copy diff --git a/plugins/modules/aws_glue_job.py b/plugins/modules/aws_glue_job.py index 1bd8e8eaf64..6fbe23603d8 100644 --- a/plugins/modules/aws_glue_job.py +++ b/plugins/modules/aws_glue_job.py @@ -78,8 +78,8 @@ - The job timeout in minutes. type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -187,8 +187,8 @@ sample: 300 ''' -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 # Non-ansible imports import copy diff --git a/plugins/modules/aws_inspector_target.py b/plugins/modules/aws_inspector_target.py index c31456ccff7..1d33ec00411 100644 --- a/plugins/modules/aws_inspector_target.py +++ b/plugins/modules/aws_inspector_target.py @@ -38,8 +38,8 @@ - Required if C(state=present). type: dict extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: - boto3 @@ -101,9 +101,9 @@ sample: "2018-01-29T13:48:51.958000+00:00" ''' -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.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.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict, camel_dict_to_snake_dict, diff --git a/plugins/modules/aws_kms.py b/plugins/modules/aws_kms.py index 2ba02bf70f7..5ad254ed6c9 100644 --- a/plugins/modules/aws_kms.py +++ b/plugins/modules/aws_kms.py @@ -172,8 +172,8 @@ - Will Thames (@willthames) - Mark Chappell (@tremble) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -396,10 +396,10 @@ 'admin': 'Allow access for Key Administrators' } -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.ansible.amazon.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import compare_aws_tags, 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 AWSRetry, camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags, compare_policies from ansible.module_utils.six import string_types import json diff --git a/plugins/modules/aws_kms_info.py b/plugins/modules/aws_kms_info.py index 3e47206ecab..c615d3a293f 100644 --- a/plugins/modules/aws_kms_info.py +++ b/plugins/modules/aws_kms_info.py @@ -31,8 +31,8 @@ default: False type: bool extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -219,9 +219,9 @@ 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 -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AWSRetry, camel_dict_to_snake_dict, HAS_BOTO3 -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry, camel_dict_to_snake_dict, HAS_BOTO3 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict import traceback diff --git a/plugins/modules/aws_region_info.py b/plugins/modules/aws_region_info.py index 2427beb0841..dee88d852ba 100644 --- a/plugins/modules/aws_region_info.py +++ b/plugins/modules/aws_region_info.py @@ -28,8 +28,8 @@ default: {} type: dict extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: [botocore, boto3] ''' @@ -59,8 +59,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 diff --git a/plugins/modules/aws_s3_bucket_info.py b/plugins/modules/aws_s3_bucket_info.py index 1b8d4eefb0d..46f2f20117b 100644 --- a/plugins/modules/aws_s3_bucket_info.py +++ b/plugins/modules/aws_s3_bucket_info.py @@ -23,8 +23,8 @@ Note that the M(aws_s3_bucket_info) module no longer returns C(ansible_facts)! author: "Gerben Geijteman (@hyperized)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -61,12 +61,12 @@ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils._text import to_native -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (boto3_conn, - ec2_argument_spec, - HAS_BOTO3, - camel_dict_to_snake_dict, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (boto3_conn, + ec2_argument_spec, + HAS_BOTO3, + camel_dict_to_snake_dict, + get_aws_connection_info, + ) def get_bucket_list(module, connection): diff --git a/plugins/modules/aws_s3_cors.py b/plugins/modules/aws_s3_cors.py index 5bb05bc59fb..272b177e6cf 100644 --- a/plugins/modules/aws_s3_cors.py +++ b/plugins/modules/aws_s3_cors.py @@ -34,8 +34,8 @@ choices: [ 'present', 'absent' ] type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -101,8 +101,8 @@ except Exception: 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 snake_dict_to_camel_dict, compare_policies +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, compare_policies def create_or_update_bucket_cors(connection, module): diff --git a/plugins/modules/aws_secret.py b/plugins/modules/aws_secret.py index ff6fb88358e..afcb2976c3b 100644 --- a/plugins/modules/aws_secret.py +++ b/plugins/modules/aws_secret.py @@ -72,8 +72,8 @@ default: 30 type: int extends_documentation_fragment: -- ansible.amazon.ec2 -- ansible.amazon.aws +- amazon.aws.ec2 +- amazon.aws.aws ''' @@ -134,9 +134,9 @@ ''' from ansible.module_utils._text import to_bytes -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.ansible.amazon.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, compare_aws_tags, ansible_dict_to_boto3_tag_list +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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, compare_aws_tags, ansible_dict_to_boto3_tag_list try: from botocore.exceptions import BotoCoreError, ClientError diff --git a/plugins/modules/aws_ses_identity.py b/plugins/modules/aws_ses_identity.py index 2afc5d6abfd..ccc40344fe4 100644 --- a/plugins/modules/aws_ses_identity.py +++ b/plugins/modules/aws_ses_identity.py @@ -91,8 +91,8 @@ default: True requirements: [ 'botocore', 'boto3' ] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -222,8 +222,8 @@ type: bool ''' -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, get_aws_connection_info +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, get_aws_connection_info import time diff --git a/plugins/modules/aws_ses_identity_policy.py b/plugins/modules/aws_ses_identity_policy.py index 08cf4a7b7ac..5bbf91343b8 100644 --- a/plugins/modules/aws_ses_identity_policy.py +++ b/plugins/modules/aws_ses_identity_policy.py @@ -42,8 +42,8 @@ type: str requirements: [ 'botocore', 'boto3' ] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -86,8 +86,8 @@ sample: [ExamplePolicy] ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import compare_policies, AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies, AWSRetry import json diff --git a/plugins/modules/aws_ses_rule_set.py b/plugins/modules/aws_ses_rule_set.py index 4c9fd730a11..b5e78d1b419 100644 --- a/plugins/modules/aws_ses_rule_set.py +++ b/plugins/modules/aws_ses_rule_set.py @@ -48,8 +48,8 @@ required: False default: False extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -102,8 +102,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, AWSRetry +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 try: from botocore.exceptions import BotoCoreError, ClientError diff --git a/plugins/modules/aws_sgw_info.py b/plugins/modules/aws_sgw_info.py index 2a734cbde2a..b1ac00ef70c 100644 --- a/plugins/modules/aws_sgw_info.py +++ b/plugins/modules/aws_sgw_info.py @@ -46,8 +46,8 @@ required: false default: true extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -175,8 +175,8 @@ region: eu-west-3 ''' -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 diff --git a/plugins/modules/aws_ssm_parameter_store.py b/plugins/modules/aws_ssm_parameter_store.py index ebfafee4c41..9e0683d1c85 100644 --- a/plugins/modules/aws_ssm_parameter_store.py +++ b/plugins/modules/aws_ssm_parameter_store.py @@ -72,8 +72,8 @@ - Bill Wang (@ozbillwang) - Michael De La Rue (@mikedlr) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: [ botocore, boto3 ] ''' @@ -128,7 +128,7 @@ type: dict ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule try: from botocore.exceptions import ClientError diff --git a/plugins/modules/aws_step_functions_state_machine.py b/plugins/modules/aws_step_functions_state_machine.py index bde78d7f1e0..9a9bdf365a4 100644 --- a/plugins/modules/aws_step_functions_state_machine.py +++ b/plugins/modules/aws_step_functions_state_machine.py @@ -60,8 +60,8 @@ type: bool extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 author: @@ -101,12 +101,12 @@ returned: always ''' -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_tag_list, - AWSRetry, - compare_aws_tags, - 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 (ansible_dict_to_boto3_tag_list, + AWSRetry, + compare_aws_tags, + boto3_tag_list_to_ansible_dict, + ) try: from botocore.exceptions import ClientError, BotoCoreError diff --git a/plugins/modules/aws_step_functions_state_machine_execution.py b/plugins/modules/aws_step_functions_state_machine_execution.py index 29ed1634ee7..d4c2b7324d4 100644 --- a/plugins/modules/aws_step_functions_state_machine_execution.py +++ b/plugins/modules/aws_step_functions_state_machine_execution.py @@ -51,8 +51,8 @@ default: '' extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 author: @@ -93,8 +93,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: from botocore.exceptions import ClientError, BotoCoreError diff --git a/plugins/modules/aws_waf_condition.py b/plugins/modules/aws_waf_condition.py index 1b2c887f67f..c9184103cb7 100644 --- a/plugins/modules/aws_waf_condition.py +++ b/plugins/modules/aws_waf_condition.py @@ -21,8 +21,8 @@ - Will Thames (@willthames) - Mike Mochan (@mmochan) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 options: name: @@ -404,10 +404,10 @@ 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, AWSRetry, compare_policies -from ansible_collections.ansible.amazon.plugins.module_utils.aws.waf import run_func_with_change_token_backoff, MATCH_LOOKUP -from ansible_collections.ansible.amazon.plugins.module_utils.aws.waf import get_rule_with_backoff, list_rules_with_backoff, list_regional_rules_with_backoff +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, compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.aws.waf import run_func_with_change_token_backoff, MATCH_LOOKUP +from ansible_collections.amazon.aws.plugins.module_utils.aws.waf import get_rule_with_backoff, list_rules_with_backoff, list_regional_rules_with_backoff class Condition(object): diff --git a/plugins/modules/aws_waf_info.py b/plugins/modules/aws_waf_info.py index 5da7e6cff9f..8b3b6e87da7 100644 --- a/plugins/modules/aws_waf_info.py +++ b/plugins/modules/aws_waf_info.py @@ -31,8 +31,8 @@ - Mike Mochan (@mmochan) - Will Thames (@willthames) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -118,8 +118,8 @@ ] ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule -from ansible_collections.ansible.amazon.plugins.module_utils.aws.waf import list_web_acls, get_web_acl +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.waf import list_web_acls, get_web_acl def main(): diff --git a/plugins/modules/aws_waf_rule.py b/plugins/modules/aws_waf_rule.py index 0475c6447b5..95dc831acbf 100644 --- a/plugins/modules/aws_waf_rule.py +++ b/plugins/modules/aws_waf_rule.py @@ -21,8 +21,8 @@ - Mike Mochan (@mmochan) - Will Thames (@willthames) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 options: name: @@ -148,17 +148,17 @@ 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.ansible.amazon.plugins.module_utils.aws.waf import (run_func_with_change_token_backoff, - list_rules_with_backoff, - list_regional_rules_with_backoff, - MATCH_LOOKUP, - ) -from ansible_collections.ansible.amazon.plugins.module_utils.aws.waf import (get_web_acl_with_backoff, - list_web_acls_with_backoff, - list_regional_web_acls_with_backoff, - ) +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 +from ansible_collections.amazon.aws.plugins.module_utils.aws.waf import (run_func_with_change_token_backoff, + list_rules_with_backoff, + list_regional_rules_with_backoff, + MATCH_LOOKUP, + ) +from ansible_collections.amazon.aws.plugins.module_utils.aws.waf import (get_web_acl_with_backoff, + list_web_acls_with_backoff, + list_regional_web_acls_with_backoff, + ) def get_rule_by_name(client, module, name): diff --git a/plugins/modules/aws_waf_web_acl.py b/plugins/modules/aws_waf_web_acl.py index ee6f103a825..a942a4cb77a 100644 --- a/plugins/modules/aws_waf_web_acl.py +++ b/plugins/modules/aws_waf_web_acl.py @@ -20,8 +20,8 @@ - Mike Mochan (@mmochan) - Will Thames (@willthames) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 options: name: @@ -166,15 +166,15 @@ import re -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 camel_dict_to_snake_dict -from ansible_collections.ansible.amazon.plugins.module_utils.aws.waf import (list_rules_with_backoff, - list_web_acls_with_backoff, - list_regional_web_acls_with_backoff, - run_func_with_change_token_backoff, - list_regional_rules_with_backoff, - ) +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 camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.aws.waf import (list_rules_with_backoff, + list_web_acls_with_backoff, + list_regional_web_acls_with_backoff, + run_func_with_change_token_backoff, + list_regional_rules_with_backoff, + ) def get_web_acl_by_name(client, module, name): diff --git a/plugins/modules/cloudformation_exports_info.py b/plugins/modules/cloudformation_exports_info.py index 465608151aa..e254d1deafa 100644 --- a/plugins/modules/cloudformation_exports_info.py +++ b/plugins/modules/cloudformation_exports_info.py @@ -18,8 +18,8 @@ author: - "Michael Moyle (@mmoyle)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -40,8 +40,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 AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry try: from botocore.exceptions import ClientError diff --git a/plugins/modules/cloudformation_stack_set.py b/plugins/modules/cloudformation_stack_set.py index 5636a084a6b..6d20469c764 100644 --- a/plugins/modules/cloudformation_stack_set.py +++ b/plugins/modules/cloudformation_stack_set.py @@ -173,8 +173,8 @@ author: "Ryan Scott Brown (@ryansb)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: [ boto3>=1.6, botocore>=1.10.26 ] ''' @@ -312,12 +312,12 @@ # handled by AnsibleAWSModule pass -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (AWSRetry, - boto3_tag_list_to_ansible_dict, - ansible_dict_to_boto3_tag_list, - camel_dict_to_snake_dict, - ) -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (AWSRetry, + boto3_tag_list_to_ansible_dict, + ansible_dict_to_boto3_tag_list, + camel_dict_to_snake_dict, + ) +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code from ansible.module_utils._text import to_native diff --git a/plugins/modules/cloudfront_distribution.py b/plugins/modules/cloudfront_distribution.py index e4dce8cd27a..1b7a8f07eab 100644 --- a/plugins/modules/cloudfront_distribution.py +++ b/plugins/modules/cloudfront_distribution.py @@ -30,8 +30,8 @@ - Will Thames (@willthames) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 options: @@ -1376,11 +1376,11 @@ ''' from ansible.module_utils._text 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.cloudfront_facts import CloudFrontFactsServiceManager +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.cloudfront_facts import CloudFrontFactsServiceManager from ansible.module_utils.common.dict_transformations import recursive_diff -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import compare_aws_tags, ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict -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.ec2 import compare_aws_tags, ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, snake_dict_to_camel_dict import datetime try: diff --git a/plugins/modules/cloudfront_info.py b/plugins/modules/cloudfront_info.py index 1850b027c43..71f584b852a 100644 --- a/plugins/modules/cloudfront_info.py +++ b/plugins/modules/cloudfront_info.py @@ -149,8 +149,8 @@ type: bool extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -265,8 +265,8 @@ type: dict ''' -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import get_aws_connection_info, ec2_argument_spec, boto3_conn, HAS_BOTO3 -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, ec2_argument_spec, boto3_conn, HAS_BOTO3 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, camel_dict_to_snake_dict from ansible.module_utils.basic import AnsibleModule from functools import partial import traceback diff --git a/plugins/modules/cloudfront_invalidation.py b/plugins/modules/cloudfront_invalidation.py index 5de20501939..1cf6f3dfa7e 100644 --- a/plugins/modules/cloudfront_invalidation.py +++ b/plugins/modules/cloudfront_invalidation.py @@ -26,8 +26,8 @@ author: Willem van Ketwich (@wilvk) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 options: @@ -138,10 +138,10 @@ sample: https://cloudfront.amazonaws.com/2017-03-25/distribution/E1ZID6KZJECZY7/invalidation/I2G9MOWJZFV622 ''' -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import snake_dict_to_camel_dict -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule -from ansible_collections.ansible.amazon.plugins.module_utils.aws.cloudfront_facts import CloudFrontFactsServiceManager +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import snake_dict_to_camel_dict +from ansible_collections.amazon.aws.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.aws.cloudfront_facts import CloudFrontFactsServiceManager import datetime try: diff --git a/plugins/modules/cloudfront_origin_access_identity.py b/plugins/modules/cloudfront_origin_access_identity.py index d175483d271..9e788fdc21f 100644 --- a/plugins/modules/cloudfront_origin_access_identity.py +++ b/plugins/modules/cloudfront_origin_access_identity.py @@ -29,8 +29,8 @@ author: Willem van Ketwich (@wilvk) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 options: @@ -122,9 +122,9 @@ ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.cloudfront_facts import CloudFrontFactsServiceManager -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.cloudfront_facts import CloudFrontFactsServiceManager +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule import datetime from functools import partial import json diff --git a/plugins/modules/cloudtrail.py b/plugins/modules/cloudtrail.py index 087419f6917..5fb0858d9ab 100644 --- a/plugins/modules/cloudtrail.py +++ b/plugins/modules/cloudtrail.py @@ -103,8 +103,8 @@ type: dict extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -258,11 +258,11 @@ 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, - ansible_dict_to_boto3_tag_list, - 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, + ansible_dict_to_boto3_tag_list, + boto3_tag_list_to_ansible_dict, + ) def create_trail(module, client, ct_params): diff --git a/plugins/modules/cloudwatchevent_rule.py b/plugins/modules/cloudwatchevent_rule.py index 49c6acc65fd..8167ac6a3de 100644 --- a/plugins/modules/cloudwatchevent_rule.py +++ b/plugins/modules/cloudwatchevent_rule.py @@ -18,8 +18,8 @@ description: - This module creates and manages CloudWatch event rules and targets. extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 author: "Jim Dalton (@jsdalton) " requirements: @@ -158,8 +158,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 CloudWatchEventRule(object): diff --git a/plugins/modules/cloudwatchlogs_log_group.py b/plugins/modules/cloudwatchlogs_log_group.py index 9b6e34c12e0..af883b32d15 100644 --- a/plugins/modules/cloudwatchlogs_log_group.py +++ b/plugins/modules/cloudwatchlogs_log_group.py @@ -67,8 +67,8 @@ required: false type: bool extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -134,12 +134,12 @@ import traceback from ansible.module_utils._text import to_native from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3, - camel_dict_to_snake_dict, - boto3_conn, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (HAS_BOTO3, + camel_dict_to_snake_dict, + boto3_conn, + ec2_argument_spec, + get_aws_connection_info, + ) try: import botocore diff --git a/plugins/modules/cloudwatchlogs_log_group_info.py b/plugins/modules/cloudwatchlogs_log_group_info.py index 06c857cde06..4bbc25534d2 100644 --- a/plugins/modules/cloudwatchlogs_log_group_info.py +++ b/plugins/modules/cloudwatchlogs_log_group_info.py @@ -26,8 +26,8 @@ - The name or prefix of the log group to filter by. type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -76,12 +76,12 @@ import traceback from ansible.module_utils._text import to_native from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3, - camel_dict_to_snake_dict, - boto3_conn, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (HAS_BOTO3, + camel_dict_to_snake_dict, + boto3_conn, + ec2_argument_spec, + get_aws_connection_info, + ) try: import botocore diff --git a/plugins/modules/cloudwatchlogs_log_group_metric_filter.py b/plugins/modules/cloudwatchlogs_log_group_metric_filter.py index 512e49a3cba..52f7f3c9306 100644 --- a/plugins/modules/cloudwatchlogs_log_group_metric_filter.py +++ b/plugins/modules/cloudwatchlogs_log_group_metric_filter.py @@ -63,8 +63,8 @@ - The value to emit when a filter pattern does not match a log event. type: float extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -99,8 +99,8 @@ log_group_name: metric_filter_count: """ -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code, get_boto3_client_method_parameters -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, is_boto3_error_code, get_boto3_client_method_parameters +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict try: from botocore.exceptions import ClientError, BotoCoreError, WaiterError diff --git a/plugins/modules/data_pipeline.py b/plugins/modules/data_pipeline.py index d734e32e249..5637c590ed4 100644 --- a/plugins/modules/data_pipeline.py +++ b/plugins/modules/data_pipeline.py @@ -20,8 +20,8 @@ requirements: [ "boto3" ] short_description: Create and manage AWS Datapipelines extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 description: - Create and manage AWS Datapipelines. Creation is not idempotent in AWS, so the C(uniqueId) is created by hashing the options (minus objects) @@ -214,7 +214,7 @@ HAS_BOTO3 = False 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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ec2_argument_spec, get_aws_connection_info, boto3_conn, camel_dict_to_snake_dict from ansible.module_utils._text import to_text diff --git a/plugins/modules/dms_endpoint.py b/plugins/modules/dms_endpoint.py index b4f24643c66..aac3f2aeab4 100644 --- a/plugins/modules/dms_endpoint.py +++ b/plugins/modules/dms_endpoint.py @@ -147,8 +147,8 @@ author: - "Rui Moreira (@ruimoreira)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -172,8 +172,8 @@ RETURN = ''' # ''' __metaclass__ = type 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.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 try: import botocore except ImportError: diff --git a/plugins/modules/dms_replication_subnet_group.py b/plugins/modules/dms_replication_subnet_group.py index 2a786ff78fd..3dfc121d3af 100644 --- a/plugins/modules/dms_replication_subnet_group.py +++ b/plugins/modules/dms_replication_subnet_group.py @@ -47,8 +47,8 @@ author: - "Rui Moreira (@ruimoreira)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -63,8 +63,8 @@ RETURN = ''' # ''' 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.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 try: import botocore except ImportError: diff --git a/plugins/modules/dynamodb_table.py b/plugins/modules/dynamodb_table.py index 1ecaf22184f..47a65123a84 100644 --- a/plugins/modules/dynamodb_table.py +++ b/plugins/modules/dynamodb_table.py @@ -120,8 +120,8 @@ default: 60 type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -200,13 +200,13 @@ try: import botocore - from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list, boto3_conn + from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list, boto3_conn HAS_BOTO3 = True except ImportError: HAS_BOTO3 = 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 DYNAMO_TYPE_DEFAULT = 'STRING' diff --git a/plugins/modules/dynamodb_ttl.py b/plugins/modules/dynamodb_ttl.py index b821839cdde..d4ed856c215 100644 --- a/plugins/modules/dynamodb_ttl.py +++ b/plugins/modules/dynamodb_ttl.py @@ -38,8 +38,8 @@ author: Ted Timmons (@tedder) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: [ botocore>=1.5.24, boto3 ] ''' @@ -77,12 +77,12 @@ pass from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3, - boto3_conn, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (HAS_BOTO3, + boto3_conn, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) def get_current_ttl_state(c, table_name): diff --git a/plugins/modules/ec2_ami_copy.py b/plugins/modules/ec2_ami_copy.py index 2cffae21342..832d3155a91 100644 --- a/plugins/modules/ec2_ami_copy.py +++ b/plugins/modules/ec2_ami_copy.py @@ -71,8 +71,8 @@ - Amir Moulavi (@amir343) - Tim C (@defunctio) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: - boto3 @@ -136,8 +136,8 @@ sample: ami-e689729e ''' -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, ansible_dict_to_boto3_tag_list +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, ansible_dict_to_boto3_tag_list from ansible.module_utils._text import to_native try: diff --git a/plugins/modules/ec2_asg.py b/plugins/modules/ec2_asg.py index 136fb4e3cde..3a852e1a0e3 100644 --- a/plugins/modules/ec2_asg.py +++ b/plugins/modules/ec2_asg.py @@ -239,8 +239,8 @@ type: list elements: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -532,8 +532,8 @@ import traceback 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 ( +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 ) @@ -543,7 +543,7 @@ except ImportError: pass # will be detected by imported HAS_BOTO3 -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule ASG_ATTRIBUTES = ('AvailabilityZones', 'DefaultCooldown', 'DesiredCapacity', 'HealthCheckGracePeriod', 'HealthCheckType', 'LaunchConfigurationName', diff --git a/plugins/modules/ec2_asg_info.py b/plugins/modules/ec2_asg_info.py index cf3a10b90f5..0f30eaa47bc 100644 --- a/plugins/modules/ec2_asg_info.py +++ b/plugins/modules/ec2_asg_info.py @@ -35,8 +35,8 @@ required: false type: dict extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -227,8 +227,8 @@ 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 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 def match_asg_tags(tags_to_match, asg): diff --git a/plugins/modules/ec2_asg_lifecycle_hook.py b/plugins/modules/ec2_asg_lifecycle_hook.py index f648a699207..25f143f1ce5 100644 --- a/plugins/modules/ec2_asg_lifecycle_hook.py +++ b/plugins/modules/ec2_asg_lifecycle_hook.py @@ -73,8 +73,8 @@ default: ABANDON type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: [ boto3>=1.4.4 ] @@ -104,7 +104,7 @@ ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule try: import botocore diff --git a/plugins/modules/ec2_customer_gateway.py b/plugins/modules/ec2_customer_gateway.py index c0e97c97bc8..d14ffcfbce4 100644 --- a/plugins/modules/ec2_customer_gateway.py +++ b/plugins/modules/ec2_customer_gateway.py @@ -52,8 +52,8 @@ choices: [ 'present', 'absent' ] type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -126,12 +126,12 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (boto3_conn, - AWSRetry, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (boto3_conn, + AWSRetry, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) class Ec2CustomerGatewayManager: diff --git a/plugins/modules/ec2_customer_gateway_info.py b/plugins/modules/ec2_customer_gateway_info.py index ef64be52852..65ed984f486 100644 --- a/plugins/modules/ec2_customer_gateway_info.py +++ b/plugins/modules/ec2_customer_gateway_info.py @@ -30,8 +30,8 @@ type: list elements: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -87,11 +87,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/plugins/modules/ec2_eip.py b/plugins/modules/ec2_eip.py index dba01639c32..b7441826a9b 100644 --- a/plugins/modules/ec2_eip.py +++ b/plugins/modules/ec2_eip.py @@ -86,8 +86,8 @@ - The I(wait_timeout) option does nothing and will be removed in Ansible 2.14. type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 author: "Rick Mendes (@rickmendes) " notes: @@ -226,8 +226,8 @@ except ImportError: pass # caught 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, ansible_dict_to_boto3_filter_list +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, ansible_dict_to_boto3_filter_list def associate_ip_and_device(ec2, module, address, private_ip_address, device_id, allow_reassociation, check_mode, is_instance=True): diff --git a/plugins/modules/ec2_eip_info.py b/plugins/modules/ec2_eip_info.py index b6212fb6311..047041ff755 100644 --- a/plugins/modules/ec2_eip_info.py +++ b/plugins/modules/ec2_eip_info.py @@ -28,8 +28,8 @@ default: {} type: dict extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -99,11 +99,11 @@ ''' -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, + ) try: from botocore.exceptions import (BotoCoreError, ClientError) except ImportError: diff --git a/plugins/modules/ec2_elb.py b/plugins/modules/ec2_elb.py index fb89714609c..bf77dbca503 100644 --- a/plugins/modules/ec2_elb.py +++ b/plugins/modules/ec2_elb.py @@ -56,8 +56,8 @@ default: 0 type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -96,12 +96,12 @@ HAS_BOTO = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (AnsibleAWSError, - HAS_BOTO, - connect_to_aws, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (AnsibleAWSError, + HAS_BOTO, + connect_to_aws, + ec2_argument_spec, + get_aws_connection_info, + ) class ElbManager: diff --git a/plugins/modules/ec2_elb_info.py b/plugins/modules/ec2_elb_info.py index b431c9c98e5..d83b4fe119d 100644 --- a/plugins/modules/ec2_elb_info.py +++ b/plugins/modules/ec2_elb_info.py @@ -37,8 +37,8 @@ - List of ELB names to gather information about. Pass this option to gather information about a set of ELBs, otherwise, all ELBs are returned. type: list extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -84,7 +84,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ( +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ( AWSRetry, connect_to_aws, ec2_argument_spec, diff --git a/plugins/modules/ec2_instance.py b/plugins/modules/ec2_instance.py index ca090c13d7c..0b268a6f05a 100644 --- a/plugins/modules/ec2_instance.py +++ b/plugins/modules/ec2_instance.py @@ -278,8 +278,8 @@ type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -811,16 +811,16 @@ from ansible.module_utils.six import text_type, string_types from ansible.module_utils.six.moves.urllib import parse as urlparse from ansible.module_utils._text import to_bytes, to_native -import ansible_collections.ansible.amazon.plugins.module_utils.ec2 as ec2_utils -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (AWSRetry, - ansible_dict_to_boto3_filter_list, - compare_aws_tags, - boto3_tag_list_to_ansible_dict, - ansible_dict_to_boto3_tag_list, - camel_dict_to_snake_dict, - ) - -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +import ansible_collections.amazon.aws.plugins.module_utils.ec2 as ec2_utils +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (AWSRetry, + ansible_dict_to_boto3_filter_list, + compare_aws_tags, + boto3_tag_list_to_ansible_dict, + ansible_dict_to_boto3_tag_list, + camel_dict_to_snake_dict, + ) + +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule module = None diff --git a/plugins/modules/ec2_instance_info.py b/plugins/modules/ec2_instance_info.py index 865b7d70d06..9bb1ff56e7d 100644 --- a/plugins/modules/ec2_instance_info.py +++ b/plugins/modules/ec2_instance_info.py @@ -37,8 +37,8 @@ type: dict extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -503,13 +503,13 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (ansible_dict_to_boto3_filter_list, - boto3_conn, - boto3_tag_list_to_ansible_dict, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ansible_dict_to_boto3_filter_list, + boto3_conn, + boto3_tag_list_to_ansible_dict, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) def list_ec2_instances(connection, module): diff --git a/plugins/modules/ec2_launch_template.py b/plugins/modules/ec2_launch_template.py index 0aa7d68b81d..2de514ad247 100644 --- a/plugins/modules/ec2_launch_template.py +++ b/plugins/modules/ec2_launch_template.py @@ -24,8 +24,8 @@ - botocore - boto3 >= 1.6.0 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 author: - Ryan Scott Brown (@ryansb) @@ -369,13 +369,13 @@ from uuid import uuid4 from ansible.module_utils._text import to_text -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code, get_boto3_client_method_parameters +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code, get_boto3_client_method_parameters from ansible.module_utils.common.dict_transformations 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, - AWSRetry, - boto3_tag_list_to_ansible_dict, - ansible_dict_to_boto3_tag_list, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ansible_dict_to_boto3_tag_list, + AWSRetry, + boto3_tag_list_to_ansible_dict, + ansible_dict_to_boto3_tag_list, + ) try: from botocore.exceptions import ClientError, BotoCoreError, WaiterError diff --git a/plugins/modules/ec2_lc.py b/plugins/modules/ec2_lc.py index 6d168583e49..5211391d1cf 100644 --- a/plugins/modules/ec2_lc.py +++ b/plugins/modules/ec2_lc.py @@ -184,8 +184,8 @@ type: bool extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: @@ -454,15 +454,15 @@ import traceback -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (get_aws_connection_info, - ec2_argument_spec, - ec2_connect, - camel_dict_to_snake_dict, - get_ec2_security_group_ids_from_names, - boto3_conn, - snake_dict_to_camel_dict, - HAS_BOTO3, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (get_aws_connection_info, + ec2_argument_spec, + ec2_connect, + camel_dict_to_snake_dict, + get_ec2_security_group_ids_from_names, + boto3_conn, + snake_dict_to_camel_dict, + HAS_BOTO3, + ) from ansible.module_utils._text import to_text from ansible.module_utils.basic import AnsibleModule diff --git a/plugins/modules/ec2_lc_find.py b/plugins/modules/ec2_lc_find.py index 1ba21ae382f..8ff3ddb0c39 100644 --- a/plugins/modules/ec2_lc_find.py +++ b/plugins/modules/ec2_lc_find.py @@ -46,8 +46,8 @@ - "python >= 2.6" - boto3 extends_documentation_fragment: -- ansible.amazon.ec2 -- ansible.amazon.aws +- amazon.aws.ec2 +- amazon.aws.aws ''' @@ -142,7 +142,7 @@ import re 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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info def find_launch_configs(client, module): diff --git a/plugins/modules/ec2_lc_info.py b/plugins/modules/ec2_lc_info.py index d0f340ca597..9a16f2fd0ab 100644 --- a/plugins/modules/ec2_lc_info.py +++ b/plugins/modules/ec2_lc_info.py @@ -51,8 +51,8 @@ - Corresponds to Python slice notation. type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -163,12 +163,12 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3, - boto3_conn, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (HAS_BOTO3, + boto3_conn, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) def list_launch_configs(connection, module): diff --git a/plugins/modules/ec2_metric_alarm.py b/plugins/modules/ec2_metric_alarm.py index 05bd69654b9..6d87ea9595b 100644 --- a/plugins/modules/ec2_metric_alarm.py +++ b/plugins/modules/ec2_metric_alarm.py @@ -165,8 +165,8 @@ - 'missing' default: 'missing' extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -207,7 +207,7 @@ ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule try: from botocore.exceptions import ClientError diff --git a/plugins/modules/ec2_placement_group.py b/plugins/modules/ec2_placement_group.py index d1d26535261..f4b3a7e2fbf 100644 --- a/plugins/modules/ec2_placement_group.py +++ b/plugins/modules/ec2_placement_group.py @@ -41,8 +41,8 @@ choices: [ 'cluster', 'spread' ] type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -90,8 +90,8 @@ ''' -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 try: from botocore.exceptions import (BotoCoreError, ClientError) except ImportError: diff --git a/plugins/modules/ec2_placement_group_info.py b/plugins/modules/ec2_placement_group_info.py index f0e7092e43e..47df4dd7ed4 100644 --- a/plugins/modules/ec2_placement_group_info.py +++ b/plugins/modules/ec2_placement_group_info.py @@ -28,8 +28,8 @@ required: false default: [] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -74,7 +74,7 @@ ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule try: from botocore.exceptions import (BotoCoreError, ClientError) except ImportError: diff --git a/plugins/modules/ec2_scaling_policy.py b/plugins/modules/ec2_scaling_policy.py index 321047f709b..01b3210afde 100644 --- a/plugins/modules/ec2_scaling_policy.py +++ b/plugins/modules/ec2_scaling_policy.py @@ -53,8 +53,8 @@ - The minimum period of time (in seconds) between which autoscaling actions can take place. type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -79,12 +79,12 @@ pass # Taken care of by ec2.HAS_BOTO from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (AnsibleAWSError, - HAS_BOTO, - connect_to_aws, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (AnsibleAWSError, + HAS_BOTO, + connect_to_aws, + ec2_argument_spec, + get_aws_connection_info, + ) def create_scaling_policy(connection, module): diff --git a/plugins/modules/ec2_snapshot_copy.py b/plugins/modules/ec2_snapshot_copy.py index 89ace145e6c..98ac9c8b4df 100644 --- a/plugins/modules/ec2_snapshot_copy.py +++ b/plugins/modules/ec2_snapshot_copy.py @@ -59,8 +59,8 @@ type: dict author: Deepak Kothandan (@Deepakkothandan) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: - boto3 @@ -116,7 +116,7 @@ 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, camel_dict_to_snake_dict) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (boto3_conn, ec2_argument_spec, get_aws_connection_info, camel_dict_to_snake_dict) from ansible.module_utils._text import to_native try: diff --git a/plugins/modules/ec2_transit_gateway.py b/plugins/modules/ec2_transit_gateway.py index 8408b4369c7..9ab13d83042 100644 --- a/plugins/modules/ec2_transit_gateway.py +++ b/plugins/modules/ec2_transit_gateway.py @@ -87,8 +87,8 @@ author: "Bob Boldin (@BobBoldin)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -230,10 +230,10 @@ pass # handled by imported 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 time import sleep, time 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 ( ansible_dict_to_boto3_tag_list, ansible_dict_to_boto3_filter_list, AWSRetry, diff --git a/plugins/modules/ec2_transit_gateway_info.py b/plugins/modules/ec2_transit_gateway_info.py index 041e88ae638..e4fbb14821e 100644 --- a/plugins/modules/ec2_transit_gateway_info.py +++ b/plugins/modules/ec2_transit_gateway_info.py @@ -33,8 +33,8 @@ See U(https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeTransitGateways.html) for filters. type: dict extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -173,8 +173,8 @@ pass # handled by imported AnsibleAWSModule -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule -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.ec2 import ( AWSRetry, boto3_tag_list_to_ansible_dict, camel_dict_to_snake_dict, diff --git a/plugins/modules/ec2_vpc_egress_igw.py b/plugins/modules/ec2_vpc_egress_igw.py index cba7aa66a8c..6f0c1ab36b1 100644 --- 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 index aa55014c88b..760af35c62e 100644 --- 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 index 1436080ef17..a43ef54ac13 100644 --- 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 index 76973a6e341..43b74c163d5 100644 --- 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 index 07333c1613e..1c407a36b89 100644 --- 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 index f7c8be76b44..213cf167cd4 100644 --- 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 index 068b62845ff..b5a8d3bc251 100644 --- 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 index 5cb3236885e..09fc70de335 100644 --- 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 index bd1dde7ce7f..a4891391854 100644 --- 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 index 9e1cdd06112..28de7788ef0 100644 --- 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 index b30fb43bf59..2561a209283 100644 --- 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 index 538f40b0f0b..a90242148b2 100644 --- 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 index 2ad8b73f499..a86e9542570 100644 --- 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 index a8ba032058c..8fce681bbe8 100644 --- 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 diff --git a/plugins/modules/ec2_vpc_vgw_info.py b/plugins/modules/ec2_vpc_vgw_info.py index e6b9b96ffd0..64f522d80db 100644 --- a/plugins/modules/ec2_vpc_vgw_info.py +++ b/plugins/modules/ec2_vpc_vgw_info.py @@ -32,8 +32,8 @@ elements: str author: "Nick Aslanidis (@naslanidis)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -101,13 +101,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_virtual_gateway_info(virtual_gateway): 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/plugins/modules/ec2_win_password.py b/plugins/modules/ec2_win_password.py index ccc9ea1fb90..7ed14ed7204 100644 --- a/plugins/modules/ec2_win_password.py +++ b/plugins/modules/ec2_win_password.py @@ -54,8 +54,8 @@ type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: @@ -116,7 +116,7 @@ HAS_CRYPTOGRAPHY = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO, ec2_argument_spec, ec2_connect +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO, ec2_argument_spec, ec2_connect from ansible.module_utils._text import to_bytes diff --git a/plugins/modules/ecs_attribute.py b/plugins/modules/ecs_attribute.py index 7bec7343b64..9e812275e9e 100644 --- a/plugins/modules/ecs_attribute.py +++ b/plugins/modules/ecs_attribute.py @@ -58,8 +58,8 @@ required: true type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -121,7 +121,7 @@ HAS_BOTO3 = False 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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info class EcsAttributes(object): diff --git a/plugins/modules/ecs_cluster.py b/plugins/modules/ecs_cluster.py index 25937369ec9..6e6cc54b255 100644 --- a/plugins/modules/ecs_cluster.py +++ b/plugins/modules/ecs_cluster.py @@ -47,8 +47,8 @@ type: int default: 10 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -116,7 +116,7 @@ HAS_BOTO3 = False 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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info class EcsClusterManager: diff --git a/plugins/modules/ecs_ecr.py b/plugins/modules/ecs_ecr.py index 7989d404dd2..4d2bf1bab09 100644 --- a/plugins/modules/ecs_ecr.py +++ b/plugins/modules/ecs_ecr.py @@ -79,8 +79,8 @@ author: - David M. Lee (@leedm777) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -180,8 +180,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 boto_exception, compare_policies, sort_json_policy_dict +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto_exception, compare_policies, sort_json_policy_dict from ansible.module_utils.six import string_types diff --git a/plugins/modules/ecs_service.py b/plugins/modules/ecs_service.py index 23b1fcfea95..1446704a598 100644 --- a/plugins/modules/ecs_service.py +++ b/plugins/modules/ecs_service.py @@ -184,8 +184,8 @@ choices: ["DAEMON", "REPLICA"] type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -473,8 +473,8 @@ 'minimum_healthy_percent': 'int' } -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, map_complex_type, get_ec2_security_group_ids_from_names +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, map_complex_type, get_ec2_security_group_ids_from_names try: import botocore diff --git a/plugins/modules/ecs_service_info.py b/plugins/modules/ecs_service_info.py index 974b4fba867..f82f5c5e6a8 100644 --- a/plugins/modules/ecs_service_info.py +++ b/plugins/modules/ecs_service_info.py @@ -47,8 +47,8 @@ type: list elements: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -140,8 +140,8 @@ 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 AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry class EcsServiceManager: diff --git a/plugins/modules/ecs_tag.py b/plugins/modules/ecs_tag.py index 1a093e9fc5e..a9def34ac41 100644 --- a/plugins/modules/ecs_tag.py +++ b/plugins/modules/ecs_tag.py @@ -55,8 +55,8 @@ type: bool default: false extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -111,8 +111,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 boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list, compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list, compare_aws_tags try: from botocore.exceptions import BotoCoreError, ClientError diff --git a/plugins/modules/ecs_task.py b/plugins/modules/ecs_task.py index 717b0d8236d..41c381c269a 100644 --- a/plugins/modules/ecs_task.py +++ b/plugins/modules/ecs_task.py @@ -87,8 +87,8 @@ - Tags that will be added to ecs tasks on start and run required: false extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -216,9 +216,9 @@ type: str ''' -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.basic import missing_required_lib -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names, ansible_dict_to_boto3_tag_list +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_ec2_security_group_ids_from_names, ansible_dict_to_boto3_tag_list try: import botocore diff --git a/plugins/modules/ecs_taskdefinition.py b/plugins/modules/ecs_taskdefinition.py index 88fe6b47353..895a52d29d1 100644 --- a/plugins/modules/ecs_taskdefinition.py +++ b/plugins/modules/ecs_taskdefinition.py @@ -103,8 +103,8 @@ required: false type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -216,8 +216,8 @@ 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 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 from ansible.module_utils._text import to_text diff --git a/plugins/modules/ecs_taskdefinition_info.py b/plugins/modules/ecs_taskdefinition_info.py index c2a9f15008e..2c6fe847cea 100644 --- a/plugins/modules/ecs_taskdefinition_info.py +++ b/plugins/modules/ecs_taskdefinition_info.py @@ -32,8 +32,8 @@ required: true type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -302,8 +302,8 @@ type: str ''' -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/efs.py b/plugins/modules/efs.py index daac58e8fe7..5d72daa2c02 100644 --- a/plugins/modules/efs.py +++ b/plugins/modules/efs.py @@ -105,8 +105,8 @@ type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -238,12 +238,12 @@ except ImportError as e: 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 (compare_aws_tags, - camel_dict_to_snake_dict, - ansible_dict_to_boto3_tag_list, - 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 (compare_aws_tags, + camel_dict_to_snake_dict, + ansible_dict_to_boto3_tag_list, + boto3_tag_list_to_ansible_dict, + ) def _index_by_key(key, items): diff --git a/plugins/modules/efs_info.py b/plugins/modules/efs_info.py index ca59d179c12..69a584215fe 100644 --- a/plugins/modules/efs_info.py +++ b/plugins/modules/efs_info.py @@ -43,8 +43,8 @@ type: list elements: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -181,9 +181,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.ec2 import get_aws_connection_info, AWSRetry -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict, 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 get_aws_connection_info, AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, boto3_tag_list_to_ansible_dict from ansible.module_utils._text import to_native diff --git a/plugins/modules/elasticache.py b/plugins/modules/elasticache.py index df5b7693557..a59eadc11e9 100644 --- a/plugins/modules/elasticache.py +++ b/plugins/modules/elasticache.py @@ -96,8 +96,8 @@ type: bool default: false extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -133,12 +133,12 @@ from time import sleep from traceback import format_exc 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, - HAS_BOTO3, - camel_dict_to_snake_dict, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (ec2_argument_spec, + get_aws_connection_info, + boto3_conn, + HAS_BOTO3, + camel_dict_to_snake_dict, + ) try: import boto3 diff --git a/plugins/modules/elasticache_info.py b/plugins/modules/elasticache_info.py index 5d8537aa09b..9126ee57f4e 100644 --- a/plugins/modules/elasticache_info.py +++ b/plugins/modules/elasticache_info.py @@ -25,8 +25,8 @@ author: - Will Thames (@willthames) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -226,12 +226,12 @@ Environment: test ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (get_aws_connection_info, - 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 (get_aws_connection_info, + camel_dict_to_snake_dict, + AWSRetry, + boto3_tag_list_to_ansible_dict, + ) try: diff --git a/plugins/modules/elasticache_parameter_group.py b/plugins/modules/elasticache_parameter_group.py index d9d8d19788f..9e64320def2 100644 --- a/plugins/modules/elasticache_parameter_group.py +++ b/plugins/modules/elasticache_parameter_group.py @@ -20,8 +20,8 @@ - Returns information about the specified cache cluster. author: "Sloane Hertel (@s-hertel)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: [ boto3, botocore ] options: @@ -111,7 +111,7 @@ # import module snippets from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import boto3_conn, get_aws_connection_info, ec2_argument_spec, camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, get_aws_connection_info, ec2_argument_spec, camel_dict_to_snake_dict from ansible.module_utils._text import to_text from ansible.module_utils.six import string_types import traceback diff --git a/plugins/modules/elasticache_snapshot.py b/plugins/modules/elasticache_snapshot.py index 675e3297801..d5f1d0204b1 100644 --- a/plugins/modules/elasticache_snapshot.py +++ b/plugins/modules/elasticache_snapshot.py @@ -20,8 +20,8 @@ - Returns information about the specified snapshot. author: "Sloane Hertel (@s-hertel)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: [ boto3, botocore ] options: @@ -128,7 +128,7 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import boto3_conn, get_aws_connection_info, ec2_argument_spec, camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, get_aws_connection_info, ec2_argument_spec, camel_dict_to_snake_dict def create(module, connection, replication_id, cluster_id, name): diff --git a/plugins/modules/elasticache_subnet_group.py b/plugins/modules/elasticache_subnet_group.py index 3441439adb3..ed56153c4f9 100644 --- a/plugins/modules/elasticache_subnet_group.py +++ b/plugins/modules/elasticache_subnet_group.py @@ -40,8 +40,8 @@ elements: str author: "Tim Mahoney (@timmahoney)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -70,7 +70,7 @@ HAS_BOTO = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO, ec2_argument_spec, get_aws_connection_info +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO, ec2_argument_spec, get_aws_connection_info def main(): diff --git a/plugins/modules/elb_application_lb.py b/plugins/modules/elb_application_lb.py index bd0dea254e3..9c49e648409 100644 --- a/plugins/modules/elb_application_lb.py +++ b/plugins/modules/elb_application_lb.py @@ -176,8 +176,8 @@ default: yes type: bool extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 notes: - Listeners are matched based on port. If a listener's port is changed then a new listener will be created. @@ -457,16 +457,16 @@ sample: vpc-0011223344 ''' -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, boto3_tag_list_to_ansible_dict, compare_aws_tags +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, boto3_tag_list_to_ansible_dict, compare_aws_tags -from ansible_collections.ansible.amazon.plugins.module_utils.aws.elbv2 import (ApplicationLoadBalancer, - ELBListeners, - ELBListener, - ELBListenerRules, - ELBListenerRule, - ) -from ansible_collections.ansible.amazon.plugins.module_utils.aws.elb_utils import get_elb_listener_rules +from ansible_collections.amazon.aws.plugins.module_utils.aws.elbv2 import (ApplicationLoadBalancer, + ELBListeners, + ELBListener, + ELBListenerRules, + ELBListenerRule, + ) +from ansible_collections.amazon.aws.plugins.module_utils.aws.elb_utils import get_elb_listener_rules def create_or_update_elb(elb_obj): diff --git a/plugins/modules/elb_application_lb_info.py b/plugins/modules/elb_application_lb_info.py index 6d68f07f892..b347941ee79 100644 --- a/plugins/modules/elb_application_lb_info.py +++ b/plugins/modules/elb_application_lb_info.py @@ -32,8 +32,8 @@ type: list extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -173,12 +173,12 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (boto3_conn, - boto3_tag_list_to_ansible_dict, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (boto3_conn, + boto3_tag_list_to_ansible_dict, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) def get_elb_listeners(connection, module, elb_arn): diff --git a/plugins/modules/elb_classic_lb.py b/plugins/modules/elb_classic_lb.py index b8b08dfb4bd..5959ebaf3f0 100644 --- a/plugins/modules/elb_classic_lb.py +++ b/plugins/modules/elb_classic_lb.py @@ -132,8 +132,8 @@ type: dict extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -375,7 +375,7 @@ HAS_BOTO = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ec2_argument_spec, connect_to_aws, AnsibleAWSError, get_aws_connection_info +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ec2_argument_spec, connect_to_aws, AnsibleAWSError, get_aws_connection_info from ansible.module_utils.six import string_types from ansible.module_utils._text import to_native diff --git a/plugins/modules/elb_classic_lb_info.py b/plugins/modules/elb_classic_lb_info.py index f8c7a12f6e8..42be1a2265f 100644 --- a/plugins/modules/elb_classic_lb_info.py +++ b/plugins/modules/elb_classic_lb_info.py @@ -37,8 +37,8 @@ - List of ELB names to gather information about. Pass this option to gather information about a set of ELBs, otherwise, all ELBs are returned. type: list extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: - botocore @@ -144,8 +144,8 @@ vpc_id: vpc-c248fda4 ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule -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.ec2 import ( AWSRetry, camel_dict_to_snake_dict, boto3_tag_list_to_ansible_dict diff --git a/plugins/modules/elb_instance.py b/plugins/modules/elb_instance.py index e7337a81af7..9bd2560a93a 100644 --- a/plugins/modules/elb_instance.py +++ b/plugins/modules/elb_instance.py @@ -61,8 +61,8 @@ default: 0 type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -101,12 +101,12 @@ HAS_BOTO = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (AnsibleAWSError, - HAS_BOTO, - connect_to_aws, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (AnsibleAWSError, + HAS_BOTO, + connect_to_aws, + ec2_argument_spec, + get_aws_connection_info, + ) class ElbManager: diff --git a/plugins/modules/elb_network_lb.py b/plugins/modules/elb_network_lb.py index 59252419670..8e4e40c60c8 100644 --- a/plugins/modules/elb_network_lb.py +++ b/plugins/modules/elb_network_lb.py @@ -127,8 +127,8 @@ - The duration in seconds to wait, used in conjunction with I(wait). type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 notes: - Listeners are matched based on port. If a listener's port is changed then a new listener will be created. @@ -308,9 +308,9 @@ sample: vpc-0011223344 ''' -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, boto3_tag_list_to_ansible_dict, compare_aws_tags -from ansible_collections.ansible.amazon.plugins.module_utils.aws.elbv2 import NetworkLoadBalancer, ELBListeners, ELBListener +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, boto3_tag_list_to_ansible_dict, compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.aws.elbv2 import NetworkLoadBalancer, ELBListeners, ELBListener def create_or_update_elb(elb_obj): diff --git a/plugins/modules/elb_target.py b/plugins/modules/elb_target.py index e6af7bac817..438c51e7392 100644 --- a/plugins/modules/elb_target.py +++ b/plugins/modules/elb_target.py @@ -68,8 +68,8 @@ choices: [ 'present', 'absent' ] type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 notes: - If you specified a port override when you registered a target, you must specify both the target ID and the port when you deregister it. @@ -114,12 +114,12 @@ from time import time, sleep from ansible.module_utils._text import to_native from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (boto3_conn, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - AWSRetry, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (boto3_conn, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + AWSRetry, + ) try: import boto3 diff --git a/plugins/modules/elb_target_group.py b/plugins/modules/elb_target_group.py index ad27c879826..34cbd3828c5 100644 --- a/plugins/modules/elb_target_group.py +++ b/plugins/modules/elb_target_group.py @@ -162,8 +162,8 @@ default: 200 type: int extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 notes: - Once a target group has been created, only its health check can then be modified using subsequent calls @@ -381,12 +381,12 @@ 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 (camel_dict_to_snake_dict, - boto3_tag_list_to_ansible_dict, - compare_aws_tags, - ansible_dict_to_boto3_tag_list, - ) +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, + boto3_tag_list_to_ansible_dict, + compare_aws_tags, + ansible_dict_to_boto3_tag_list, + ) from distutils.version import LooseVersion diff --git a/plugins/modules/elb_target_group_info.py b/plugins/modules/elb_target_group_info.py index e1e94c4e3b1..6c3e335d485 100644 --- a/plugins/modules/elb_target_group_info.py +++ b/plugins/modules/elb_target_group_info.py @@ -43,8 +43,8 @@ type: bool extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -218,12 +218,12 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (boto3_conn, - boto3_tag_list_to_ansible_dict, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (boto3_conn, + boto3_tag_list_to_ansible_dict, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) def get_target_group_attributes(connection, module, target_group_arn): diff --git a/plugins/modules/elb_target_info.py b/plugins/modules/elb_target_info.py index aa2ec02e7db..15ca68338ff 100644 --- a/plugins/modules/elb_target_info.py +++ b/plugins/modules/elb_target_info.py @@ -34,8 +34,8 @@ - boto3 - botocore extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -219,8 +219,8 @@ # we can handle the lack of boto3 based on the ec2 module pass -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.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 class Target(object): diff --git a/plugins/modules/execute_lambda.py b/plugins/modules/execute_lambda.py index 6c3ff264ae1..901b83bafc5 100644 --- a/plugins/modules/execute_lambda.py +++ b/plugins/modules/execute_lambda.py @@ -18,8 +18,8 @@ - This module executes AWS Lambda functions, allowing synchronous and asynchronous invocation. extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 author: "Ryan Scott Brown (@ryansb) " requirements: @@ -141,7 +141,7 @@ HAS_BOTO3 = False 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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info from ansible.module_utils._text import to_native diff --git a/plugins/modules/iam.py b/plugins/modules/iam.py index a9a2f1021ae..e195a4a9adb 100644 --- a/plugins/modules/iam.py +++ b/plugins/modules/iam.py @@ -97,8 +97,8 @@ - "Jonathan I. Davila (@defionscode)" - "Paul Seiffert (@seiffert)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -189,12 +189,12 @@ pass # Taken care of by ec2.HAS_BOTO from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO, - boto_exception, - connect_to_aws, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (HAS_BOTO, + boto_exception, + connect_to_aws, + ec2_argument_spec, + get_aws_connection_info, + ) def _paginate(func, attr): diff --git a/plugins/modules/iam_cert.py b/plugins/modules/iam_cert.py index 38a979e9672..c48b122dbd9 100644 --- a/plugins/modules/iam_cert.py +++ b/plugins/modules/iam_cert.py @@ -81,8 +81,8 @@ requirements: [ "boto" ] author: Jonathan I. Davila (@defionscode) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -120,7 +120,7 @@ ''' from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ec2_argument_spec, get_aws_connection_info, connect_to_aws +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ec2_argument_spec, get_aws_connection_info, connect_to_aws import os try: diff --git a/plugins/modules/iam_group.py b/plugins/modules/iam_group.py index 7ce18593e0a..cfac6062c46 100644 --- a/plugins/modules/iam_group.py +++ b/plugins/modules/iam_group.py @@ -71,8 +71,8 @@ type: bool requirements: [ botocore, boto3 ] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -180,9 +180,9 @@ sample: / ''' -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.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 camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry try: from botocore.exceptions import BotoCoreError, ClientError diff --git a/plugins/modules/iam_managed_policy.py b/plugins/modules/iam_managed_policy.py index fd393359f24..435d2dcf800 100644 --- a/plugins/modules/iam_managed_policy.py +++ b/plugins/modules/iam_managed_policy.py @@ -54,8 +54,8 @@ author: "Dan Kozlowski (@dkhenry)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: - boto3 @@ -128,14 +128,14 @@ pass # caught by imported HAS_BOTO3 from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (boto3_conn, - get_aws_connection_info, - ec2_argument_spec, - AWSRetry, - camel_dict_to_snake_dict, - HAS_BOTO3, - compare_policies, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (boto3_conn, + get_aws_connection_info, + ec2_argument_spec, + AWSRetry, + camel_dict_to_snake_dict, + HAS_BOTO3, + compare_policies, + ) from ansible.module_utils._text import to_native diff --git a/plugins/modules/iam_mfa_device_info.py b/plugins/modules/iam_mfa_device_info.py index 6f7b9f1e3da..12dae087a70 100644 --- a/plugins/modules/iam_mfa_device_info.py +++ b/plugins/modules/iam_mfa_device_info.py @@ -25,8 +25,8 @@ - The name of the user whose MFA devices will be listed type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: - boto3 @@ -70,12 +70,12 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3, - boto3_conn, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (HAS_BOTO3, + boto3_conn, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) def list_mfa_devices(connection, module): diff --git a/plugins/modules/iam_password_policy.py b/plugins/modules/iam_password_policy.py index 8eb03b96f78..ead34bf8868 100644 --- a/plugins/modules/iam_password_policy.py +++ b/plugins/modules/iam_password_policy.py @@ -80,8 +80,8 @@ type: bool aliases: [password_expire, expire] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -107,8 +107,8 @@ 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 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 IAMConnection(object): diff --git a/plugins/modules/iam_policy.py b/plugins/modules/iam_policy.py index 97209071845..87c7895bfb8 100644 --- a/plugins/modules/iam_policy.py +++ b/plugins/modules/iam_policy.py @@ -65,8 +65,8 @@ - "Jonathan I. Davila (@defionscode)" - "Dennis Podkovyrin (@sbj-ss)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -121,8 +121,8 @@ except ImportError: pass -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_policies from ansible.module_utils.six import string_types diff --git a/plugins/modules/iam_policy_info.py b/plugins/modules/iam_policy_info.py index 5e272784d18..b80428938f1 100644 --- a/plugins/modules/iam_policy_info.py +++ b/plugins/modules/iam_policy_info.py @@ -38,8 +38,8 @@ - Mark Chappell (@tremble) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -87,7 +87,7 @@ except ImportError: pass -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.six import string_types diff --git a/plugins/modules/iam_role.py b/plugins/modules/iam_role.py index d7da07b005c..fafa00541dc 100644 --- a/plugins/modules/iam_role.py +++ b/plugins/modules/iam_role.py @@ -93,8 +93,8 @@ type: bool requirements: [ botocore, boto3 ] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -196,13 +196,13 @@ import json -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, compare_policies -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (AWSRetry, - ansible_dict_to_boto3_tag_list, - boto3_tag_list_to_ansible_dict, - compare_aws_tags, - ) +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, compare_policies +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (AWSRetry, + ansible_dict_to_boto3_tag_list, + boto3_tag_list_to_ansible_dict, + compare_aws_tags, + ) try: from botocore.exceptions import ClientError, BotoCoreError diff --git a/plugins/modules/iam_role_info.py b/plugins/modules/iam_role_info.py index 5a3753fd524..9912cfdaa20 100644 --- a/plugins/modules/iam_role_info.py +++ b/plugins/modules/iam_role_info.py @@ -35,8 +35,8 @@ - Mutually exclusive with I(name). type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -156,8 +156,8 @@ 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 boto3_tag_list_to_ansible_dict, camel_dict_to_snake_dict, AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, camel_dict_to_snake_dict, AWSRetry @AWSRetry.exponential_backoff() diff --git a/plugins/modules/iam_saml_federation.py b/plugins/modules/iam_saml_federation.py index 34f0db647a9..0d6f3e3f474 100644 --- a/plugins/modules/iam_saml_federation.py +++ b/plugins/modules/iam_saml_federation.py @@ -47,8 +47,8 @@ choices: [ "present", "absent" ] type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 author: - Tony (@axc450) @@ -111,8 +111,8 @@ except ImportError: pass -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 class SAMLProviderManager: diff --git a/plugins/modules/iam_server_certificate_info.py b/plugins/modules/iam_server_certificate_info.py index a17d460e87e..771d374a9fe 100644 --- a/plugins/modules/iam_server_certificate_info.py +++ b/plugins/modules/iam_server_certificate_info.py @@ -26,8 +26,8 @@ - The name of the server certificate you are retrieving attributes for. type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -91,7 +91,7 @@ HAS_BOTO3 = False 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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info def get_server_certs(iam, name=None): diff --git a/plugins/modules/iam_user.py b/plugins/modules/iam_user.py index f66738022bb..8bf60f97ca9 100644 --- a/plugins/modules/iam_user.py +++ b/plugins/modules/iam_user.py @@ -44,8 +44,8 @@ aliases: ['purge_policy', 'purge_managed_policies'] requirements: [ botocore, boto3 ] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -108,8 +108,8 @@ ''' 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 +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 import traceback diff --git a/plugins/modules/iam_user_info.py b/plugins/modules/iam_user_info.py index d478f3306d3..b87a0763823 100644 --- a/plugins/modules/iam_user_info.py +++ b/plugins/modules/iam_user_info.py @@ -46,8 +46,8 @@ - botocore - boto3 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -107,8 +107,8 @@ sample: "test_user" ''' -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.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 try: import botocore diff --git a/plugins/modules/kinesis_stream.py b/plugins/modules/kinesis_stream.py index 33db98eca1b..2ed339c5bd0 100644 --- a/plugins/modules/kinesis_stream.py +++ b/plugins/modules/kinesis_stream.py @@ -78,8 +78,8 @@ - The GUID or alias for the KMS key. type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -194,7 +194,7 @@ pass # Taken care of by ec2.HAS_BOTO3 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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3, boto3_conn, ec2_argument_spec, get_aws_connection_info from ansible.module_utils._text import to_native diff --git a/plugins/modules/lambda.py b/plugins/modules/lambda.py index bf79bba0967..cad268c72ae 100644 --- a/plugins/modules/lambda.py +++ b/plugins/modules/lambda.py @@ -115,8 +115,8 @@ author: - 'Steyn Huizinga (@steynovich)' extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -216,9 +216,9 @@ ''' 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 get_aws_connection_info, boto3_conn, camel_dict_to_snake_dict -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn, camel_dict_to_snake_dict +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import compare_aws_tags import base64 import hashlib import traceback diff --git a/plugins/modules/lambda_alias.py b/plugins/modules/lambda_alias.py index ca2188c43a4..649fe95bf10 100644 --- a/plugins/modules/lambda_alias.py +++ b/plugins/modules/lambda_alias.py @@ -53,8 +53,8 @@ requirements: - boto3 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -155,12 +155,12 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3, - boto3_conn, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (HAS_BOTO3, + boto3_conn, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) class AWSConnection: diff --git a/plugins/modules/lambda_event.py b/plugins/modules/lambda_event.py index b370e6026da..ca81d13ae95 100644 --- a/plugins/modules/lambda_event.py +++ b/plugins/modules/lambda_event.py @@ -85,8 +85,8 @@ requirements: - boto3 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -134,12 +134,12 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3, - boto3_conn, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (HAS_BOTO3, + boto3_conn, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) # --------------------------------------------------------------------------------------------------- diff --git a/plugins/modules/lambda_facts.py b/plugins/modules/lambda_facts.py index aa93d32ebb9..3a95ee43b2c 100644 --- a/plugins/modules/lambda_facts.py +++ b/plugins/modules/lambda_facts.py @@ -44,8 +44,8 @@ requirements: - boto3 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -89,8 +89,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 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 import json import datetime import sys diff --git a/plugins/modules/lambda_info.py b/plugins/modules/lambda_info.py index 425c47f1ea5..11e5e97186e 100644 --- a/plugins/modules/lambda_info.py +++ b/plugins/modules/lambda_info.py @@ -41,8 +41,8 @@ requirements: - boto3 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -83,8 +83,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 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 import json import datetime import re diff --git a/plugins/modules/lambda_policy.py b/plugins/modules/lambda_policy.py index 35e7a273e02..5cf1ff22760 100644 --- a/plugins/modules/lambda_policy.py +++ b/plugins/modules/lambda_policy.py @@ -102,8 +102,8 @@ requirements: - boto3 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -143,7 +143,7 @@ import json import re from ansible.module_utils._text import to_native -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule try: from botocore.exceptions import ClientError diff --git a/plugins/modules/lightsail.py b/plugins/modules/lightsail.py index c09e63283d9..09cd7ac8458 100644 --- a/plugins/modules/lightsail.py +++ b/plugins/modules/lightsail.py @@ -74,8 +74,8 @@ - boto3 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -163,8 +163,8 @@ # will be caught by AnsibleAWSModule pass -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 def find_instance_info(module, client, instance_name, fail_if_not_found=False): diff --git a/plugins/modules/rds.py b/plugins/modules/rds.py index f3eb28cdf47..1ac4a1b15ad 100644 --- a/plugins/modules/rds.py +++ b/plugins/modules/rds.py @@ -232,8 +232,8 @@ - "Bruce Pennypacker (@bpennypacker)" - "Will Thames (@willthames)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -539,8 +539,8 @@ HAS_RDS2 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AWSRetry -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO, connect_to_aws, ec2_argument_spec, get_aws_connection_info +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO, connect_to_aws, ec2_argument_spec, get_aws_connection_info DEFAULT_PORTS = { diff --git a/plugins/modules/rds_instance.py b/plugins/modules/rds_instance.py index adf27f78012..c0deddd89e3 100644 --- a/plugins/modules/rds_instance.py +++ b/plugins/modules/rds_instance.py @@ -22,8 +22,8 @@ - botocore - boto3 >= 1.5.0 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 author: - Sloane Hertel (@s-hertel) @@ -746,17 +746,17 @@ ''' from ansible.module_utils._text import to_text -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code, get_boto3_client_method_parameters -from ansible_collections.ansible.amazon.plugins.module_utils.aws.rds import (ensure_tags, - arg_spec_to_rds_params, - call_method, - get_rds_method_attribute, - get_tags, - get_final_identifier, - ) -from ansible_collections.ansible.amazon.plugins.module_utils.aws.waiters import get_waiter +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code, get_boto3_client_method_parameters +from ansible_collections.amazon.aws.plugins.module_utils.aws.rds import (ensure_tags, + arg_spec_to_rds_params, + call_method, + get_rds_method_attribute, + get_tags, + get_final_identifier, + ) +from ansible_collections.amazon.aws.plugins.module_utils.aws.waiters import get_waiter from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list, AWSRetry +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list, AWSRetry from ansible.module_utils.six import string_types from time import sleep diff --git a/plugins/modules/rds_instance_info.py b/plugins/modules/rds_instance_info.py index 717e68e0f3a..cc8535d5628 100644 --- a/plugins/modules/rds_instance_info.py +++ b/plugins/modules/rds_instance_info.py @@ -39,8 +39,8 @@ - "Will Thames (@willthames)" - "Michael De La Rue (@mikedlr)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -347,12 +347,12 @@ sample: sg-abcd1234 ''' -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 (ansible_dict_to_boto3_filter_list, - boto3_tag_list_to_ansible_dict, - 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 (ansible_dict_to_boto3_filter_list, + boto3_tag_list_to_ansible_dict, + AWSRetry, + camel_dict_to_snake_dict, + ) try: diff --git a/plugins/modules/rds_param_group.py b/plugins/modules/rds_param_group.py index 6f9f6e19f2a..bdaf7fe4e7d 100644 --- a/plugins/modules/rds_param_group.py +++ b/plugins/modules/rds_param_group.py @@ -66,8 +66,8 @@ - "Scott Anderson (@tastychutney)" - "Will Thames (@willthames)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -118,9 +118,9 @@ ''' 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 -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import camel_dict_to_snake_dict, HAS_BOTO3, compare_aws_tags -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.amazon.aws.plugins.module_utils.ec2 import ec2_argument_spec, get_aws_connection_info, boto3_conn +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import camel_dict_to_snake_dict, HAS_BOTO3, compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ansible_dict_to_boto3_tag_list, boto3_tag_list_to_ansible_dict from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE from ansible.module_utils.six import string_types from ansible.module_utils._text import to_native diff --git a/plugins/modules/rds_snapshot.py b/plugins/modules/rds_snapshot.py index 939948678af..c00d21064f8 100644 --- a/plugins/modules/rds_snapshot.py +++ b/plugins/modules/rds_snapshot.py @@ -65,8 +65,8 @@ - "Will Thames (@willthames)" - "Michael De La Rue (@mikedlr)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -206,9 +206,9 @@ pass # protected by AnsibleAWSModule # import module snippets -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, compare_aws_tags -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list +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, compare_aws_tags +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_tag_list_to_ansible_dict, ansible_dict_to_boto3_tag_list def get_snapshot(client, module, snapshot_id): diff --git a/plugins/modules/rds_snapshot_info.py b/plugins/modules/rds_snapshot_info.py index a4335195e4c..e887c3dd933 100644 --- a/plugins/modules/rds_snapshot_info.py +++ b/plugins/modules/rds_snapshot_info.py @@ -60,8 +60,8 @@ author: - "Will Thames (@willthames)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -296,8 +296,8 @@ sample: vpc-abcd1234 ''' -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, boto3_tag_list_to_ansible_dict, 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, boto3_tag_list_to_ansible_dict, camel_dict_to_snake_dict try: import botocore diff --git a/plugins/modules/rds_subnet_group.py b/plugins/modules/rds_subnet_group.py index 1bba28dfbce..b0fb417a28f 100644 --- a/plugins/modules/rds_subnet_group.py +++ b/plugins/modules/rds_subnet_group.py @@ -41,8 +41,8 @@ type: list author: "Scott Anderson (@tastychutney)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -98,7 +98,7 @@ HAS_BOTO = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO, connect_to_aws, ec2_argument_spec, get_aws_connection_info +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO, connect_to_aws, ec2_argument_spec, get_aws_connection_info def get_subnet_group_info(subnet_group): diff --git a/plugins/modules/redshift.py b/plugins/modules/redshift.py index 993e98286eb..997240aaf68 100644 --- a/plugins/modules/redshift.py +++ b/plugins/modules/redshift.py @@ -172,8 +172,8 @@ type: bool requirements: [ 'boto3' ] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -261,8 +261,8 @@ except ImportError: pass # caught by AnsibleAWSModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AWSRetry, snake_dict_to_camel_dict -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry, snake_dict_to_camel_dict +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule, is_boto3_error_code def _collect_facts(resource): diff --git a/plugins/modules/redshift_cross_region_snapshots.py b/plugins/modules/redshift_cross_region_snapshots.py index 76de6b2c89e..cd7a7c0d744 100644 --- a/plugins/modules/redshift_cross_region_snapshots.py +++ b/plugins/modules/redshift_cross_region_snapshots.py @@ -58,8 +58,8 @@ type: int requirements: [ "botocore", "boto3" ] extends_documentation_fragment: -- ansible.amazon.ec2 -- ansible.amazon.aws +- amazon.aws.ec2 +- amazon.aws.aws ''' @@ -91,7 +91,7 @@ RETURN = ''' # ''' -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule class SnapshotController(object): diff --git a/plugins/modules/redshift_info.py b/plugins/modules/redshift_info.py index b0355906456..98dd0090c94 100644 --- a/plugins/modules/redshift_info.py +++ b/plugins/modules/redshift_info.py @@ -35,8 +35,8 @@ required: false type: dict extends_documentation_fragment: -- ansible.amazon.ec2 -- ansible.amazon.aws +- amazon.aws.ec2 +- amazon.aws.aws ''' @@ -286,8 +286,8 @@ 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 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 def match_tags(tags_to_match, cluster): diff --git a/plugins/modules/redshift_subnet_group.py b/plugins/modules/redshift_subnet_group.py index 7090dcfa314..f09c028988f 100644 --- a/plugins/modules/redshift_subnet_group.py +++ b/plugins/modules/redshift_subnet_group.py @@ -46,8 +46,8 @@ elements: str requirements: [ 'boto' ] extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -94,7 +94,7 @@ HAS_BOTO = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO, connect_to_aws, ec2_argument_spec, get_aws_connection_info +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO, connect_to_aws, ec2_argument_spec, get_aws_connection_info def main(): diff --git a/plugins/modules/route53.py b/plugins/modules/route53.py index dda106e3f9b..3347f51aaca 100644 --- a/plugins/modules/route53.py +++ b/plugins/modules/route53.py @@ -137,7 +137,7 @@ - Bruce Pennypacker (@bpennypacker) - Mike Buzzetti (@jimbydamonk) extends_documentation_fragment: -- ansible.amazon.aws +- amazon.aws.aws ''' @@ -378,7 +378,7 @@ HAS_BOTO = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ec2_argument_spec, get_aws_connection_info +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ec2_argument_spec, get_aws_connection_info MINIMUM_BOTO_VERSION = '2.28.0' diff --git a/plugins/modules/route53_health_check.py b/plugins/modules/route53_health_check.py index 778b4c0595d..c974c72a5f1 100644 --- a/plugins/modules/route53_health_check.py +++ b/plugins/modules/route53_health_check.py @@ -83,8 +83,8 @@ type: int author: "zimbatm (@zimbatm)" extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -133,7 +133,7 @@ # import module snippets from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import ec2_argument_spec, get_aws_connection_info +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import ec2_argument_spec, get_aws_connection_info # Things that can't get changed: diff --git a/plugins/modules/route53_info.py b/plugins/modules/route53_info.py index a3d8d76f6de..d3d2f3abae9 100644 --- a/plugins/modules/route53_info.py +++ b/plugins/modules/route53_info.py @@ -133,8 +133,8 @@ type: str author: Karen Cheng (@Etherdaemon) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -222,7 +222,7 @@ HAS_BOTO3 = False 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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info from ansible.module_utils._text import to_native diff --git a/plugins/modules/route53_zone.py b/plugins/modules/route53_zone.py index 2d13cb9073e..698ef524996 100644 --- a/plugins/modules/route53_zone.py +++ b/plugins/modules/route53_zone.py @@ -53,8 +53,8 @@ - Note that you can't associate a reusable delegation set with a private hosted zone. type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 author: "Christopher Troup (@minichate)" ''' @@ -123,7 +123,7 @@ ''' import time -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import AnsibleAWSModule try: from botocore.exceptions import BotoCoreError, ClientError diff --git a/plugins/modules/s3_bucket_notification.py b/plugins/modules/s3_bucket_notification.py index a75e44db5a6..d61ca14e143 100644 --- a/plugins/modules/s3_bucket_notification.py +++ b/plugins/modules/s3_bucket_notification.py @@ -87,8 +87,8 @@ requirements: - boto3 extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -116,8 +116,8 @@ type: list ''' -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 ClientError, BotoCoreError diff --git a/plugins/modules/s3_lifecycle.py b/plugins/modules/s3_lifecycle.py index d1275687144..e8fb62c0814 100644 --- a/plugins/modules/s3_lifecycle.py +++ b/plugins/modules/s3_lifecycle.py @@ -123,8 +123,8 @@ - The I(requester_pays) option does nothing and will be removed in Ansible 2.14. type: bool extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -208,7 +208,7 @@ except ImportError: pass # handled 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 def create_lifecycle_rule(client, module): diff --git a/plugins/modules/s3_logging.py b/plugins/modules/s3_logging.py index 98033d04643..b13e5eea086 100644 --- a/plugins/modules/s3_logging.py +++ b/plugins/modules/s3_logging.py @@ -40,8 +40,8 @@ default: "" type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -71,7 +71,7 @@ HAS_BOTO = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import AnsibleAWSError, ec2_argument_spec, get_aws_connection_info +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AnsibleAWSError, ec2_argument_spec, get_aws_connection_info def compare_bucket_logging(bucket, target_bucket, target_prefix): diff --git a/plugins/modules/s3_sync.py b/plugins/modules/s3_sync.py index 350d9d56805..1123aea9a06 100644 --- a/plugins/modules/s3_sync.py +++ b/plugins/modules/s3_sync.py @@ -123,8 +123,8 @@ author: Ted Timmons (@tedder) extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -234,13 +234,13 @@ # import module snippets 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, - boto3_conn, - get_aws_connection_info, - HAS_BOTO3, - boto_exception, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (camel_dict_to_snake_dict, + ec2_argument_spec, + boto3_conn, + get_aws_connection_info, + HAS_BOTO3, + boto_exception, + ) from ansible.module_utils._text import to_text try: diff --git a/plugins/modules/s3_website.py b/plugins/modules/s3_website.py index eaa8bfb5baa..1c87ed73ba8 100644 --- a/plugins/modules/s3_website.py +++ b/plugins/modules/s3_website.py @@ -49,8 +49,8 @@ type: str extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -173,12 +173,12 @@ HAS_BOTO3 = False from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3, - boto3_conn, - camel_dict_to_snake_dict, - ec2_argument_spec, - get_aws_connection_info, - ) +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import (HAS_BOTO3, + boto3_conn, + camel_dict_to_snake_dict, + ec2_argument_spec, + get_aws_connection_info, + ) def _create_redirect_dict(url): diff --git a/plugins/modules/sns.py b/plugins/modules/sns.py index bb4093a0e50..97f202fdc19 100644 --- a/plugins/modules/sns.py +++ b/plugins/modules/sns.py @@ -83,8 +83,8 @@ choices: ['json', 'string'] type: str extends_documentation_fragment: -- ansible.amazon.ec2 -- ansible.amazon.aws +- amazon.aws.ec2 +- amazon.aws.aws requirements: - boto3 @@ -142,7 +142,7 @@ except ImportError: pass # Handled 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 def arn_topic_lookup(module, client, short_topic): diff --git a/plugins/modules/sns_topic.py b/plugins/modules/sns_topic.py index 82c21715e67..141906edb18 100644 --- a/plugins/modules/sns_topic.py +++ b/plugins/modules/sns_topic.py @@ -71,8 +71,8 @@ default: true type: bool extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: [ "boto" ] ''' @@ -224,8 +224,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 compare_policies, 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 compare_policies, AWSRetry, camel_dict_to_snake_dict class SnsTopicManager(object): diff --git a/plugins/modules/sqs_queue.py b/plugins/modules/sqs_queue.py index eddd8eaaa2b..ca8041f11f8 100644 --- a/plugins/modules/sqs_queue.py +++ b/plugins/modules/sqs_queue.py @@ -100,8 +100,8 @@ type: bool default: false extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 ''' @@ -223,13 +223,13 @@ ''' import json -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, - compare_aws_tags, - snake_dict_to_camel_dict, - compare_policies, - ) +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, + compare_aws_tags, + snake_dict_to_camel_dict, + compare_policies, + ) try: from botocore.exceptions import BotoCoreError, ClientError, ParamValidationError diff --git a/plugins/modules/sts_assume_role.py b/plugins/modules/sts_assume_role.py index 3c03f291706..8283c49d862 100644 --- a/plugins/modules/sts_assume_role.py +++ b/plugins/modules/sts_assume_role.py @@ -57,8 +57,8 @@ notes: - In order to use the assumed role in a following playbook task you must pass the access_key, access_secret and access_token. extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: - boto3 @@ -110,8 +110,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: from botocore.exceptions import ClientError, ParamValidationError diff --git a/plugins/modules/sts_session_token.py b/plugins/modules/sts_session_token.py index 1584dbcc50d..e83d71ffd69 100644 --- a/plugins/modules/sts_session_token.py +++ b/plugins/modules/sts_session_token.py @@ -36,8 +36,8 @@ notes: - In order to use the session token in a following playbook task you must pass the I(access_key), I(access_secret) and I(access_token). extends_documentation_fragment: -- ansible.amazon.aws -- ansible.amazon.ec2 +- amazon.aws.aws +- amazon.aws.ec2 requirements: - boto3 @@ -90,7 +90,7 @@ HAS_BOTO3 = False 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 +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import boto3_conn, ec2_argument_spec, get_aws_connection_info def normalize_credentials(credentials): diff --git a/scripts/inventory/ec2.py b/scripts/inventory/ec2.py index 92162057540..e6bf6651247 100644 --- a/scripts/inventory/ec2.py +++ b/scripts/inventory/ec2.py @@ -169,7 +169,7 @@ from boto import sts from ansible.module_utils import six -from ansible_collections.ansible.amazon.plugins.module_utils import ec2 as ec2_utils +from ansible_collections.amazon.aws.plugins.module_utils import ec2 as ec2_utils from ansible.module_utils.six.moves import configparser HAS_BOTO3 = False diff --git a/tests/integration/targets/aws_codebuild/tasks/main.yml b/tests/integration/targets/aws_codebuild/tasks/main.yml index 46a7cb7a26a..2e4a622e3dc 100644 --- a/tests/integration/targets/aws_codebuild/tasks/main.yml +++ b/tests/integration/targets/aws_codebuild/tasks/main.yml @@ -4,7 +4,7 @@ - name: Run aws_codebuild integration tests. collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/aws_eks_cluster/tasks/full_test.yml b/tests/integration/targets/aws_eks_cluster/tasks/full_test.yml index 6198d0da83f..43b1c80129b 100644 --- a/tests/integration/targets/aws_eks_cluster/tasks/full_test.yml +++ b/tests/integration/targets/aws_eks_cluster/tasks/full_test.yml @@ -2,7 +2,7 @@ # tasks file for aws_eks modules - name: aws_eks_cluster tests collections: - - ansible.amazon + - amazon.aws block: # If us-west-1 does become supported, change this test to use an unsupported region # or if all regions are supported, delete this test diff --git a/tests/integration/targets/aws_kms/tasks/main.yml b/tests/integration/targets/aws_kms/tasks/main.yml index ca80b41602c..d8408b95e9b 100644 --- a/tests/integration/targets/aws_kms/tasks/main.yml +++ b/tests/integration/targets/aws_kms/tasks/main.yml @@ -5,7 +5,7 @@ aws_secret_key: "{{ aws_secret_key }}" security_token: "{{ security_token | default(omit) }}" collections: - - ansible.amazon + - amazon.aws block: # ============================================================ diff --git a/tests/integration/targets/aws_secret/tasks/main.yaml b/tests/integration/targets/aws_secret/tasks/main.yaml index 3ad003cea43..483be47553c 100644 --- a/tests/integration/targets/aws_secret/tasks/main.yaml +++ b/tests/integration/targets/aws_secret/tasks/main.yaml @@ -6,7 +6,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: - name: retrieve caller facts diff --git a/tests/integration/targets/aws_ssm_parameter_store/tasks/main.yml b/tests/integration/targets/aws_ssm_parameter_store/tasks/main.yml index 0ef6db6a6cf..0f538df9cb9 100644 --- a/tests/integration/targets/aws_ssm_parameter_store/tasks/main.yml +++ b/tests/integration/targets/aws_ssm_parameter_store/tasks/main.yml @@ -25,7 +25,7 @@ - name: Check that parameter was stored correctly assert: that: - - "'{{lookup('ansible.amazon.aws_ssm', '/' ~ ssm_key_prefix ~ '/Hello', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token )}}' == 'World'" + - "'{{lookup('amazon.aws.aws_ssm', '/' ~ ssm_key_prefix ~ '/Hello', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token )}}' == 'World'" # ============================================================ - name: Create or update key/value pair in aws parameter store @@ -67,25 +67,25 @@ # ============================================================ - name: debug the lookup debug: - msg: "{{lookup('ansible.amazon.aws_ssm', '/' ~ ssm_key_prefix ~ '/path', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token, bypath=True )}}'" + msg: "{{lookup('amazon.aws.aws_ssm', '/' ~ ssm_key_prefix ~ '/path', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token, bypath=True )}}'" - name: Check that parameter path is stored and retrieved assert: that: - - "'{{lookup('ansible.amazon.aws_ssm', '/' ~ ssm_key_prefix ~ '/path', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token, bypath=True, shortnames=true ) | to_json }}' == '{\"toovar\": \"too value\", \"wonvar\": \"won value\"}'" + - "'{{lookup('amazon.aws.aws_ssm', '/' ~ ssm_key_prefix ~ '/path', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token, bypath=True, shortnames=true ) | to_json }}' == '{\"toovar\": \"too value\", \"wonvar\": \"won value\"}'" # ============================================================ - name: Returns empty value in case we don't find a named parameter and default filter works assert: that: - - "'{{lookup('ansible.amazon.aws_ssm', '/' ~ ssm_key_prefix ~ '/Goodbye', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token )}}' == ''" - - "'{{lookup('ansible.amazon.aws_ssm', '/' ~ ssm_key_prefix ~ '/Goodbye', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token ) | default('I_can_has_default', true)}}' == 'I_can_has_default'" + - "'{{lookup('amazon.aws.aws_ssm', '/' ~ ssm_key_prefix ~ '/Goodbye', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token )}}' == ''" + - "'{{lookup('amazon.aws.aws_ssm', '/' ~ ssm_key_prefix ~ '/Goodbye', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token ) | default('I_can_has_default', true)}}' == 'I_can_has_default'" # ============================================================ - name: Handle multiple paths with one that doesn't exist - default to full names. assert: that: - - "'{{lookup('ansible.amazon.aws_ssm', '/' ~ ssm_key_prefix ~ '/path', '/' ~ ssm_key_prefix ~ '/dont_create_this_path_you_will_break_the_ansible_tests', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token, bypath=True ) | to_json }}' in ( '[{\"/' ~ ssm_key_prefix ~ '/path/toovar\": \"too value\", \"/' ~ ssm_key_prefix ~ '/path/wonvar\": \"won value\"}, {}]', '[{\"/' ~ ssm_key_prefix ~ '/path/wonvar\": \"won value\", \"/' ~ ssm_key_prefix ~ '/path/toovar\": \"too value\"}, {}]' )" + - "'{{lookup('amazon.aws.aws_ssm', '/' ~ ssm_key_prefix ~ '/path', '/' ~ ssm_key_prefix ~ '/dont_create_this_path_you_will_break_the_ansible_tests', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token, bypath=True ) | to_json }}' in ( '[{\"/' ~ ssm_key_prefix ~ '/path/toovar\": \"too value\", \"/' ~ ssm_key_prefix ~ '/path/wonvar\": \"won value\"}, {}]', '[{\"/' ~ ssm_key_prefix ~ '/path/wonvar\": \"won value\", \"/' ~ ssm_key_prefix ~ '/path/toovar\": \"too value\"}, {}]' )" # ============================================================ @@ -95,7 +95,7 @@ - name: Handle multiple paths with one that doesn't exist - shortnames - including overlap. assert: that: - - "'{{lookup('ansible.amazon.aws_ssm', '/' ~ ssm_key_prefix ~ '/path', '/' ~ ssm_key_prefix ~ '/dont_create_this_path_you_will_break_the_ansible_tests', '/' ~ ssm_key_prefix ~ '/deeppath', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token, bypath=True, shortnames=true, recursive=true ) | to_json }}' == '[{\"toovar\": \"too value\", \"treevar\": \"tree value\", \"wonvar\": \"won value\"}, {}, {\"samevar\": \"won value\"}]'" + - "'{{lookup('amazon.aws.aws_ssm', '/' ~ ssm_key_prefix ~ '/path', '/' ~ ssm_key_prefix ~ '/dont_create_this_path_you_will_break_the_ansible_tests', '/' ~ ssm_key_prefix ~ '/deeppath', region=ec2_region, aws_access_key=ec2_access_key, aws_secret_key=ec2_secret_key, aws_security_token=security_token, bypath=True, shortnames=true, recursive=true ) | to_json }}' == '[{\"toovar\": \"too value\", \"treevar\": \"tree value\", \"wonvar\": \"won value\"}, {}, {\"samevar\": \"won value\"}]'" # ============================================================ diff --git a/tests/integration/targets/aws_step_functions_state_machine/tasks/main.yml b/tests/integration/targets/aws_step_functions_state_machine/tasks/main.yml index 1bce5dd31de..005af35f73f 100644 --- a/tests/integration/targets/aws_step_functions_state_machine/tasks/main.yml +++ b/tests/integration/targets/aws_step_functions_state_machine/tasks/main.yml @@ -8,7 +8,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/aws_waf_web_acl/tasks/main.yml b/tests/integration/targets/aws_waf_web_acl/tasks/main.yml index 040c179c9b0..7d0c8f9718a 100644 --- a/tests/integration/targets/aws_waf_web_acl/tasks/main.yml +++ b/tests/integration/targets/aws_waf_web_acl/tasks/main.yml @@ -1,6 +1,6 @@ - name: aws_waf_condition tests collections: - - ansible.amazon + - amazon.aws block: - name: set yaml anchor set_fact: diff --git a/tests/integration/targets/cloudformation_exports_info/tasks/main.yml b/tests/integration/targets/cloudformation_exports_info/tasks/main.yml index c66534eac29..eb703d49e60 100644 --- a/tests/integration/targets/cloudformation_exports_info/tasks/main.yml +++ b/tests/integration/targets/cloudformation_exports_info/tasks/main.yml @@ -6,7 +6,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: - name: Create a minimal stack with an export set by parameter diff --git a/tests/integration/targets/cloudformation_stack_set/tasks/main.yml b/tests/integration/targets/cloudformation_stack_set/tasks/main.yml index 32728ed6060..cb6aa2cc928 100644 --- a/tests/integration/targets/cloudformation_stack_set/tasks/main.yml +++ b/tests/integration/targets/cloudformation_stack_set/tasks/main.yml @@ -18,7 +18,7 @@ - name: cloudformation_stack_set tests collections: - - ansible.amazon + - amazon.aws block: - name: Get current account ID diff --git a/tests/integration/targets/cloudfront_distribution/tasks/main.yml b/tests/integration/targets/cloudfront_distribution/tasks/main.yml index 3be8cd90906..b4c2e599379 100644 --- a/tests/integration/targets/cloudfront_distribution/tasks/main.yml +++ b/tests/integration/targets/cloudfront_distribution/tasks/main.yml @@ -7,7 +7,7 @@ alias: "{{ cloudfront_alias | default(omit) }}" viewer_certificate: "{{ cloudfront_viewer_cert | default(omit) }}" collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/cloudtrail/tasks/main.yml b/tests/integration/targets/cloudtrail/tasks/main.yml index 1ab97f8e6b7..8aa695b95c2 100644 --- a/tests/integration/targets/cloudtrail/tasks/main.yml +++ b/tests/integration/targets/cloudtrail/tasks/main.yml @@ -38,7 +38,7 @@ cloudtrail: s3_bucket_name: '{{ s3_bucket_name }}' collections: - - ansible.amazon + - amazon.aws block: # ============================================================ diff --git a/tests/integration/targets/dms_endpoint/tasks/main.yml b/tests/integration/targets/dms_endpoint/tasks/main.yml index 23738062ded..18eb5728cce 100644 --- a/tests/integration/targets/dms_endpoint/tasks/main.yml +++ b/tests/integration/targets/dms_endpoint/tasks/main.yml @@ -11,7 +11,7 @@ - name: dms_endpoint tests collections: - - ansible.amazon + - amazon.aws block: - name: create endpoints dms_endpoint: diff --git a/tests/integration/targets/dms_replication_subnet_group/tasks/main.yml b/tests/integration/targets/dms_replication_subnet_group/tasks/main.yml index 139b2c7c183..e0708c313fc 100644 --- a/tests/integration/targets/dms_replication_subnet_group/tasks/main.yml +++ b/tests/integration/targets/dms_replication_subnet_group/tasks/main.yml @@ -11,7 +11,7 @@ - name: dms_replication_subnet_group tests collections: - - ansible.amazon + - amazon.aws block: - name: ensure IAM role exists diff --git a/tests/integration/targets/ec2_asg/tasks/main.yml b/tests/integration/targets/ec2_asg/tasks/main.yml index d41c27f5e43..aa53e9688ea 100644 --- a/tests/integration/targets/ec2_asg/tasks/main.yml +++ b/tests/integration/targets/ec2_asg/tasks/main.yml @@ -3,7 +3,7 @@ - name: Test incomplete credentials with ec2_asg collections: - - ansible.amazon + - amazon.aws block: @@ -80,7 +80,7 @@ region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/ec2_eip/tasks/main.yml b/tests/integration/targets/ec2_eip/tasks/main.yml index dd3eb5385ca..d1ba9e36316 100644 --- a/tests/integration/targets/ec2_eip/tasks/main.yml +++ b/tests/integration/targets/ec2_eip/tasks/main.yml @@ -8,7 +8,7 @@ ec2_eip: in_vpc: true collections: - - ansible.amazon + - amazon.aws block: - name: Get the current caller identity facts aws_caller_info: null diff --git a/tests/integration/targets/ec2_instance/roles/ec2_instance/meta/main.yml b/tests/integration/targets/ec2_instance/roles/ec2_instance/meta/main.yml index 2545bb5c99a..77589cc2b48 100644 --- a/tests/integration/targets/ec2_instance/roles/ec2_instance/meta/main.yml +++ b/tests/integration/targets/ec2_instance/roles/ec2_instance/meta/main.yml @@ -2,4 +2,4 @@ dependencies: - prepare_tests - setup_ec2 collections: - - ansible.amazon + - amazon.aws diff --git a/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/main.yml b/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/main.yml index d7ae6d0a3bf..188d97d2e9f 100644 --- a/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/main.yml +++ b/tests/integration/targets/ec2_instance/roles/ec2_instance/tasks/main.yml @@ -25,7 +25,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: - debug: msg: "{{ inventory_hostname }} start: {{ lookup('pipe','date') }}" diff --git a/tests/integration/targets/ec2_metric_alarm/tasks/main.yml b/tests/integration/targets/ec2_metric_alarm/tasks/main.yml index b1718d41186..00705636448 100644 --- a/tests/integration/targets/ec2_metric_alarm/tasks/main.yml +++ b/tests/integration/targets/ec2_metric_alarm/tasks/main.yml @@ -6,7 +6,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: - set_fact: diff --git a/tests/integration/targets/ec2_vpc_egress_igw/tasks/main.yml b/tests/integration/targets/ec2_vpc_egress_igw/tasks/main.yml index ccea0fd2114..b9ce40cd968 100644 --- a/tests/integration/targets/ec2_vpc_egress_igw/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_egress_igw/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: ec2_vpc_egress_igw tests collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/ec2_vpc_igw/tasks/main.yml b/tests/integration/targets/ec2_vpc_igw/tasks/main.yml index cd90a42b46a..56da84772a2 100644 --- a/tests/integration/targets/ec2_vpc_igw/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_igw/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: ec2_vpc_igw tests collections: - - ansible.amazon + - amazon.aws block: - name: set up aws connection info diff --git a/tests/integration/targets/ec2_vpc_nacl/tasks/main.yml b/tests/integration/targets/ec2_vpc_nacl/tasks/main.yml index 5d350f9744d..7be79895473 100644 --- a/tests/integration/targets/ec2_vpc_nacl/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_nacl/tasks/main.yml @@ -6,7 +6,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: # ============================================================ diff --git a/tests/integration/targets/ec2_vpc_route_table/tasks/main.yml b/tests/integration/targets/ec2_vpc_route_table/tasks/main.yml index e832ab37388..c3e4daf0f2b 100644 --- a/tests/integration/targets/ec2_vpc_route_table/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_route_table/tasks/main.yml @@ -1,6 +1,6 @@ - name: ec2_vpc_net tests collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml b/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml index d272342c4ca..641f6563cc2 100644 --- a/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: ec2_vpc_net tests collections: - - ansible.amazon + - amazon.aws block: # ============================================================ 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: # ============================================================ diff --git a/tests/integration/targets/ecs_cluster/tasks/full_test.yml b/tests/integration/targets/ecs_cluster/tasks/full_test.yml index 1176b4f4f55..19db74d8f17 100644 --- a/tests/integration/targets/ecs_cluster/tasks/full_test.yml +++ b/tests/integration/targets/ecs_cluster/tasks/full_test.yml @@ -2,7 +2,7 @@ # tasks file for ecs_cluster - name: ecs_cluster tests collections: - - ansible.amazon + - amazon.aws block: # ============================================================ diff --git a/tests/integration/targets/ecs_tag/tasks/main.yml b/tests/integration/targets/ecs_tag/tasks/main.yml index 454ba5e690e..78a118375f0 100644 --- a/tests/integration/targets/ecs_tag/tasks/main.yml +++ b/tests/integration/targets/ecs_tag/tasks/main.yml @@ -5,7 +5,7 @@ security_token: '{{ security_token | default(omit) }}' region: '{{ aws_region | default(omit) }}' collections: - - ansible.amazon + - amazon.aws block: - name: create ecs cluster ecs_cluster: diff --git a/tests/integration/targets/efs/playbooks/roles/efs/tasks/main.yml b/tests/integration/targets/efs/playbooks/roles/efs/tasks/main.yml index 2c3c0ea52da..c17378fd0dc 100644 --- a/tests/integration/targets/efs/playbooks/roles/efs/tasks/main.yml +++ b/tests/integration/targets/efs/playbooks/roles/efs/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: efs tests collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/elb_application_lb/tasks/full_test.yml b/tests/integration/targets/elb_application_lb/tasks/full_test.yml index cdba2cb4b56..82aabf1a305 100644 --- a/tests/integration/targets/elb_application_lb/tasks/full_test.yml +++ b/tests/integration/targets/elb_application_lb/tasks/full_test.yml @@ -1,6 +1,6 @@ - name: elb_application_lb full_test collections: - - ansible.amazon + - amazon.aws block: - name: set connection information for all tasks set_fact: diff --git a/tests/integration/targets/elb_application_lb/tasks/multiple_actions_fail.yml b/tests/integration/targets/elb_application_lb/tasks/multiple_actions_fail.yml index 72daf403385..56b6a194aff 100644 --- a/tests/integration/targets/elb_application_lb/tasks/multiple_actions_fail.yml +++ b/tests/integration/targets/elb_application_lb/tasks/multiple_actions_fail.yml @@ -1,6 +1,6 @@ - name: elb_application_lb multiple_actions_fail tests collections: - - ansible.amazon + - amazon.aws block: - name: set connection information for all tasks set_fact: diff --git a/tests/integration/targets/elb_network_lb/tasks/main.yml b/tests/integration/targets/elb_network_lb/tasks/main.yml index 52e95669427..e18c3d44e3d 100644 --- a/tests/integration/targets/elb_network_lb/tasks/main.yml +++ b/tests/integration/targets/elb_network_lb/tasks/main.yml @@ -1,6 +1,6 @@ - name: elb_network_lb tests collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/elb_target/playbooks/roles/elb_target/tasks/main.yml b/tests/integration/targets/elb_target/playbooks/roles/elb_target/tasks/main.yml index fe86a7c1cef..2021823fdf5 100644 --- a/tests/integration/targets/elb_target/playbooks/roles/elb_target/tasks/main.yml +++ b/tests/integration/targets/elb_target/playbooks/roles/elb_target/tasks/main.yml @@ -7,7 +7,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/elb_target_info/playbooks/roles/elb_target_info/tasks/main.yml b/tests/integration/targets/elb_target_info/playbooks/roles/elb_target_info/tasks/main.yml index 72891d6b78f..8ca10069a40 100644 --- a/tests/integration/targets/elb_target_info/playbooks/roles/elb_target_info/tasks/main.yml +++ b/tests/integration/targets/elb_target_info/playbooks/roles/elb_target_info/tasks/main.yml @@ -7,7 +7,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: diff --git a/tests/integration/targets/iam_group/tasks/main.yml b/tests/integration/targets/iam_group/tasks/main.yml index 2701d8f3d33..65b441827ca 100644 --- a/tests/integration/targets/iam_group/tasks/main.yml +++ b/tests/integration/targets/iam_group/tasks/main.yml @@ -7,7 +7,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: - name: ensure ansible user exists iam_user: diff --git a/tests/integration/targets/iam_password_policy/tasks/main.yaml b/tests/integration/targets/iam_password_policy/tasks/main.yaml index 0b4b8b89917..7b773eac808 100644 --- a/tests/integration/targets/iam_password_policy/tasks/main.yaml +++ b/tests/integration/targets/iam_password_policy/tasks/main.yaml @@ -5,7 +5,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: - name: set iam password policy iam_password_policy: diff --git a/tests/integration/targets/iam_policy/tasks/main.yml b/tests/integration/targets/iam_policy/tasks/main.yml index 80856c3f0a9..2780bd3e045 100644 --- a/tests/integration/targets/iam_policy/tasks/main.yml +++ b/tests/integration/targets/iam_policy/tasks/main.yml @@ -7,7 +7,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: # ============================================================ - name: Create a temporary folder for the policies diff --git a/tests/integration/targets/iam_role/tasks/main.yml b/tests/integration/targets/iam_role/tasks/main.yml index 7a0ac006e94..34c17af3369 100644 --- a/tests/integration/targets/iam_role/tasks/main.yml +++ b/tests/integration/targets/iam_role/tasks/main.yml @@ -32,7 +32,7 @@ iam_role: assume_role_policy_document: '{{ lookup("file", "deny-assume.json") }}' collections: - - ansible.amazon + - amazon.aws block: # =================================================================== # Parameter Checks diff --git a/tests/integration/targets/iam_saml_federation/tasks/main.yml b/tests/integration/targets/iam_saml_federation/tasks/main.yml index 0ae1640c058..5c662f563c7 100644 --- a/tests/integration/targets/iam_saml_federation/tasks/main.yml +++ b/tests/integration/targets/iam_saml_federation/tasks/main.yml @@ -5,7 +5,7 @@ aws_secret_key: "{{ aws_secret_key }}" security_token: "{{ security_token | default(omit) }}" collections: - - ansible.amazon + - amazon.aws block: # ============================================================ # TESTS diff --git a/tests/integration/targets/iam_user/tasks/main.yml b/tests/integration/targets/iam_user/tasks/main.yml index 9e135f4fa0f..c5be49ec4c0 100644 --- a/tests/integration/targets/iam_user/tasks/main.yml +++ b/tests/integration/targets/iam_user/tasks/main.yml @@ -7,7 +7,7 @@ security_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - - ansible.amazon + - amazon.aws block: - name: ensure improper usage of parameters fails gracefully iam_user_info: diff --git a/tests/integration/targets/lambda_policy/tasks/main.yml b/tests/integration/targets/lambda_policy/tasks/main.yml index 168a14ca039..ceb1783b46d 100644 --- a/tests/integration/targets/lambda_policy/tasks/main.yml +++ b/tests/integration/targets/lambda_policy/tasks/main.yml @@ -1,7 +1,7 @@ - name: Integration testing for ec2_snapshot collections: - community.general - - ansible.amazon + - amazon.aws block: - name: set up AWS credentials diff --git a/tests/integration/targets/rds_instance/tasks/test_vpc_security_groups.yml b/tests/integration/targets/rds_instance/tasks/test_vpc_security_groups.yml index 09857101a2a..53c7e9d07ea 100644 --- a/tests/integration/targets/rds_instance/tasks/test_vpc_security_groups.yml +++ b/tests/integration/targets/rds_instance/tasks/test_vpc_security_groups.yml @@ -1,7 +1,7 @@ --- - name: rds_instance test_vpc_security_groups tests collections: - - ansible.amazon + - amazon.aws block: - name: set up aws connection info set_fact: diff --git a/tests/integration/targets/rds_subnet_group/tasks/main.yml b/tests/integration/targets/rds_subnet_group/tasks/main.yml index 11a677e283d..664d78edeee 100644 --- a/tests/integration/targets/rds_subnet_group/tasks/main.yml +++ b/tests/integration/targets/rds_subnet_group/tasks/main.yml @@ -13,7 +13,7 @@ security_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' collections: - - ansible.amazon + - amazon.aws block: # ============================================================ diff --git a/tests/integration/targets/route53_zone/tasks/main.yml b/tests/integration/targets/route53_zone/tasks/main.yml index c75f45b26b2..f6baa68fffc 100644 --- a/tests/integration/targets/route53_zone/tasks/main.yml +++ b/tests/integration/targets/route53_zone/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: route53_zone tests collections: - - ansible.amazon + - amazon.aws block: # ============================================================ diff --git a/tests/integration/targets/s3_bucket_notification/tasks/main.yml b/tests/integration/targets/s3_bucket_notification/tasks/main.yml index f6fb304adb1..7cc46153570 100644 --- a/tests/integration/targets/s3_bucket_notification/tasks/main.yml +++ b/tests/integration/targets/s3_bucket_notification/tasks/main.yml @@ -8,7 +8,7 @@ no_log: true - name: test add s3 bucket notification collections: - - ansible.amazon + - amazon.aws - community.general block: - name: move lambda into place for archive module diff --git a/tests/integration/targets/s3_logging/tasks/main.yml b/tests/integration/targets/s3_logging/tasks/main.yml index 7d1d8b24b02..3e7ffc7cd49 100644 --- a/tests/integration/targets/s3_logging/tasks/main.yml +++ b/tests/integration/targets/s3_logging/tasks/main.yml @@ -16,7 +16,7 @@ security_token: '{{ security_token | default(omit) }}' region: '{{ aws_region | default(omit) }}' collections: - - ansible.amazon + - amazon.aws block: # ============================================================ diff --git a/tests/integration/targets/sns/tasks/main.yml b/tests/integration/targets/sns/tasks/main.yml index 53bfe9426ae..bc39b9ce7a4 100644 --- a/tests/integration/targets/sns/tasks/main.yml +++ b/tests/integration/targets/sns/tasks/main.yml @@ -6,7 +6,7 @@ security_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' collections: - - ansible.amazon + - amazon.aws block: - name: Create an SNS topic diff --git a/tests/requirements.yml b/tests/requirements.yml index c74290e0ee7..8f7e0afd53c 100644 --- a/tests/requirements.yml +++ b/tests/requirements.yml @@ -3,4 +3,4 @@ integration_tests_dependencies: - community.crypto - community.general unit_tests_dependencies: -- ansible.amazon +- amazon.aws diff --git a/tests/unit/mock/path.py b/tests/unit/mock/path.py index f2b5aa59f1a..fc51751fe62 100644 --- a/tests/unit/mock/path.py +++ b/tests/unit/mock/path.py @@ -1,4 +1,4 @@ -from ansible_collections.community.amazon.tests.unit.compat.mock import MagicMock +from ansible_collections.community.aws.tests.unit.compat.mock import MagicMock from ansible.utils.path import unfrackpath diff --git a/tests/unit/mock/procenv.py b/tests/unit/mock/procenv.py index 2bfc97c8b33..e516a94589b 100644 --- a/tests/unit/mock/procenv.py +++ b/tests/unit/mock/procenv.py @@ -25,7 +25,7 @@ from contextlib import contextmanager from io import BytesIO, StringIO -from ansible_collections.community.amazon.tests.unit.compat import unittest +from ansible_collections.community.aws.tests.unit.compat import unittest from ansible.module_utils.six import PY3 from ansible.module_utils._text import to_bytes diff --git a/tests/unit/modules/test_aws_acm.py b/tests/unit/modules/test_aws_acm.py index 3efd090e8ec..830e5b72e85 100644 --- a/tests/unit/modules/test_aws_acm.py +++ b/tests/unit/modules/test_aws_acm.py @@ -17,7 +17,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from ansible_collections.community.amazon.plugins.modules.aws_acm import pem_chain_split, chain_compare +from ansible_collections.community.aws.plugins.modules.aws_acm import pem_chain_split, chain_compare from ansible.module_utils._text import to_bytes, to_text from pprint import pprint diff --git a/tests/unit/modules/test_aws_api_gateway.py b/tests/unit/modules/test_aws_api_gateway.py index 2fc74975315..39e158d7a70 100644 --- a/tests/unit/modules/test_aws_api_gateway.py +++ b/tests/unit/modules/test_aws_api_gateway.py @@ -12,14 +12,14 @@ import pytest -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO3 -from ansible_collections.community.amazon.tests.unit.modules.utils import set_module_args +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3 +from ansible_collections.community.aws.tests.unit.modules.utils import set_module_args if not HAS_BOTO3: pytestmark = pytest.mark.skip("test_api_gateway.py requires the `boto3` and `botocore` modules") -import ansible_collections.community.amazon.plugins.modules.aws_api_gateway as agw -from ansible_collections.ansible.amazon.plugins.module_utils.aws import core +import ansible_collections.community.aws.plugins.modules.aws_api_gateway as agw +from ansible_collections.amazon.aws.plugins.module_utils.aws import core exit_return_dict = {} diff --git a/tests/unit/modules/test_aws_direct_connect_connection.py b/tests/unit/modules/test_aws_direct_connect_connection.py index 810332bb838..640dfb26a9d 100644 --- a/tests/unit/modules/test_aws_direct_connect_connection.py +++ b/tests/unit/modules/test_aws_direct_connect_connection.py @@ -7,8 +7,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from ansible_collections.community.amazon.tests.unit.utils.amazon_placebo_fixtures import placeboify, maybe_sleep -from ansible_collections.community.amazon.plugins.modules import aws_direct_connect_connection +from ansible_collections.community.aws.tests.unit.utils.amazon_placebo_fixtures import placeboify, maybe_sleep +from ansible_collections.community.aws.plugins.modules import aws_direct_connect_connection class FakeModule(object): diff --git a/tests/unit/modules/test_aws_direct_connect_link_aggregation_group.py b/tests/unit/modules/test_aws_direct_connect_link_aggregation_group.py index 9659fc17d46..30ace45ddc6 100644 --- a/tests/unit/modules/test_aws_direct_connect_link_aggregation_group.py +++ b/tests/unit/modules/test_aws_direct_connect_link_aggregation_group.py @@ -10,9 +10,9 @@ import pytest import os import collections -from ansible_collections.community.amazon.tests.unit.utils.amazon_placebo_fixtures import placeboify, maybe_sleep -from ansible_collections.community.amazon.plugins.modules import aws_direct_connect_link_aggregation_group as lag_module -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn +from ansible_collections.community.aws.tests.unit.utils.amazon_placebo_fixtures import placeboify, maybe_sleep +from ansible_collections.community.aws.plugins.modules import aws_direct_connect_link_aggregation_group as lag_module +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn @pytest.fixture(scope="module") diff --git a/tests/unit/modules/test_data_pipeline.py b/tests/unit/modules/test_data_pipeline.py index 8c1b1678e97..2051fc3ba48 100644 --- a/tests/unit/modules/test_data_pipeline.py +++ b/tests/unit/modules/test_data_pipeline.py @@ -12,9 +12,9 @@ import collections import pytest -from ansible_collections.community.amazon.tests.unit.utils.amazon_placebo_fixtures import placeboify, maybe_sleep +from ansible_collections.community.aws.tests.unit.utils.amazon_placebo_fixtures import placeboify, maybe_sleep -from ansible_collections.community.amazon.plugins.modules import data_pipeline +from ansible_collections.community.aws.plugins.modules import data_pipeline from ansible.module_utils._text import to_text # test_api_gateway.py requires the `boto3` and `botocore` modules diff --git a/tests/unit/modules/test_ec2_vpc_nat_gateway.py b/tests/unit/modules/test_ec2_vpc_nat_gateway.py index cc7e87f2193..88d5032b11d 100644 --- a/tests/unit/modules/test_ec2_vpc_nat_gateway.py +++ b/tests/unit/modules/test_ec2_vpc_nat_gateway.py @@ -8,7 +8,7 @@ from mock import patch -import ansible_collections.community.amazon.plugins.modules.ec2_vpc_nat_gateway as ng +import ansible_collections.community.aws.plugins.modules.ec2_vpc_nat_gateway as ng boto3 = pytest.importorskip("boto3") diff --git a/tests/unit/modules/test_ec2_vpc_vpn.py b/tests/unit/modules/test_ec2_vpc_vpn.py index f59735724cd..bbe75e8eef6 100644 --- a/tests/unit/modules/test_ec2_vpc_vpn.py +++ b/tests/unit/modules/test_ec2_vpc_vpn.py @@ -6,9 +6,9 @@ import pytest import os -from ansible_collections.community.amazon.tests.unit.utils.amazon_placebo_fixtures import placeboify, maybe_sleep -from ansible_collections.community.amazon.plugins.modules import ec2_vpc_vpn -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn, boto3_tag_list_to_ansible_dict +from ansible_collections.community.aws.tests.unit.utils.amazon_placebo_fixtures import placeboify, maybe_sleep +from ansible_collections.community.aws.plugins.modules import ec2_vpc_vpn +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import get_aws_connection_info, boto3_conn, boto3_tag_list_to_ansible_dict class FakeModule(object): diff --git a/tests/unit/modules/test_iam_password_policy.py b/tests/unit/modules/test_iam_password_policy.py index e9281cf7648..c52d174a6ee 100644 --- a/tests/unit/modules/test_iam_password_policy.py +++ b/tests/unit/modules/test_iam_password_policy.py @@ -4,14 +4,14 @@ import pytest -from ansible_collections.community.amazon.tests.unit.modules.utils import set_module_args -from ansible_collections.ansible.amazon.plugins.module_utils.ec2 import HAS_BOTO3 +from ansible_collections.community.aws.tests.unit.modules.utils import set_module_args +from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3 if not HAS_BOTO3: pytestmark = pytest.mark.skip("iam_password_policy.py requires the `boto3` and `botocore` modules") else: import boto3 - from ansible_collections.community.amazon.plugins.modules import iam_password_policy + from ansible_collections.community.aws.plugins.modules import iam_password_policy def test_warn_if_state_not_specified(): diff --git a/tests/unit/modules/test_kinesis_stream.py b/tests/unit/modules/test_kinesis_stream.py index 1a2c5f64698..88bff7687da 100644 --- a/tests/unit/modules/test_kinesis_stream.py +++ b/tests/unit/modules/test_kinesis_stream.py @@ -8,7 +8,7 @@ boto3 = pytest.importorskip("boto3") botocore = pytest.importorskip("botocore") -from ansible_collections.community.amazon.plugins.modules import kinesis_stream +from ansible_collections.community.aws.plugins.modules import kinesis_stream aws_region = 'us-west-2' diff --git a/tests/unit/modules/test_lambda.py b/tests/unit/modules/test_lambda.py index d059249002c..7b668e3e6bd 100644 --- a/tests/unit/modules/test_lambda.py +++ b/tests/unit/modules/test_lambda.py @@ -11,16 +11,16 @@ import copy import pytest -from ansible_collections.community.amazon.tests.unit.compat.mock import MagicMock, Mock, patch +from ansible_collections.community.aws.tests.unit.compat.mock import MagicMock, Mock, patch from ansible.module_utils import basic -from ansible_collections.community.amazon.tests.unit.modules.utils import set_module_args +from ansible_collections.community.aws.tests.unit.modules.utils import set_module_args boto3 = pytest.importorskip("boto3") # lambda is a keyword so we have to hack this. -_temp = __import__('ansible_collections.community.amazon.plugins.modules.lambda') -lda = getattr(_temp.community.amazon.plugins.modules, "lambda") +_temp = __import__('ansible_collections.community.aws.plugins.modules.lambda') +lda = getattr(_temp.community.aws.plugins.modules, "lambda") base_lambda_config = { diff --git a/tests/unit/modules/test_lambda_policy.py b/tests/unit/modules/test_lambda_policy.py index 76605eeb4ed..08c3ee2c0f9 100644 --- a/tests/unit/modules/test_lambda_policy.py +++ b/tests/unit/modules/test_lambda_policy.py @@ -12,16 +12,16 @@ import pytest -from ansible_collections.ansible.amazon.plugins.module_utils.aws.core import HAS_BOTO3 -from ansible_collections.community.amazon.tests.unit.compat.mock import MagicMock -from ansible_collections.community.amazon.tests.unit.modules.utils import set_module_args +from ansible_collections.amazon.aws.plugins.module_utils.aws.core import HAS_BOTO3 +from ansible_collections.community.aws.tests.unit.compat.mock import MagicMock +from ansible_collections.community.aws.tests.unit.modules.utils import set_module_args if not HAS_BOTO3: pytestmark = pytest.mark.skip("test_api_gateway.py requires the `boto3` and `botocore` modules") # these are here cause ... boto! -from ansible_collections.community.amazon.plugins.modules import lambda_policy -from ansible_collections.community.amazon.plugins.modules.lambda_policy import setup_module_object +from ansible_collections.community.aws.plugins.modules import lambda_policy +from ansible_collections.community.aws.plugins.modules.lambda_policy import setup_module_object try: from botocore.exceptions import ClientError except ImportError: diff --git a/tests/unit/modules/test_redshift_cross_region_snapshots.py b/tests/unit/modules/test_redshift_cross_region_snapshots.py index 2c8c4478829..7b22d5b00b3 100644 --- a/tests/unit/modules/test_redshift_cross_region_snapshots.py +++ b/tests/unit/modules/test_redshift_cross_region_snapshots.py @@ -2,7 +2,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from ansible_collections.community.amazon.plugins.modules import redshift_cross_region_snapshots as rcrs +from ansible_collections.community.aws.plugins.modules import redshift_cross_region_snapshots as rcrs mock_status_enabled = { 'SnapshotCopyGrantName': 'snapshot-us-east-1-to-us-west-2', diff --git a/tests/unit/modules/test_route53_zone.py b/tests/unit/modules/test_route53_zone.py index 7d5b426be56..9fc4965ffbc 100644 --- a/tests/unit/modules/test_route53_zone.py +++ b/tests/unit/modules/test_route53_zone.py @@ -4,10 +4,10 @@ import functools -from ansible_collections.community.amazon.plugins.modules import route53_zone -from ansible_collections.community.amazon.tests.unit.compat import unittest -from ansible_collections.community.amazon.tests.unit.compat.mock import patch, call -from ansible_collections.community.amazon.tests.unit.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args +from ansible_collections.community.aws.plugins.modules import route53_zone +from ansible_collections.community.aws.tests.unit.compat import unittest +from ansible_collections.community.aws.tests.unit.compat.mock import patch, call +from ansible_collections.community.aws.tests.unit.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args def parameterized(params_list): @@ -26,7 +26,7 @@ def is_subdict(subdict, superdict): return all(superdict[k] == v for k, v in subdict.items()) -@patch('ansible_collections.ansible.amazon.plugins.module_utils.aws.core.HAS_BOTO3', new=True) +@patch('ansible_collections.amazon.aws.plugins.module_utils.aws.core.HAS_BOTO3', new=True) @patch.object(route53_zone.AnsibleAWSModule, 'client') @patch.object(route53_zone.time, 'time', return_value=1) class TestRoute53Module(ModuleTestCase): diff --git a/tests/unit/modules/test_s3_bucket_notification.py b/tests/unit/modules/test_s3_bucket_notification.py index 4e4aa68635b..2a90cf2d353 100644 --- a/tests/unit/modules/test_s3_bucket_notification.py +++ b/tests/unit/modules/test_s3_bucket_notification.py @@ -4,11 +4,11 @@ import pytest -from ansible_collections.community.amazon.tests.unit.compat.mock import MagicMock, patch -from ansible_collections.community.amazon.tests.unit.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args +from ansible_collections.community.aws.tests.unit.compat.mock import MagicMock, patch +from ansible_collections.community.aws.tests.unit.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args -from ansible_collections.community.amazon.plugins.modules.s3_bucket_notification import AmazonBucket, Config -from ansible_collections.community.amazon.plugins.modules import s3_bucket_notification +from ansible_collections.community.aws.plugins.modules.s3_bucket_notification import AmazonBucket, Config +from ansible_collections.community.aws.plugins.modules import s3_bucket_notification try: from botocore.exceptions import ClientError except ImportError: @@ -220,7 +220,7 @@ def test_module_fail_when_required_args_missing(self): set_module_args({}) s3_bucket_notification.main() - @patch('ansible_collections.community.amazon.plugins.modules.s3_bucket_notification.AnsibleAWSModule.client') + @patch('ansible_collections.community.aws.plugins.modules.s3_bucket_notification.AnsibleAWSModule.client') def test_add_s3_bucket_notification(self, aws_client): aws_client.return_value.get_bucket_notification_configuration.return_value = { 'LambdaFunctionConfigurations': [] diff --git a/tests/unit/modules/utils.py b/tests/unit/modules/utils.py index fae43b60380..fd63ed68ae0 100644 --- a/tests/unit/modules/utils.py +++ b/tests/unit/modules/utils.py @@ -1,7 +1,7 @@ import json -from ansible_collections.community.amazon.tests.unit.compat import unittest -from ansible_collections.community.amazon.tests.unit.compat.mock import patch +from ansible_collections.community.aws.tests.unit.compat import unittest +from ansible_collections.community.aws.tests.unit.compat.mock import patch from ansible.module_utils import basic from ansible.module_utils._text import to_bytes diff --git a/tests/unit/plugins/connection/test_aws_ssm.py b/tests/unit/plugins/connection/test_aws_ssm.py index 00f76d6361c..27c4ddbec46 100644 --- a/tests/unit/plugins/connection/test_aws_ssm.py +++ b/tests/unit/plugins/connection/test_aws_ssm.py @@ -7,13 +7,13 @@ import sys from ansible import constants as C from ansible.compat.selectors import SelectorKey, EVENT_READ -from ansible_collections.community.amazon.tests.unit.compat import unittest -from ansible_collections.community.amazon.tests.unit.compat.mock import patch, MagicMock, PropertyMock +from ansible_collections.community.aws.tests.unit.compat import unittest +from ansible_collections.community.aws.tests.unit.compat.mock import patch, MagicMock, PropertyMock from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound from ansible.module_utils.six.moves import shlex_quote from ansible.module_utils._text import to_bytes from ansible.playbook.play_context import PlayContext -from ansible_collections.community.amazon.plugins.connection import aws_ssm +from ansible_collections.community.aws.plugins.connection import aws_ssm from ansible.plugins.loader import connection_loader @@ -27,7 +27,7 @@ class TestConnectionBaseClass(unittest.TestCase): def test_plugins_connection_aws_ssm_start_session(self, boto_client, s_poll, s_popen, mock_ospe): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) conn.get_option = MagicMock() conn.get_option.side_effect = ['i1234', 'executable', 'abcd', 'i1234'] conn.host = 'abc' @@ -51,7 +51,7 @@ def test_plugins_connection_aws_ssm_start_session(self, boto_client, s_poll, s_p def test_plugins_connection_aws_ssm_exec_command(self, r_choice): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) r_choice.side_effect = ['a', 'a', 'a', 'a', 'a', 'b', 'b', 'b', 'b', 'b'] conn.MARK_LENGTH = 5 conn._session = MagicMock() @@ -87,14 +87,14 @@ def test_plugins_connection_aws_ssm_exec_command(self, r_choice): def test_plugins_connection_aws_ssm_prepare_terminal(self): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) conn.is_windows = MagicMock() conn.is_windows.return_value = True def test_plugins_connection_aws_ssm_wrap_command(self): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) conn.is_windows = MagicMock() conn.is_windows.return_value = True return('windows1') @@ -102,7 +102,7 @@ def test_plugins_connection_aws_ssm_wrap_command(self): def test_plugins_connection_aws_ssm_post_process(self): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) conn.is_windows = MagicMock() conn.is_windows.return_value = True success = 3 @@ -115,7 +115,7 @@ def test_plugins_connection_aws_ssm_post_process(self): def test_plugins_connection_aws_ssm_flush_stderr(self, s_popen): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) conn.poll_stderr = MagicMock() conn.poll_stderr.register = MagicMock() conn.stderr = None @@ -126,7 +126,7 @@ def test_plugins_connection_aws_ssm_flush_stderr(self, s_popen): def test_plugins_connection_aws_ssm_get_url(self, boto): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) boto3 = MagicMock() boto3.client('s3').return_value = MagicMock() boto3.generate_presigned_url.return_value = MagicMock() @@ -136,7 +136,7 @@ def test_plugins_connection_aws_ssm_get_url(self, boto): def test_plugins_connection_aws_ssm_put_file(self, mock_ospe): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) conn._connect = MagicMock() conn._file_transport_command = MagicMock() conn._file_transport_command.return_value = (0, 'stdout', 'stderr') @@ -145,7 +145,7 @@ def test_plugins_connection_aws_ssm_put_file(self, mock_ospe): def test_plugins_connection_aws_ssm_fetch_file(self): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) conn._connect = MagicMock() conn._file_transport_command = MagicMock() conn._file_transport_command.return_value = (0, 'stdout', 'stderr') @@ -156,7 +156,7 @@ def test_plugins_connection_aws_ssm_fetch_file(self): def test_plugins_connection_file_transport_command(self, boto_client, s_check_output): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) conn.get_option = MagicMock() conn.get_option.side_effect = ['1', '2', '3', '4', '5'] conn._get_url = MagicMock() @@ -178,7 +178,7 @@ def test_plugins_connection_file_transport_command(self, boto_client, s_check_ou def test_plugins_connection_aws_ssm_close(self, s_check_output): pc = PlayContext() new_stdin = StringIO() - conn = connection_loader.get('community.amazon.aws_ssm', pc, new_stdin) + conn = connection_loader.get('community.aws.aws_ssm', pc, new_stdin) conn.instance_id = "i-12345" conn._session_id = True conn.get_option = MagicMock() diff --git a/tests/unit/utils/amazon_placebo_fixtures.py b/tests/unit/utils/amazon_placebo_fixtures.py index 6484e89d6c8..6912c2e32b7 100644 --- a/tests/unit/utils/amazon_placebo_fixtures.py +++ b/tests/unit/utils/amazon_placebo_fixtures.py @@ -87,9 +87,9 @@ def boto3_middleman_connection(module, conn_type, resource, region='us-west-2', raise ValueError('Mocker only supports client, not %s' % conn_type) return session.client(resource, region_name=region) - import ansible_collections.ansible.amazon.plugins.module_utils.ec2 + import ansible_collections.amazon.aws.plugins.module_utils.ec2 monkeypatch.setattr( - ansible_collections.ansible.amazon.plugins.module_utils.ec2, + ansible_collections.amazon.aws.plugins.module_utils.ec2, 'boto3_conn', boto3_middleman_connection, ) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 29a1b313ce8..ca119f70d09 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -74,26 +74,28 @@ set +ux . ~/ansible-venv/bin/activate set -ux +pip install setuptools==44.1.0 pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check #ansible-galaxy collection install community.general mkdir -p "${HOME}/.ansible/ansible_collections/community" mkdir -p "${HOME}/.ansible/ansible_collections/google" mkdir -p "${HOME}/.ansible/ansible_collections/openstack" +mkdir -p "${HOME}/.ansible/ansible_collections/amazon" cwd=$(pwd) cd "${HOME}/.ansible/ansible_collections/" git clone https://github.com/ansible-collections/community.general community/general -git clone https://github.com/ansible-collection-migration/ansible.amazon ansible/amazon +git clone https://github.com/ansible-collections/amazon.aws amazon/aws # community.general requires a lot of things we need to manual pull in # once community.general is published this will be handled by galaxy cli -git clone https://github.com/ansible-collection-migration/google.cloud google/cloud -git clone https://github.com/ansible-collection-migration/openstack.cloud openstack/cloud -git clone https://github.com/ansible-collection-migration/ansible.netcommon ansible/netcommon +git clone https://github.com/ansible-collections/ansible_collections_google google/cloud +git clone https://opendev.org/openstack/ansible-collections-openstack openstack/cloud +git clone https://github.com/ansible-collections/netcommon ansible/netcommon #ansible-galaxy collection install ansible.netcommon cd "${cwd}" export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible/" -TEST_DIR="${HOME}/.ansible/ansible_collections/community/amazon/" +TEST_DIR="${HOME}/.ansible/ansible_collections/community/aws/" mkdir -p "${TEST_DIR}" cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}" cd "${TEST_DIR}"