Fix child node template handling (#1654)

dtaniwaki · sarabala1979 · commit a65763142ecc · 2019-10-07T09:47:28.000-07:00
diff --git a/workflow/controller/steps.go b/workflow/controller/steps.go
@@ -104,9 +104,9 @@ func (woc *wfOperationCtx) executeSteps(nodeName string, tmplCtx *templateresolu
 				}
 				if len(childNodes) > 0 {
 					// Expanded child nodes should be created from the same template.
-					tmpl := woc.wf.GetStoredTemplate(&childNodes[0])
+					tmpl := woc.wf.GetStoredOrLocalTemplate(&childNodes[0])
 					if tmpl == nil {
-						return errors.InternalErrorf("Template of step node '%s' not found", childNode)
+						return errors.InternalErrorf("Template of step node '%s' not found (inferred from %s)", childNodeName, childNodes[0].Name)
 					}
 					err := woc.processAggregateNodeOutputs(tmpl, stepsCtx.scope, prefix, childNodes)
 					if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,9 @@ func (woc wfOperationCtx) executeSteps(nodeName string, tmplCtx templateresolu`
`104`	`104`	`}`
`105`	`105`	`if len(childNodes) > 0 {`
`106`	`106`	`// Expanded child nodes should be created from the same template.`
`107`		`- tmpl := woc.wf.GetStoredTemplate(&childNodes[0])`
	`107`	`+ tmpl := woc.wf.GetStoredOrLocalTemplate(&childNodes[0])`
`108`	`108`	`if tmpl == nil {`
`109`		`- return errors.InternalErrorf("Template of step node '%s' not found", childNode)`
	`109`	`+ return errors.InternalErrorf("Template of step node '%s' not found (inferred from %s)", childNodeName, childNodes[0].Name)`
`110`	`110`	`}`
`111`	`111`	`err := woc.processAggregateNodeOutputs(tmpl, stepsCtx.scope, prefix, childNodes)`
`112`	`112`	`if err != nil {`