Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return all infos of a VPC peering connection in ec2_vpc_peer module #355

Merged
merged 12 commits into from
Apr 9, 2021
Merged

Return all infos of a VPC peering connection in ec2_vpc_peer module #355

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4376b08
Return all infos of a VPC peering connection in ec2_vpc_peer module.
stefanhorning Jan 12, 2021
b2b10fe
Rebased on latest main and resolved some git conflicts
stefanhorning Apr 9, 2021
59eb455
Bring back changes lost by rebase, improvements in peering conection …
stefanhorning Apr 9, 2021
1028dfa
Added missing import for boto3_tag_list_to_ansible_dict
stefanhorning Apr 9, 2021
365a3ed
Fix tagging transformation and hopefully tests
stefanhorning Apr 9, 2021
19d6131
Fix return value as I deleted VpcPeeringConnection selector by accident
stefanhorning Apr 9, 2021
6c59b14
Hopefully fixing last issue from merging my code with latest upstream
stefanhorning Apr 9, 2021
c2afdda
More extensive tests for vpc_peer module. Also got rid of redundant h…
stefanhorning Apr 9, 2021
0ae786b
Syntax fix. Refactorings for ec2_vpc_peer module.
stefanhorning Apr 9, 2021
fa0a5d6
Changelog fragment, more return docs, remove leftover from refactoring
stefanhorning Apr 9, 2021
91dd766
Another syntax fix. More docs. Return peering_id in more cases to sta…
stefanhorning Apr 9, 2021
1e766ef
Fixed integration tests, whitespace
stefanhorning Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/355-ec2_vpc_peer_improvements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- ec2_vpc_peer - More return info added, also simplified module code a bit and extended tests (https://github.com/ansible-collections/community.aws/pull/355)
18 changes: 15 additions & 3 deletions plugins/modules/ec2_vpc_peer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,19 @@
vpc_peering_connection:
description: The details of the VPC peering connection as returned by Boto3 (snake cased).
returned: success
type: dict
type: complex
contains:
vpc_peering_connection_id:
type: str
sample: pcx-034223d7c0aec3cde
accepter_vpc_info:
type: dict
requester_vpc_info:
type: dict
tags:
type: dict
status:
type: dict
stefanhorning marked this conversation as resolved.
Show resolved Hide resolved
'''

try:
Expand Down Expand Up @@ -353,9 +365,9 @@ def remove_peer_connection(client, module):
else:
pcx_id = pcx_id or peering_conn['VpcPeeringConnectionId']

if peering_conn[0]['Status']['Code'] == 'deleted':
if peering_conn['Status']['Code'] == 'deleted':
module.exit_json(msg='Connection in deleted state.', changed=False)
if peering_conn[0]['Status']['Code'] == 'rejected':
if peering_conn['Status']['Code'] == 'rejected':
module.exit_json(msg='Connection has been rejected. State cannot be changed and will be removed automatically by AWS', changed=False)

try:
Expand Down