Test cleanup (#2397) (#2409)

This is a backport of PR #2397 as merged into main (e178256).
SUMMARY

Update FQCN of modules that moved to amazon.aws
Remove explicit call to collections from defaults stanza, now we're using FQCNs we don't need to pull it in.

ISSUE TYPE

Feature Pull Request

COMPONENT NAME
tests/integration/targets
ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell

changelogs/fragments/tests-fqcn.yml

@@ -0,0 +1,4 @@
+---
+trivial:
+- Update FQCN of modules that moved to amazon.aws
+- Remove explicit call to ``collections`` from defaults stanza, now we're using FQCNs we don't need to pull it in.

tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/create_update_delete.yml

@@ -377,7 +377,7 @@
 
     # we need a launch template, otherwise we cannot test the mixed instance policy
     - name: create launch template for autoscaling group to test its mixed instances policy
-      community.aws.ec2_launch_template:
+      amazon.aws.ec2_launch_template:
         template_name: "{{ resource_prefix }}-lt"
         image_id: "{{ ec2_ami_id }}"
         instance_type: t3.micro

tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/env_cleanup.yml

@@ -57,7 +57,7 @@
     - "{{ resource_prefix }}-lc-2"
 
 - name: delete launch template
-  community.aws.ec2_launch_template:
+  amazon.aws.ec2_launch_template:
     name: "{{ resource_prefix }}-lt"
     state: absent
   register: del_lt

tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/main.yml

@@ -15,8 +15,6 @@
           # Unfortunately AWSRetry doesn't support paginators and boto3's paginators
           # don't support any configuration of the delay between retries.
           max_attempts: 20
-  collections:
-    - community.aws
   block:
   # https://github.com/ansible/ansible/issues/77257
     - name: Set async_dir for HOME env

tests/integration/targets/autoscaling_instance/tasks/env_cleanup.yml

@@ -32,7 +32,7 @@
     - "{{ default_tiny_name }}-2"
 
 - name: remove launch templates
-  community.aws.ec2_launch_template:
+  amazon.aws.ec2_launch_template:
     name: "{{ item }}"
     state: absent
   register: removed
@@ -42,15 +42,7 @@
   loop:
     - "{{ default_resource_name }}-1"
     - "{{ default_resource_name }}-2"
-
-- name: delete launch template
-  community.aws.ec2_launch_template:
-    name: "{{ default_resource_name }}"
-    state: absent
-  register: del_lt
-  retries: 10
-  until: del_lt is not failed
-  ignore_errors: true
+    - "{{ default_resource_name }}"
 
 - ansible.builtin.include_role:
     name: setup_ec2_vpc

tests/integration/targets/autoscaling_instance/tasks/env_setup.yml

@@ -58,7 +58,7 @@
 # Note: main autoscaling tests use ASG "Launch Configs", these are being phased out in favour of EC2
 # Launch Templates
 - name: ensure launch templates exist
-  community.aws.ec2_launch_template:
+  amazon.aws.ec2_launch_template:
     name: "{{ item }}"
     network_interfaces:
       - device_index: 0

tests/integration/targets/autoscaling_instance/tasks/main.yml

@@ -10,8 +10,6 @@
       secret_key: "{{ aws_secret_key }}"
       session_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"
-  collections:
-    - community.aws
   block:
     - ansible.builtin.include_tasks: env_setup.yml
     - ansible.builtin.include_tasks: tests.yml

tests/integration/targets/autoscaling_instance_refresh/tasks/main.yml

@@ -157,15 +157,6 @@
         - "{{ lc_name_1 }}"
         - "{{ lc_name_2 }}"
 
-    - name: Delete launch template
-      community.aws.ec2_launch_template:
-        name: "{{ resource_prefix }}-lt"
-        state: absent
-      register: del_lt
-      retries: 10
-      until: del_lt is not failed
-      ignore_errors: true
-
     - name: Remove the security group
       amazon.aws.ec2_security_group:
         name: "{{ sg_name }}"

tests/integration/targets/callback_aws_resource_actions/main.yml

@@ -1,8 +1,6 @@
 ---
 - hosts: localhost
   gather_facts: false
-  collections:
-    - amazon.aws
   module_defaults:
     group/aws:
       access_key: "{{ aws_access_key }}"

tests/integration/targets/cloudtrail/tasks/main.yml

@@ -30,8 +30,6 @@
     amazon.aws.cloudtrail:
       s3_bucket_name: "{{ s3_bucket_name }}"
       region: "{{ aws_region }}"
-  collections:
-    - amazon.aws
   block:
   # ============================================================
   #   Argument Tests

tests/integration/targets/ec2_ami/tasks/main.yml

@@ -6,8 +6,6 @@
       access_key: "{{ aws_access_key }}"
       secret_key: "{{ aws_secret_key }}"
       session_token: "{{ security_token | default(omit) }}"
-  collections:
-    - amazon.aws
   block:
     # ============================================================
 

tests/integration/targets/ec2_ami_instance/tasks/main.yml

@@ -6,8 +6,6 @@
       access_key: "{{ aws_access_key }}"
       secret_key: "{{ aws_secret_key }}"
       session_token: "{{ security_token | default(omit) }}"
-  collections:
-    - amazon.aws
   block:
     # ============================================================
 

tests/integration/targets/ec2_ami_snapshot/tasks/main.yml

@@ -6,8 +6,6 @@
       access_key: "{{ aws_access_key }}"
       secret_key: "{{ aws_secret_key }}"
       session_token: "{{ security_token | default(omit) }}"
-  collections:
-    - amazon.aws
   block:
     # ============================================================
 

tests/integration/targets/ec2_ami_tpm/tasks/main.yml

@@ -6,8 +6,6 @@
       access_key: "{{ aws_access_key }}"
       secret_key: "{{ aws_secret_key }}"
       session_token: "{{ security_token | default(omit) }}"
-  collections:
-    - amazon.aws
   block:
     # ============================================================
 

tests/integration/targets/ec2_eni/tasks/main.yaml

@@ -6,11 +6,6 @@
       session_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"
 
-  collections:
-    - amazon.aws
-    - ansible.utils
-    - community.aws
-
   block:
   # ============================================================
     - name: create a VPC

tests/integration/targets/ec2_metadata_facts/playbooks/setup.yml

@@ -8,10 +8,6 @@
 
   hosts: localhost
 
-  collections:
-    - amazon.aws
-    - community.aws
-
   vars:
     vpc_name: "{{ resource_prefix }}-vpc"
     vpc_seed: "{{ resource_prefix }}"

tests/integration/targets/ec2_metadata_facts/playbooks/teardown.yml

@@ -8,10 +8,6 @@
 
   hosts: localhost
 
-  collections:
-    - amazon.aws
-    - community.aws
-
   tasks:
   # ============================================================
 

tests/integration/targets/ec2_security_group/tasks/multi_account.yml

@@ -11,14 +11,14 @@
           Description: Created by ansible-test
       register: vpc_result_2
     - name: Peer the secondary-VPC to the main VPC
-      community.aws.ec2_vpc_peering:
+      amazon.aws.ec2_vpc_peering:
         vpc_id: "{{ vpc_result_2.vpc.id }}"
         peer_vpc_id: "{{ vpc_result.vpc.id }}"
         peer_owner_id: "{{ caller_facts.account }}"
         peer_region: "{{ aws_region }}"
       register: peer_origin
     - name: Accept the secondary-VPC peering connection in the main VPC
-      community.aws.ec2_vpc_peering:
+      amazon.aws.ec2_vpc_peering:
         peer_vpc_id: "{{ vpc_result_2.vpc.id }}"
         vpc_id: "{{ vpc_result.vpc.id }}"
         state: accept
@@ -83,7 +83,7 @@
   always:
     - ansible.builtin.pause: seconds=5
     - name: Delete secondary-VPC side of peer
-      community.aws.ec2_vpc_peering:
+      amazon.aws.ec2_vpc_peering:
         vpc_id: "{{ vpc_result_2.vpc.id }}"
         peer_vpc_id: "{{ vpc_result.vpc.id }}"
         peering_id: "{{ peer_origin.peering_id }}"
@@ -92,7 +92,7 @@
         peer_region: "{{ aws_region }}"
       ignore_errors: true
     - name: Delete main-VPC side of peer
-      community.aws.ec2_vpc_peering:
+      amazon.aws.ec2_vpc_peering:
         peer_vpc_id: "{{ vpc_result_2.vpc.id }}"
         vpc_id: "{{ vpc_result.vpc.id }}"
         state: absent

tests/integration/targets/ec2_snapshot/tasks/main.yml

@@ -17,10 +17,6 @@
       session_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"
 
-  collections:
-    - amazon.aws
-    - community.aws
-
   block:
     - name: Gather availability zones
       amazon.aws.aws_az_info:

tests/integration/targets/ec2_spot_instance/tasks/main.yaml

@@ -6,10 +6,6 @@
       session_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"
 
-  collections:
-    - amazon.aws
-    - community.aws
-
   block:
     - name: Get available AZs
       amazon.aws.aws_az_info:

tests/integration/targets/ec2_transit_gateway/tasks/main.yml

@@ -217,7 +217,7 @@
       - create_result.changed == False
 
   - name: Test success with filter
-    community.aws.ec2_transit_gateway_info:
+    amazon.aws.ec2_transit_gateway_info:
       filters:
         options.multicast-support: enable
     register: result
@@ -229,7 +229,7 @@
 
   # ==== Combine ec2_transit_gateway_info ======================
   - name: Test success with no parameters
-    community.aws.ec2_transit_gateway_info:
+    amazon.aws.ec2_transit_gateway_info:
     register: result
   - name: Assert success with no parameters
     ansible.builtin.assert:
@@ -238,7 +238,7 @@
       - result.transit_gateways != []
 
   - name: Test success with single filter
-    community.aws.ec2_transit_gateway_info:
+    amazon.aws.ec2_transit_gateway_info:
       filters:
         transit-gateway-id: '{{ create_result.transit_gateway.transit_gateway_id }}'
     register: result
@@ -250,7 +250,7 @@
       - result.transit_gateways != []
 
   - name: Test empty result set for non-existent tgw id via filter
-    community.aws.ec2_transit_gateway_info:
+    amazon.aws.ec2_transit_gateway_info:
       filters:
         transit-gateway-id: tgw-00000011111111122
     register: result
@@ -262,7 +262,7 @@
       - result.transit_gateways == []
 
   - name: Test NotFound exception caught and returned empty result set
-    community.aws.ec2_transit_gateway_info:
+    amazon.aws.ec2_transit_gateway_info:
       transit_gateway_id: tgw-00000011111111122
     register: result
 
@@ -273,7 +273,7 @@
       - result.transit_gateways == []
 
   - name: Test success with multiple filters
-    community.aws.ec2_transit_gateway_info:
+    amazon.aws.ec2_transit_gateway_info:
       filters:
         options.dns-support: enable
         options.vpn-ecmp-support: enable

tests/integration/targets/ec2_transit_gateway_vpc_attachment/tasks/cleanup.yml

@@ -54,7 +54,7 @@
   ignore_errors: true
 
 - name: Gather info about all transit gateways
-  community.aws.ec2_transit_gateway_info:
+  amazon.aws.ec2_transit_gateway_info:
     transit_gateway_ids:
     - '{{ tgw_id }}'
     - '{{ tgw_id_2 }}'

tests/integration/targets/ec2_transit_gateway_vpc_attachment/tasks/setup.yml

@@ -13,9 +13,9 @@
     tags:
       Name: '{{ item.name }}'
   loop:
-  - description: Transit Gateway for testing community.aws.ec2_transit_gateway_attachment
+  - description: Transit Gateway for testing ec2_transit_gateway_attachment
     name: '{{ tgw_name }}'
-  - description: Second Transit Gateway for testing community.aws.ec2_transit_gateway_attachment
+  - description: Second Transit Gateway for testing ec2_transit_gateway_attachment
     name: '{{ tgw_name_2 }}'
   register: create_tgws
 

tests/integration/targets/ec2_vol/tasks/main.yml

@@ -6,10 +6,6 @@
       session_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"
 
-  collections:
-    - amazon.aws
-    - community.aws
-
   block:
     - name: Create a test VPC
       amazon.aws.ec2_vpc_net:

tests/integration/targets/ec2_vpc_endpoint_service_info/tasks/main.yml

@@ -6,9 +6,6 @@
       secret_key: "{{ aws_secret_key }}"
       session_token: "{{ security_token | default(omit) }}"
       region: "{{ aws_region }}"
-  collections:
-    - amazon.aws
-    - community.aws
   block:
     - name: List all available services (Check Mode)
       amazon.aws.ec2_vpc_endpoint_service_info:

tests/integration/targets/ec2_vpc_route_table/tasks/main.yml

@@ -151,7 +151,7 @@
       register: transit_gateway
 
     - name: Create VPC attachment
-      community.aws.ec2_transit_gateway_vpc_attachment:
+      amazon.aws.ec2_transit_gateway_vpc_attachment:
         state: present
         name: "{{ resource_prefix }}_vpc_attachment"
         transit_gateway: "{{ transit_gateway.transit_gateway.transit_gateway_id }}"
@@ -1355,7 +1355,7 @@
     # ------------------------------------------------------------------------------------------
 
     - name: Create vgw for gateway route table
-      community.aws.ec2_vpc_vgw:
+      amazon.aws.ec2_vpc_vgw:
         state: present
         vpc_id: "{{ vpc.vpc.id }}"
         type: ipsec.1
@@ -1560,14 +1560,14 @@
         state: absent
       ignore_errors: true
     - name: Destroy VGW
-      community.aws.ec2_vpc_vgw:
+      amazon.aws.ec2_vpc_vgw:
         state: absent
         type: ipsec.1
         name: "{{ resource_prefix }}_vpc"
         vpc_id: "{{ vpc.vpc.id }}"
       ignore_errors: true
     - name: Delete VPC attachment
-      community.aws.ec2_transit_gateway_vpc_attachment:
+      amazon.aws.ec2_transit_gateway_vpc_attachment:
         state: absent
         id: "{{ vpc_attachment.attachments[0].transit_gateway_attachment_id }}"
         wait: true