mirror of
https://github.com/ansible-middleware/keycloak.git
synced 2026-11-21 14:48:50 +00:00
Fix #396 keycloak_user_federation.py mapper sorting now happens after unspecified mappers are merged in
This commit is contained in:
@@ -994,7 +994,6 @@ def main():
|
||||
if changeset.get("mappers") is None:
|
||||
changeset["mappers"] = list()
|
||||
changeset["mappers"].append(new_mapper)
|
||||
changeset["mappers"] = sorted(changeset["mappers"], key=lambda x: x.get("name") or "")
|
||||
|
||||
# to keep unspecified existing mappers we add them to the desired mappers list, unless they're already present
|
||||
if not module.params["remove_unspecified_mappers"] and "mappers" in before_comp:
|
||||
@@ -1003,6 +1002,9 @@ def main():
|
||||
[mapper for mapper in before_comp["mappers"] if mapper["id"] not in changeset_mapper_ids]
|
||||
)
|
||||
|
||||
# ensure idempotency in case module.params.mappers is not sorted by name
|
||||
changeset["mappers"] = sorted(changeset["mappers"], key=lambda x: x.get("name") or "")
|
||||
|
||||
# Prepare the desired values using the existing values (non-existence results in a dict that is save to use as a basis)
|
||||
desired_comp = before_comp.copy()
|
||||
desired_comp.update(changeset)
|
||||
|
||||
Reference in New Issue
Block a user