Yaml merge bugfix: removed concurrent iteration and modification (#264)

netascode · Aug 8, 2024 · 5c33a06 · 5c33a06
1 parent aef57a0
commit 5c33a06
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/iac_validate/yaml.py b/iac_validate/yaml.py
@@ -145,7 +145,7 @@ def merge_dict(
                 merge_dict(value, node, merge_list_items)
         elif isinstance(value, list):
             if key not in destination:
-                destination[key] = value
+                destination[key] = []
             if isinstance(destination[key], list):
                 for i in value:
                     merge_list_item(i, destination[key], merge_list_items)

diff --git a/tests/unit/test_yaml.py b/tests/unit/test_yaml.py
@@ -18,6 +18,20 @@ def test_merge_dict():
     result = {"root": {"child1": "abc", "child2": "def"}}
     yaml.merge_dict(source, destination)
     assert destination == result
+    # make sure that the code doesn't hang when merging lists of lists
+    source = {
+        "switch_link_aggregations": [
+            {
+                "switch_ports": [
+                    {"port_id": "7", "serial": "asd"},
+                    {"port_id": "8", "serial": "qwe"},
+                ]
+            }
+        ]
+    }
+    destination = {}
+    yaml.merge_dict(source, destination)
+    assert destination == source
 
 
 def test_merge_list_item():