Skip to content

Commit

Permalink
migration test cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jillr authored and abikouo committed Oct 16, 2024
1 parent 85148d5 commit 723cd96
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
7 changes: 5 additions & 2 deletions plugins/modules/ec2_vpc_nacl_info.py
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
10 changes: 6 additions & 4 deletions tests/integration/targets/ec2_vpc_nacl/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
aws_secret_key: "{{ aws_secret_key }}"
security_token: "{{ security_token | default(omit) }}"
region: "{{ aws_region }}"
collections:
- ansible.amazon
block:

# ============================================================
Expand Down Expand Up @@ -94,22 +96,22 @@
- include_tasks: tasks/subnet_ids.yml
vars:
vpc_id: "{{ vpc.vpc.id }}"
subnet_ids: "{{ subnets | json_query('results[*].subnet.id') }}"
subnet_ids: "{{ subnets | community.general.json_query('results[*].subnet.id') }}"

- include_tasks: tasks/subnet_names.yml
vars:
vpc_id: "{{ vpc.vpc.id }}"
subnet_names: "{{ subnets | json_query('results[*].subnet.tags.Name') }}"
subnet_names: "{{ subnets | community.general.json_query('results[*].subnet.tags.Name') }}"

- include_tasks: tasks/tags.yml
vars:
vpc_id: "{{ vpc.vpc.id }}"
subnet_ids: "{{ subnets | json_query('results[*].subnet.id') }}"
subnet_ids: "{{ subnets | community.general.json_query('results[*].subnet.id') }}"

- include_tasks: tasks/ingress_and_egress.yml
vars:
vpc_id: "{{ vpc.vpc.id }}"
subnet_ids: "{{ subnets | json_query('results[*].subnet.id') }}"
subnet_ids: "{{ subnets | community.general.json_query('results[*].subnet.id') }}"

- include_tasks: tasks/ipv6.yml

Expand Down

0 comments on commit 723cd96

Please sign in to comment.