feat: substitution recurses into nested dicts

Author: bertbesser

src/popper/parser.py

@@ -141,10 +141,7 @@ def __apply_substitution(wf_element, k, v, used_registry):
             for ek in wf_element:
                 if k in ek:
                     log.fail("Substitutions not allowed on dictionary keys")
-                if k in wf_element[ek]:
-                    log.debug(f"Applying substitution to value associated to key {k}")
-                    wf_element[ek] = wf_element[ek].replace(k, v)
-                    used_registry[k] = 1
+                wf_element[ek] = WorkflowParser.__apply_substitution(wf_element[ek], k, v, used_registry)
 
         return wf_element
 

src/test/test_parser.py

@@ -163,6 +163,37 @@ def test_substitutions(self):
             **{"wf_data": wf_data, "substitutions": substitutions}
         )
 
+        # substitute nested
+        wf_data = {
+            "steps": [
+                {
+                    "uses": "some_$_SUB1",
+                    "id": "some other $_SUB2",
+                    "env": {"FOO": "env_$_SUB3"},
+                    "secrets": ["secret_$_SUB4"],
+                    "options": {
+                        "labels": {"timestamp": "$_TIMESTAMP"}
+                    },
+                }
+            ]
+        }
+        substitutions = [
+            "_TIMESTAMP=1613916937",
+            "_SUB1=ONE",
+            "_SUB2=TWO",
+            "_SUB3=THREE",
+            "_SUB4=4",
+        ]
+        wf = WorkflowParser.parse(
+            wf_data=wf_data, substitutions=substitutions,
+        )
+        step = wf.steps[0]
+        self.assertEqual("some_ONE", step.uses)
+        self.assertEqual("some other TWO", step.id)
+        self.assertEqual("env_THREE", step.env["FOO"])
+        self.assertEqual(("secret_4",), step.secrets)
+        self.assertEqual({"timestamp": "1613916937"}, step.options.labels)
+
         # allow loose substitutions
         wf = WorkflowParser.parse(
             wf_data=wf_data, substitutions=substitutions, allow_loose=True