From 31fb8793d7fdb90008a7475a5b9b80bfd73f68b1 Mon Sep 17 00:00:00 2001 From: Fiehe Christoph Date: Wed, 4 Mar 2026 23:26:17 +0100 Subject: [PATCH] Update comments Signed-off-by: Fiehe Christoph --- plugins/lookup/merge_variables.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/lookup/merge_variables.py b/plugins/lookup/merge_variables.py index c56a2d36f1..a175811dab 100644 --- a/plugins/lookup/merge_variables.py +++ b/plugins/lookup/merge_variables.py @@ -348,7 +348,9 @@ class LookupModule(LookupBase): .with_override_behavior(self._override_behavior) ) - if self._dict_merge == "shallow": + if self._dict_merge == "deep": + builder.with_type_strategy(dict, DictMergeStrategies.Merge()) + elif self._dict_merge == "shallow": builder.with_shallow_merge() else: builder.with_type_strategy(dict, DictMergeStrategies.from_name(self._dict_merge)) @@ -463,7 +465,6 @@ class DictMergeStrategies(MergeStrategies): return result strategies = { - "deep": Merge, "merge": Merge, "replace": BaseMergeStrategies.Replace, "keep": BaseMergeStrategies.Keep, @@ -477,7 +478,7 @@ class ListMergeStrategies(MergeStrategies): class Append(MergeStrategy): """ - Append newer entries to the older ones. + Append elements from the right list to elements from the left list. """ def merge(self, merger: ObjectMerger, path: list[str], left: list[t.Any], right: list[t.Any]) -> list[t.Any]: @@ -485,7 +486,7 @@ class ListMergeStrategies(MergeStrategies): class Prepend(MergeStrategy): """ - Insert newer entries in front of the older ones. + Insert elements from the right list at the beginning of the left list. """ def merge(self, merger: ObjectMerger, path: list[str], left: list[t.Any], right: list[t.Any]) -> list[t.Any]: @@ -493,7 +494,7 @@ class ListMergeStrategies(MergeStrategies): class AppendRp(MergeStrategy): """ - Append newer entries to the older ones, overwrite duplicates. + Append elements from the right list to elements from the left list, overwrite duplicates. """ def merge(self, merger: ObjectMerger, path: list[str], left: list[t.Any], right: list[t.Any]) -> list[t.Any]: @@ -501,7 +502,7 @@ class ListMergeStrategies(MergeStrategies): class PrependRp(MergeStrategy): """ - Insert newer entries in front of the older ones, discard duplicates. + Insert elements from the right list at the beginning of the left list, discard duplicates. """ def merge(self, merger: ObjectMerger, path: list[str], left: list[t.Any], right: list[t.Any]) -> list[t.Any]: