ec2_vpc_route_table: Update matching_count parsing on find_subnets fu… #38707
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ansibot
added
aws
bug
|
The test |
ansibot
added
ci_verified
mkrizek
removed
the
needs_triage
ansibot
added
committer_review
willthames
suggested changes
Apr 16, 2018
| @@ -294,7 +294,7 @@ def find_subnets(connection, module, vpc_id, identified_subnets): | |||
| module.fail_json_aws(e, msg="Couldn't find subnet with names %s" % subnet_names) | |||
|
|
|||
| for name in subnet_names: | |||
| matching_count = len([1 for s in subnets_by_name if s.tags.get('Name') == name]) | |||
| matching_count = len([1 for s in subnets_by_name if s['Tags'][0].get('Value') == name]) | |||
There was a problem hiding this comment.
How could this happen? I clearly stuffed this bit up in the boto3 conversion and no-one noticed.
I don't think this improvement will work unless the first tag is always the Name tag, which seems unlikely.
This should probably be
matching_count = len([1 for s in subnets_by_name for t in s.get('Tags', []) if t['Name'] == 'Name' and t['Value'] == name])
Could you add a test for this situation into test/integration/targets/ec2_vpc_route_table/tasks/main.yml (tests would hopefully have caught both the original error and the flaw in this solution)
ansibot
added
needs_revision
ansibot
added
the
stale_ci
ansibot
removed
the
stale_ci
|
Indeed I missed something @willthames! I added the tests and corrected a bug with the ternary operator used to give an appropriate subnet name: {
"assign_ipv6_address_on_creation": false,
"availability_zone": "us-east-1b",
"available_ip_address_count": 251,
"cidr_block": "10.228.231.0/24",
"default_for_az": false,
"id": "subnet-b92fce97",
"ipv6_cidr_block_association_set": [],
"map_public_ip_on_launch": false,
"state": "available",
"subnet_id": "subnet-b92fce97",
"tags": {
"Name": "public-b",
"Public": "False"
},
"vpc_id": "vpc-45a0ec3e"
}, |
ansibot
added
the
stale_ci
ansibot
added
the
stale_review
s-hertel
approved these changes
May 3, 2018
|
Hm. The ternary operator without explicit bool is working exactly the same as with the bool for me. Looks good though. This should be backported to 2.5 as well. |
ryansb
approved these changes
May 3, 2018
ZuZuD
added a commit
to ZuZuD/ansible
that referenced
this pull request
May 10, 2018
ansible#38707) * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function (cherry picked from commit 1905a6e)
oolongbrothers
pushed a commit
to oolongbrothers/ansible
that referenced
this pull request
May 12, 2018
ansible#38707) * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function
oolongbrothers
pushed a commit
to oolongbrothers/ansible
that referenced
this pull request
May 14, 2018
ansible#38707) * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function
oolongbrothers
pushed a commit
to oolongbrothers/ansible
that referenced
this pull request
May 14, 2018
ansible#38707) * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function
tonal
pushed a commit
to tonal/ansible
that referenced
this pull request
May 15, 2018
ansible#38707) * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function
oolongbrothers
pushed a commit
to oolongbrothers/ansible
that referenced
this pull request
May 15, 2018
ansible#38707) * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function
oolongbrothers
pushed a commit
to oolongbrothers/ansible
that referenced
this pull request
May 15, 2018
ansible#38707) * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function
ilicmilan
pushed a commit
to ilicmilan/ansible
that referenced
this pull request
Nov 7, 2018
ansible#38707) * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…nction. Fix #38570
SUMMARY
Fix #38570. Tags for the list of subnets are now parsed properly. I was able to reproduce the initial issue and this PR fixed it.
I don't understand how this could have worked initially if someone can shed some light on this I would appreciate.
ISSUE TYPE
COMPONENT NAME
ec2_vpc_route_table
ANSIBLE VERSION
ADDITIONAL INFORMATION
Also fixed a typo in the function comment.