Fix dag output aggregation correctly (#1649)

argoproj · Oct 7, 2019 · cd6f362 · cd6f362
1 parent 706075a
commit cd6f362
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/workflow/controller/dag.go b/workflow/controller/dag.go
@@ -446,7 +446,11 @@ func (woc *wfOperationCtx) resolveDependencyReferences(dagCtx *dagContext, task
  ancestorNodes = append(ancestorNodes, node)
  }
  }
- err := woc.processAggregateNodeOutputs(nil, &scope, prefix, ancestorNodes)
+ tmpl := dagCtx.wf.GetStoredOrLocalTemplate(ancestorNode)
+ if tmpl == nil {
+ return nil, errors.InternalErrorf("Template of ancestor node '%s' not found", ancestorNode.Name)
+ }
+ err := woc.processAggregateNodeOutputs(tmpl, &scope, prefix, ancestorNodes)
  if err != nil {
  return nil, errors.InternalWrapError(err)
  }

diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -1675,7 +1675,7 @@ func (woc *wfOperationCtx) processAggregateNodeOutputs(tmpl *wfv1.Template, scop
  }
  }
  }
- if tmpl != nil && tmpl.GetType() == wfv1.TemplateTypeScript {
+ if tmpl.GetType() == wfv1.TemplateTypeScript {
  resultsJSON, err := json.Marshal(resultsList)
  if err != nil {
  return err