mirror of
https://github.com/ansible-middleware/keycloak.git
synced 2026-11-22 15:10:38 +00:00
AMW-644 keycloak_user_federation module always reports task as changed in check mode
This commit is contained in:
@@ -989,7 +989,10 @@ def main():
|
||||
else:
|
||||
old_mapper = {}
|
||||
new_mapper = old_mapper.copy()
|
||||
old_mapper_config = old_mapper.get("config", {})
|
||||
new_mapper.update(change)
|
||||
if "config" in change and old_mapper_config:
|
||||
new_mapper["config"] = {**old_mapper_config, **change["config"]}
|
||||
# changeset contains all desired mappers: those existing, to update or to create
|
||||
if changeset.get("mappers") is None:
|
||||
changeset["mappers"] = list()
|
||||
@@ -1009,6 +1012,12 @@ def main():
|
||||
desired_comp = before_comp.copy()
|
||||
desired_comp.update(changeset)
|
||||
|
||||
# Merge config: preserve KC-internal config keys not managed by this module
|
||||
if "config" in changeset and "config" in before_comp:
|
||||
merged_config = deepcopy(before_comp["config"])
|
||||
merged_config.update(changeset["config"])
|
||||
desired_comp["config"] = merged_config
|
||||
|
||||
result["proposed"] = sanitize(changeset)
|
||||
result["existing"] = sanitize(before_comp)
|
||||
|
||||
@@ -1052,7 +1061,10 @@ def main():
|
||||
old_mapper = {}
|
||||
|
||||
new_mapper = old_mapper.copy()
|
||||
old_default_config = old_mapper.get("config", {})
|
||||
new_mapper.update(desired_mapper)
|
||||
if "config" in desired_mapper and old_default_config:
|
||||
new_mapper["config"] = {**old_default_config, **desired_mapper["config"]}
|
||||
|
||||
if new_mapper.get("id") is not None:
|
||||
kc.update_component(new_mapper, realm)
|
||||
|
||||
Reference in New Issue
Block a user