Skip to content

Commit

Permalink
Fix broken ec2_vpc_vgw tests (#1579) (#1581)
Browse files Browse the repository at this point in the history
[PR #1579/cea2ab5c backport][stable-5] Fix broken ec2_vpc_vgw tests

This is a backport of PR #1579 as merged into main (cea2ab5).
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: Mark Chappell <None>
  • Loading branch information
patchback[bot] authored Nov 2, 2022
1 parent 6999328 commit 660c4f2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/1579-ec2_vpc_vgw-deleted.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
trivial:
- ec2_vpc_vgw - update integration tests to allow for attachments being removed from the list once deleted (https://github.com/ansible-collections/community.aws/pull/1579).
16 changes: 11 additions & 5 deletions tests/integration/targets/ec2_vpc_vgw/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

# ============================================================
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 660c4f2

Please sign in to comment.