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

Update ec2_instance find_instances to fix incompatibility with Python 3.8 #767

Merged
merged 3 commits into from
May 3, 2022
Merged

Update ec2_instance find_instances to fix incompatibility with Python 3.8 #767

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4c60e6
* Update ec2_instance find_instances function
Razique Apr 2, 2022
fd362af
* Remove extra space
Razique Apr 2, 2022
708e8a5
* Add tags to sanitized list per feedback
Razique Apr 7, 2022
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
3 changes: 3 additions & 0 deletions changelogs/fragments/709-ec_2_instance-python-3-8-compatibility.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- ec2_instance - ec2_instance module broken in Python 3.8 - dict keys modified during iteration (https://github.com/ansible-collections/amazon.aws/issues/709).
7 changes: 5 additions & 2 deletions plugins/modules/ec2_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1463,20 +1463,23 @@ def change_network_attachments(instance, params):

def find_instances(ids=None, filters=None):
paginator = client.get_paginator('describe_instances')
sanitized_filters = dict()

if ids:
params = dict(InstanceIds=ids)
elif filters is None:
module.fail_json(msg="No filters provided when they were required")
else:
for key in list(filters.keys()):
if not key.startswith("tag:"):
filters[key.replace("_", "-")] = filters.pop(key)
params = dict(Filters=ansible_dict_to_boto3_filter_list(filters))
sanitized_filters[key.replace("_", "-")] = filters[key]
Razique marked this conversation as resolved.
Show resolved Hide resolved
params = dict(Filters=ansible_dict_to_boto3_filter_list(sanitized_filters))

try:
results = _describe_instances(**params)
except (botocore.exceptions.BotoCoreError, botocore.exceptions.ClientError) as e:
module.fail_json_aws(e, msg="Could not describe instances")

retval = list(results)
return retval

Expand Down