[PR #8320/a71e1913 backport][stable-7] keycloak_user_federation: fix …

…diff of empty `krbPrincipalAttribute` (#8339) keycloak_user_federation: fix diff of empty `krbPrincipalAttribute` (#8320) keycloak_user_federation: fix diff of empty `krbPrincipalAttribute` (#8320) (cherry picked from commit a71e191) Co-authored-by: Eike Waldt <[email protected]>
ansible-collections · May 11, 2024 · be4e7fc · be4e7fc
1 parent ba9f295
commit be4e7fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/changelogs/fragments/8320-keycloak_user_federation-fix-diff-krbPrincipalAttribute.yaml b/changelogs/fragments/8320-keycloak_user_federation-fix-diff-krbPrincipalAttribute.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+  - keycloak_user_federation - fix diff of empty ``krbPrincipalAttribute`` (https://github.com/ansible-collections/community.general/pull/8320).
diff --git a/plugins/modules/keycloak_user_federation.py b/plugins/modules/keycloak_user_federation.py
@@ -712,6 +712,9 @@ def sanitize(comp):
         compcopy['config'] = dict((k, v[0]) for k, v in compcopy['config'].items())
         if 'bindCredential' in compcopy['config']:
             compcopy['config']['bindCredential'] = '**********'
+        # an empty string is valid for krbPrincipalAttribute but is filtered out in diff
+        if 'krbPrincipalAttribute' not in compcopy['config']:
+            compcopy['config']['krbPrincipalAttribute'] = ''
     if 'mappers' in compcopy:
         for mapper in compcopy['mappers']:
             if 'config' in mapper:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- keycloak_user_federation - fix diff of empty ``krbPrincipalAttribute`` (https://github.com/ansible-collections/community.general/pull/8320).