Skip to content

Commit

Permalink
migration test cleanup
Browse files Browse the repository at this point in the history 
This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@13b104b
  • Loading branch information
@jillr @goneri
jillr authored and goneri committed Jun 25, 2021
1 parent f0479f9 commit 714bc11
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 17 deletions.
8 changes: 6 additions & 2 deletions plugins/modules/ec2_vpc_endpoint.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +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.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.module_utils.six import string_types


Expand Down
10 changes: 8 additions & 2 deletions plugins/modules/ec2_vpc_endpoint_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +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.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,
)


def date_handler(obj):
Expand Down
9 changes: 7 additions & 2 deletions plugins/modules/ec2_vpc_igw_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +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.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,
)


def get_internet_gateway_info(internet_gateway):
Expand Down
7 changes: 5 additions & 2 deletions plugins/modules/ec2_vpc_nacl_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,11 @@

from ansible_collections.ansible.amazon.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.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,
)


# VPC-supported IANA protocol numbers
Expand Down
8 changes: 6 additions & 2 deletions plugins/modules/ec2_vpc_nat_gateway.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +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.ansible.amazon.plugins.module_utils.ec2 import (ec2_argument_spec,
get_aws_connection_info,
boto3_conn,
camel_dict_to_snake_dict,
HAS_BOTO3,
)


DRY_RUN_GATEWAYS = [
Expand Down
10 changes: 8 additions & 2 deletions plugins/modules/ec2_vpc_nat_gateway_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +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.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,
)


def date_handler(obj):
Expand Down
9 changes: 7 additions & 2 deletions plugins/modules/ec2_vpc_peering_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,13 @@

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)
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):
Expand Down
9 changes: 7 additions & 2 deletions plugins/modules/ec2_vpc_vgw_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +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.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,
)


def get_virtual_gateway_info(virtual_gateway):
Expand Down
5 changes: 4 additions & 1 deletion plugins/modules/ec2_vpc_vpn_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,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

0 comments on commit 714bc11

Please sign in to comment.