Skip to content

Commit

Permalink
Allow merging params and params_from_context while also using loop_ov…
Browse files Browse the repository at this point in the history
…er_context (#36)
  • Loading branch information
jacobsee authored Aug 20, 2020
1 parent 0ae97a1 commit 938155c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions resource-dispatcher/execution/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ def execute_step(fn, step, context):
# Construct parameters for this run
constructed_params = {}
if "params_from_context" in step:
constructed_params.update(context_copy[step["params_from_context"]])
deep_merge(constructed_params, context_copy[step["params_from_context"]])
if "params" in step:
constructed_params.update(step["params"])
deep_merge(constructed_params, step["params"])
# Run step
fn(context_copy, constructed_params)
# Write (potentially) modified list element back to the loop_list
Expand Down

0 comments on commit 938155c

Please sign in to comment.