From d78d6d8b4e975b22c09e3eaf553ce112eed97ea8 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Wed, 2 Nov 2022 10:32:38 +0100 Subject: [PATCH] Fix broken ec2_vpc_vgw tests (#1579) Fix broken ec2_vpc_vgw tests SUMMARY The APIs are no longer consistently returning deleted attachments. Accept both the attachment being listed but marked 'deleted', and not being listed. Amazon's APIs used to be very slow to update this, making waiting for it a bad idea. ISSUE TYPE Bugfix Pull Request COMPONENT NAME ec2_vpc_vgw ADDITIONAL INFORMATION Reviewed-by: Markus Bergholz This commit was initially merged in https://github.com/ansible-collections/community.aws See: https://github.com/ansible-collections/community.aws/commit/cea2ab5cf7a8f778fe2fdf2bfa55fd3e0fba68de --- .../targets/ec2_vpc_vgw/tasks/main.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml b/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml index 0a6f9bacdb7..37bbf5e372d 100644 --- a/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_vgw/tasks/main.yml @@ -105,8 +105,11 @@ - vgw_details.state == 'available' - '"Name" in vgw_details.resource_tags' - vgw_details.resource_tags.Name == vgw_name - - vgw_details.vpc_attachments | length == 2 - - attach_1_description in vgw_details.vpc_attachments + - ( + attach_1_description in vgw_details.vpc_attachments + and + vgw_details.vpc_attachments | length == 2 + ) or ( vgw_details.vpc_attachments | length == 1 ) - attach_2_description in vgw_details.vpc_attachments - name: get VPC VGW facts by Tag @@ -138,8 +141,11 @@ - vgw_details.state == 'available' - '"Name" in vgw_details.resource_tags' - vgw_details.resource_tags.Name == vgw_name - - vgw_details.vpc_attachments | length == 2 - - attach_1_description in vgw_details.vpc_attachments + - ( + attach_1_description in vgw_details.vpc_attachments + and + vgw_details.vpc_attachments | length == 2 + ) or ( vgw_details.vpc_attachments | length == 1 ) - attach_2_description in vgw_details.vpc_attachments # ============================================================ @@ -211,7 +217,7 @@ - name: delete vpn gateway ec2_vpc_vgw: state: absent - vpn_gateway_id: '{{ vgw.vgw.id }}' + vpn_gateway_id: '{{ vgw.vgw.id | default(vgw_id) }}' ignore_errors: yes - name: delete vpc