From 79241e672f74a8296c2aa618ea02ccf9120830f1 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Fri, 2 May 2025 06:15:41 +0200 Subject: [PATCH] [PR #10076/f3ea40db backport][stable-10] keycloak_user_rolemapping: fix diff mode (#10093) keycloak_user_rolemapping: fix diff mode (#10076) (cherry picked from commit f3ea40db3d4e0d68700d2ed137d4fc7b35301805) Co-authored-by: Felix Fontein --- changelogs/fragments/10075-keycloak_user_rolemapping-diff.yml | 2 ++ plugins/modules/keycloak_user_rolemapping.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/10075-keycloak_user_rolemapping-diff.yml diff --git a/changelogs/fragments/10075-keycloak_user_rolemapping-diff.yml b/changelogs/fragments/10075-keycloak_user_rolemapping-diff.yml new file mode 100644 index 0000000000..926552ef9d --- /dev/null +++ b/changelogs/fragments/10075-keycloak_user_rolemapping-diff.yml @@ -0,0 +1,2 @@ +bugfixes: + - "keycloak_user_rolemapping - fix ``--diff`` mode (https://github.com/ansible-collections/community.general/issues/10067, https://github.com/ansible-collections/community.general/pull/10075)." diff --git a/plugins/modules/keycloak_user_rolemapping.py b/plugins/modules/keycloak_user_rolemapping.py index c7af801706..c15bf09410 100644 --- a/plugins/modules/keycloak_user_rolemapping.py +++ b/plugins/modules/keycloak_user_rolemapping.py @@ -350,7 +350,7 @@ def main(): # Assign roles result['changed'] = True if module._diff: - result['diff'] = dict(before=assigned_roles_before, after=update_roles) + result['diff'] = dict(before={"roles": assigned_roles_before}, after={"roles": update_roles}) if module.check_mode: module.exit_json(**result) kc.add_user_rolemapping(uid=uid, cid=cid, role_rep=update_roles, realm=realm) @@ -365,7 +365,7 @@ def main(): # Remove mapping of role result['changed'] = True if module._diff: - result['diff'] = dict(before=assigned_roles_before, after=update_roles) + result['diff'] = dict(before={"roles": assigned_roles_before}, after={"roles": update_roles}) if module.check_mode: module.exit_json(**result) kc.delete_user_rolemapping(uid=uid, cid=cid, role_rep=update_roles, realm=realm)