From 94472dd7e5f21823da43fae1227be6df773f58dc Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Sat, 14 Sep 2024 08:41:53 +1200 Subject: [PATCH] use dict comprehension in plugins, part 4 (#8858) * use dict comprehension in plugins, part 4 * add changelog frag --- changelogs/fragments/8858-dict-comprehension.yml | 11 +++++++++++ plugins/modules/scaleway_container.py | 6 ++---- plugins/modules/scaleway_container_info.py | 3 +-- plugins/modules/scaleway_container_namespace.py | 6 ++---- plugins/modules/scaleway_container_namespace_info.py | 3 +-- plugins/modules/scaleway_container_registry.py | 6 ++---- plugins/modules/scaleway_container_registry_info.py | 3 +-- plugins/modules/scaleway_function.py | 6 ++---- plugins/modules/scaleway_function_info.py | 3 +-- plugins/modules/scaleway_function_namespace.py | 6 ++---- plugins/modules/scaleway_function_namespace_info.py | 3 +-- 11 files changed, 26 insertions(+), 30 deletions(-) create mode 100644 changelogs/fragments/8858-dict-comprehension.yml diff --git a/changelogs/fragments/8858-dict-comprehension.yml b/changelogs/fragments/8858-dict-comprehension.yml new file mode 100644 index 0000000000..47b4acb329 --- /dev/null +++ b/changelogs/fragments/8858-dict-comprehension.yml @@ -0,0 +1,11 @@ +minor_changes: + - scaleway_container - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). + - scaleway_container_info - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). + - scaleway_container_namespace - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). + - scaleway_container_namespace_info - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). + - scaleway_container_registry - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). + - scaleway_container_registry_info - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). + - scaleway_function - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). + - scaleway_function_info - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). + - scaleway_function_namespace - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). + - scaleway_function_namespace_info - replace Python 2.6 construct with dict comprehensions (https://github.com/ansible-collections/community.general/pull/8858). diff --git a/plugins/modules/scaleway_container.py b/plugins/modules/scaleway_container.py index 8764a76349..a18cb1d75f 100644 --- a/plugins/modules/scaleway_container.py +++ b/plugins/modules/scaleway_container.py @@ -260,8 +260,7 @@ def absent_strategy(api, wished_cn): changed = False cn_list = api.fetch_all_resources("containers") - cn_lookup = dict((cn["name"], cn) - for cn in cn_list) + cn_lookup = {cn["name"]: cn for cn in cn_list} if wished_cn["name"] not in cn_lookup: return changed, {} @@ -285,8 +284,7 @@ def present_strategy(api, wished_cn): changed = False cn_list = api.fetch_all_resources("containers") - cn_lookup = dict((cn["name"], cn) - for cn in cn_list) + cn_lookup = {cn["name"]: cn for cn in cn_list} payload_cn = payload_from_wished_cn(wished_cn) diff --git a/plugins/modules/scaleway_container_info.py b/plugins/modules/scaleway_container_info.py index 20ebece212..350c96e545 100644 --- a/plugins/modules/scaleway_container_info.py +++ b/plugins/modules/scaleway_container_info.py @@ -97,8 +97,7 @@ from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_cn): cn_list = api.fetch_all_resources("containers") - cn_lookup = dict((fn["name"], fn) - for fn in cn_list) + cn_lookup = {cn["name"]: cn for cn in cn_list} if wished_cn["name"] not in cn_lookup: msg = "Error during container lookup: Unable to find container named '%s' in namespace '%s'" % (wished_cn["name"], diff --git a/plugins/modules/scaleway_container_namespace.py b/plugins/modules/scaleway_container_namespace.py index fd56a7d433..0f5de6c31d 100644 --- a/plugins/modules/scaleway_container_namespace.py +++ b/plugins/modules/scaleway_container_namespace.py @@ -167,8 +167,7 @@ def absent_strategy(api, wished_cn): changed = False cn_list = api.fetch_all_resources("namespaces") - cn_lookup = dict((cn["name"], cn) - for cn in cn_list) + cn_lookup = {cn["name"]: cn for cn in cn_list} if wished_cn["name"] not in cn_lookup: return changed, {} @@ -192,8 +191,7 @@ def present_strategy(api, wished_cn): changed = False cn_list = api.fetch_all_resources("namespaces") - cn_lookup = dict((cn["name"], cn) - for cn in cn_list) + cn_lookup = {cn["name"]: cn for cn in cn_list} payload_cn = payload_from_wished_cn(wished_cn) diff --git a/plugins/modules/scaleway_container_namespace_info.py b/plugins/modules/scaleway_container_namespace_info.py index 758720dd57..d783747203 100644 --- a/plugins/modules/scaleway_container_namespace_info.py +++ b/plugins/modules/scaleway_container_namespace_info.py @@ -88,8 +88,7 @@ from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_cn): cn_list = api.fetch_all_resources("namespaces") - cn_lookup = dict((fn["name"], fn) - for fn in cn_list) + cn_lookup = {cn["name"]: cn for cn in cn_list} if wished_cn["name"] not in cn_lookup: msg = "Error during container namespace lookup: Unable to find container namespace named '%s' in project '%s'" % (wished_cn["name"], diff --git a/plugins/modules/scaleway_container_registry.py b/plugins/modules/scaleway_container_registry.py index 6344a7ae66..4f17fecad7 100644 --- a/plugins/modules/scaleway_container_registry.py +++ b/plugins/modules/scaleway_container_registry.py @@ -150,8 +150,7 @@ def absent_strategy(api, wished_cr): changed = False cr_list = api.fetch_all_resources("namespaces") - cr_lookup = dict((cr["name"], cr) - for cr in cr_list) + cr_lookup = {cr["name"]: cr for cr in cr_list} if wished_cr["name"] not in cr_lookup: return changed, {} @@ -175,8 +174,7 @@ def present_strategy(api, wished_cr): changed = False cr_list = api.fetch_all_resources("namespaces") - cr_lookup = dict((cr["name"], cr) - for cr in cr_list) + cr_lookup = {cr["name"]: cr for cr in cr_list} payload_cr = payload_from_wished_cr(wished_cr) diff --git a/plugins/modules/scaleway_container_registry_info.py b/plugins/modules/scaleway_container_registry_info.py index 9c641edcbb..7645789cff 100644 --- a/plugins/modules/scaleway_container_registry_info.py +++ b/plugins/modules/scaleway_container_registry_info.py @@ -87,8 +87,7 @@ from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_cn): cn_list = api.fetch_all_resources("namespaces") - cn_lookup = dict((fn["name"], fn) - for fn in cn_list) + cn_lookup = {cn["name"]: cn for cn in cn_list} if wished_cn["name"] not in cn_lookup: msg = "Error during container registries lookup: Unable to find container registry named '%s' in project '%s'" % (wished_cn["name"], diff --git a/plugins/modules/scaleway_function.py b/plugins/modules/scaleway_function.py index eb121cd9c7..2de0afd987 100644 --- a/plugins/modules/scaleway_function.py +++ b/plugins/modules/scaleway_function.py @@ -245,8 +245,7 @@ def absent_strategy(api, wished_fn): changed = False fn_list = api.fetch_all_resources("functions") - fn_lookup = dict((fn["name"], fn) - for fn in fn_list) + fn_lookup = {fn["name"]: fn for fn in fn_list} if wished_fn["name"] not in fn_lookup: return changed, {} @@ -270,8 +269,7 @@ def present_strategy(api, wished_fn): changed = False fn_list = api.fetch_all_resources("functions") - fn_lookup = dict((fn["name"], fn) - for fn in fn_list) + fn_lookup = {fn["name"]: fn for fn in fn_list} payload_fn = payload_from_wished_fn(wished_fn) diff --git a/plugins/modules/scaleway_function_info.py b/plugins/modules/scaleway_function_info.py index c30f0cdb00..d65987664c 100644 --- a/plugins/modules/scaleway_function_info.py +++ b/plugins/modules/scaleway_function_info.py @@ -96,8 +96,7 @@ from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_fn): fn_list = api.fetch_all_resources("functions") - fn_lookup = dict((fn["name"], fn) - for fn in fn_list) + fn_lookup = {fn["name"]: fn for fn in fn_list} if wished_fn["name"] not in fn_lookup: msg = "Error during function lookup: Unable to find function named '%s' in namespace '%s'" % (wished_fn["name"], diff --git a/plugins/modules/scaleway_function_namespace.py b/plugins/modules/scaleway_function_namespace.py index 0ea31e9bcb..7779761e38 100644 --- a/plugins/modules/scaleway_function_namespace.py +++ b/plugins/modules/scaleway_function_namespace.py @@ -168,8 +168,7 @@ def absent_strategy(api, wished_fn): changed = False fn_list = api.fetch_all_resources("namespaces") - fn_lookup = dict((fn["name"], fn) - for fn in fn_list) + fn_lookup = {fn["name"]: fn for fn in fn_list} if wished_fn["name"] not in fn_lookup: return changed, {} @@ -193,8 +192,7 @@ def present_strategy(api, wished_fn): changed = False fn_list = api.fetch_all_resources("namespaces") - fn_lookup = dict((fn["name"], fn) - for fn in fn_list) + fn_lookup = {fn["name"]: fn for fn in fn_list} payload_fn = payload_from_wished_fn(wished_fn) diff --git a/plugins/modules/scaleway_function_namespace_info.py b/plugins/modules/scaleway_function_namespace_info.py index f3ea5ddfc8..d5d48ee4dd 100644 --- a/plugins/modules/scaleway_function_namespace_info.py +++ b/plugins/modules/scaleway_function_namespace_info.py @@ -88,8 +88,7 @@ from ansible.module_utils.basic import AnsibleModule def info_strategy(api, wished_fn): fn_list = api.fetch_all_resources("namespaces") - fn_lookup = dict((fn["name"], fn) - for fn in fn_list) + fn_lookup = {fn["name"]: fn for fn in fn_list} if wished_fn["name"] not in fn_lookup: msg = "Error during function namespace lookup: Unable to find function namespace named '%s' in project '%s'" % (wished_fn["name"],