Allow merging lists within dicts merge

opsmill · Jan 14, 2025 · a8d105b · a8d105b
1 parent 6e82bba
commit a8d105b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/infrahub_sdk/utils.py b/infrahub_sdk/utils.py
@@ -136,8 +136,12 @@ def deep_merge_dict(dicta: dict, dictb: dict, path: list | None = None) -> dict:
         if key in dicta:
             if isinstance(dicta[key], dict) and isinstance(dictb[key], dict):
                 deep_merge_dict(dicta[key], dictb[key], path + [str(key)])
+            elif isinstance(dicta[key], list) and isinstance(dictb[key], list):
+                # Merge lists
+                # Cannot use compare_list because list of dicts won't work (dict not hashable)
+                dicta[key] = [i for i in dicta[key] if i not in dictb[key]] + dictb[key]
             elif dicta[key] == dictb[key]:
-                pass
+                continue
             else:
                 raise ValueError("Conflict at %s" % ".".join(path + [str(key)]))
         else:

diff --git a/tests/unit/sdk/test_utils.py b/tests/unit/sdk/test_utils.py
@@ -87,8 +87,11 @@ def test_deep_merge_dict():
     a = {"keyA": 1}
     b = {"keyB": {"sub1": 10}}
     c = {"keyB": {"sub2": 20}}
+    d = {"keyA": [10, 20]}
+    e = {"keyA": [20, 30]}
     assert deep_merge_dict(a, b) == {"keyA": 1, "keyB": {"sub1": 10}}
     assert deep_merge_dict(c, b) == {"keyB": {"sub1": 10, "sub2": 20}}
+    assert deep_merge_dict(d, e) == {"keyA": [10, 20, 30]}
 
 
 def test_str_to_bool():