From 22764492d289084eb10639fa0ef068014e976387 Mon Sep 17 00:00:00 2001 From: schwadim <114412975+schwadim@users.noreply.github.com> Date: Wed, 15 Feb 2023 09:38:16 +0100 Subject: [PATCH] Pass right amount of args to ResourceTimeout (#585) Pass right amount of args to ResourceTimeout SUMMARY Pass right amount of args to ResourceTimeout Fixes #583 ISSUE TYPE Bugfix Pull Request COMPONENT NAME k8s_scale ADDITIONAL INFORMATION ResourceTimeout constuructor does not accept variable argument length. The passed result dict seems not to be used currently. One could also pass result["result"] or not pass result at all. Reviewed-by: Mike Graves --- ...-k8s_scale-clean-handling-of-ResourceTimeout-exception.yaml | 3 +++ plugins/modules/k8s_scale.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/583-k8s_scale-clean-handling-of-ResourceTimeout-exception.yaml diff --git a/changelogs/fragments/583-k8s_scale-clean-handling-of-ResourceTimeout-exception.yaml b/changelogs/fragments/583-k8s_scale-clean-handling-of-ResourceTimeout-exception.yaml new file mode 100644 index 00000000..3b1f1314 --- /dev/null +++ b/changelogs/fragments/583-k8s_scale-clean-handling-of-ResourceTimeout-exception.yaml @@ -0,0 +1,3 @@ +--- +bugfixes: + - k8s_scale - clean handling of ResourceTimeout exception (https://github.com/ansible-collections/kubernetes.core/issues/583). diff --git a/plugins/modules/k8s_scale.py b/plugins/modules/k8s_scale.py index a7cdfe1e..6671ceb7 100644 --- a/plugins/modules/k8s_scale.py +++ b/plugins/modules/k8s_scale.py @@ -390,7 +390,7 @@ def scale( namespace=namespace, ) if not success: - raise ResourceTimeout("Resource scaling timed out", **result) + raise ResourceTimeout("Resource scaling timed out", result) match, diffs = diff_objects(existing.to_dict(), result["result"]) result["changed"] = not match