Skip to content

Commit

Permalink
migration test cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jillr committed Mar 12, 2020
1 parent eb75681 commit 13b104b
Show file tree
Hide file tree
Showing 114 changed files with 1,121 additions and 218 deletions.
162 changes: 162 additions & 0 deletions meta/routing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
plugin_routing:
modules:
aws_acm_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
aws_kms_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
aws_region_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
aws_s3_bucket_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
aws_sgw_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
aws_waf_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
cloudfront_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
cloudwatchlogs_log_group_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_asg_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_customer_gateway_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_instance_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_eip_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_elb_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_lc_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_placement_group_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_vpc_endpoint_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_vpc_igw_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_vpc_nacl_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_vpc_nat_gateway_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_vpc_peering_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_vpc_route_table_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_vpc_vgw_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ec2_vpc_vpn_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ecs_service_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
ecs_taskdefinition_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
efs_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
elasticache_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
elb_application_lb_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
elb_classic_lb_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
elb_target_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
elb_target_group_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
iam_cert_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
iam_mfa_device_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
iam_role_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
iam_server_certificate_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
lambda_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
rds_instance_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
rds_snapshot_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
redshift_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
route53_facts:
deprecation:
removal_date: TBD
warning_text: see plugin documentation for details
7 changes: 5 additions & 2 deletions plugins/modules/aws_direct_connect_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,11 @@
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.ansible.amazon.plugins.module_utils.aws.direct_connect import (DirectConnectError,
delete_connection,
associate_connection_and_lag,
disassociate_connection_and_lag,
)

try:
from botocore.exceptions import BotoCoreError, ClientError
Expand Down
7 changes: 5 additions & 2 deletions plugins/modules/aws_direct_connect_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +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.ansible.amazon.plugins.module_utils.ec2 import (camel_dict_to_snake_dict,
ec2_argument_spec,
get_aws_connection_info,
boto3_conn,
)
from ansible.module_utils._text import to_native


Expand Down
16 changes: 11 additions & 5 deletions plugins/modules/aws_direct_connect_link_aggregation_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +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.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.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)
delete_connection,
delete_virtual_interface,
disassociate_connection_and_lag,
)
import traceback
import time

Expand Down
8 changes: 6 additions & 2 deletions plugins/modules/aws_s3_bucket_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +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.ansible.amazon.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):
Expand Down
6 changes: 5 additions & 1 deletion plugins/modules/aws_step_functions_state_machine.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,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_tag_list, AWSRetry, compare_aws_tags, boto3_tag_list_to_ansible_dict
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,
)

try:
from botocore.exceptions import ClientError, BotoCoreError
Expand Down
11 changes: 9 additions & 2 deletions plugins/modules/aws_waf_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,15 @@

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.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,
)


def get_rule_by_name(client, module, name):
Expand Down
8 changes: 6 additions & 2 deletions plugins/modules/aws_waf_web_acl.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,12 @@
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.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,
)


def get_web_acl_by_name(client, module, name):
Expand Down
6 changes: 5 additions & 1 deletion plugins/modules/cloudformation_stack_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@
# 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.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.module_utils._text import to_native

Expand Down
4 changes: 3 additions & 1 deletion plugins/modules/cloudtrail.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@

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)
ansible_dict_to_boto3_tag_list,
boto3_tag_list_to_ansible_dict,
)


def create_trail(module, client, ct_params):
Expand Down
7 changes: 6 additions & 1 deletion plugins/modules/cloudwatchlogs_log_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +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.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3,
camel_dict_to_snake_dict,
boto3_conn,
ec2_argument_spec,
get_aws_connection_info,
)

try:
import botocore
Expand Down
7 changes: 6 additions & 1 deletion plugins/modules/cloudwatchlogs_log_group_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +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.ansible.amazon.plugins.module_utils.ec2 import (HAS_BOTO3,
camel_dict_to_snake_dict,
boto3_conn,
ec2_argument_spec,
get_aws_connection_info,
)

try:
import botocore
Expand Down
7 changes: 6 additions & 1 deletion plugins/modules/dynamodb_ttl.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +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.ansible.amazon.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):
Expand Down
8 changes: 6 additions & 2 deletions plugins/modules/ec2_customer_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +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.ansible.amazon.plugins.module_utils.ec2 import (boto3_conn,
AWSRetry,
camel_dict_to_snake_dict,
ec2_argument_spec,
get_aws_connection_info,
)


class Ec2CustomerGatewayManager:
Expand Down
5 changes: 4 additions & 1 deletion plugins/modules/ec2_customer_gateway_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@
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.ansible.amazon.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):
Expand Down
5 changes: 3 additions & 2 deletions plugins/modules/ec2_eip_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@

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)
boto3_tag_list_to_ansible_dict,
camel_dict_to_snake_dict,
)
try:
from botocore.exceptions import (BotoCoreError, ClientError)
except ImportError:
Expand Down
Loading

0 comments on commit 13b104b

Please sign in to comment.