From dc342cd7f465b8da6d232f4f5403db0fefd3f0aa Mon Sep 17 00:00:00 2001 From: Raz M Date: Tue, 3 May 2022 10:03:59 +0000 Subject: [PATCH] Update ec2_instance find_instances to fix incompatibility with Python 3.8 (#767) Update ec2_instance find_instances to fix incompatibility with Python 3.8 SUMMARY Update ec2_instance find_instances to use temporary dict. instead of inline changes. Fixes #709 ISSUE TYPE Bugfix Pull Request COMPONENT NAME ec2_instance ADDITIONAL INFORMATION Current ec2_module iterates over a filters dictionary to perform hyphen to underscore substitution while popping keys in the process. This is not compatible with Python 3.8. I have simply created a second dictionary, I can also create a shallow copy via the copy() module if the team prefers. Reviewed-by: Bikouo Aubin Reviewed-by: Alina Buzachis Reviewed-by: Mark Chappell (cherry picked from commit 0ca065cf55d6b8e9eb3a55e05c3134325d481416) --- .../709-ec_2_instance-python-3-8-compatibility.yml | 3 +++ plugins/modules/ec2_instance.py | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/709-ec_2_instance-python-3-8-compatibility.yml diff --git a/changelogs/fragments/709-ec_2_instance-python-3-8-compatibility.yml b/changelogs/fragments/709-ec_2_instance-python-3-8-compatibility.yml new file mode 100644 index 00000000000..293f89179b2 --- /dev/null +++ b/changelogs/fragments/709-ec_2_instance-python-3-8-compatibility.yml @@ -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). diff --git a/plugins/modules/ec2_instance.py b/plugins/modules/ec2_instance.py index e7757ed825c..2bfde6f91f2 100644 --- a/plugins/modules/ec2_instance.py +++ b/plugins/modules/ec2_instance.py @@ -1463,6 +1463,8 @@ 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: @@ -1470,13 +1472,16 @@ def find_instances(ids=None, filters=None): 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] + else: + sanitized_filters[key] = filters[key] + 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