From 3c77c8ec3c7c15ada7b33e7a675ba114f316556f Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Sat, 8 Feb 2025 21:46:52 +0100 Subject: [PATCH] [PR #9691/41caa9a2 backport][stable-10] keycloak module utils replace missing return in `get_role_composites` (#9703) keycloak module utils replace missing return in `get_role_composites` (#9691) * fix: replace missing return (#9678) * chore: add changelog fragment (#9678) * chore: update changelog fragment (#9678) Co-authored-by: Felix Fontein --------- Co-authored-by: Felix Fontein (cherry picked from commit 41caa9a22c0896e80c9172c0edb0a89125423ed0) Co-authored-by: Mark Armstrong --- ...dule-utils-replace-missing-return-in-get_role_composites.yml | 2 ++ plugins/module_utils/identity/keycloak/keycloak.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/9691-keycloak-module-utils-replace-missing-return-in-get_role_composites.yml diff --git a/changelogs/fragments/9691-keycloak-module-utils-replace-missing-return-in-get_role_composites.yml b/changelogs/fragments/9691-keycloak-module-utils-replace-missing-return-in-get_role_composites.yml new file mode 100644 index 0000000000..bf48f5f609 --- /dev/null +++ b/changelogs/fragments/9691-keycloak-module-utils-replace-missing-return-in-get_role_composites.yml @@ -0,0 +1,2 @@ +bugfixes: + - keycloak module utils - replaces missing return in get_role_composites method which caused it to return None instead of composite roles (https://github.com/ansible-collections/community.general/issues/9678, https://github.com/ansible-collections/community.general/pull/9691). diff --git a/plugins/module_utils/identity/keycloak/keycloak.py b/plugins/module_utils/identity/keycloak/keycloak.py index 74a6b33150..3c57586940 100644 --- a/plugins/module_utils/identity/keycloak/keycloak.py +++ b/plugins/module_utils/identity/keycloak/keycloak.py @@ -1856,7 +1856,7 @@ class KeycloakAPI(object): else: composite_url = URL_REALM_ROLE_COMPOSITES.format(url=self.baseurl, realm=realm, name=quote(rolerep["name"], safe='')) # Get existing composites - self._request_and_deserialize(composite_url, method='GET') + return self._request_and_deserialize(composite_url, method='GET') except Exception as e: self.fail_request(e, msg='Could not get role %s composites in realm %s: %s' % (rolerep['name'], realm, str(e)))