fix: Support inputs for inline steps templates (#11074)

Signed-off-by: Iain Lane <[email protected]>
Co-authored-by: Saravanan Balasubramanian <[email protected]>

workflow/controller/inline_test.go

@@ -39,3 +39,38 @@ spec:
 	woc.operate(context.Background())
 	assert.Equal(t, wfv1.WorkflowRunning, woc.wf.Status.Phase)
 }
+
+func TestInlineSteps(t *testing.T) {
+	wf := wfv1.MustUnmarshalWorkflow(`
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: steps-inline-
+spec:
+  entrypoint: main
+  templates:
+    - name: main
+      steps:
+        - - name: a
+            inline:
+              inputs:
+                parameters:
+                  - name: message
+                    value: foo
+              container:
+                image: docker/whalesay:latest
+                command:
+                  - cowsay
+                args:
+                  - '{{inputs.parameters.message}}'
+`)
+	cancel, wfc := newController(wf)
+	defer cancel()
+	woc := newWorkflowOperationCtx(wf, wfc)
+	woc.operate(context.Background())
+	assert.Equal(t, wfv1.WorkflowRunning, woc.wf.Status.Phase)
+
+	node := woc.wf.Status.Nodes.FindByDisplayName("a")
+	assert.Equal(t, "message", node.Inputs.Parameters[0].Name)
+	assert.Equal(t, "foo", node.Inputs.Parameters[0].Value.String())
+}

workflow/validate/validate.go

@@ -930,20 +930,30 @@ func (ctx *templateValidationCtx) validateSteps(scope map[string]interface{}, tm
 			if err != nil {
 				return err
 			}
-		}
 
-		stepBytes, err := json.Marshal(stepGroup)
-		if err != nil {
-			return errors.InternalWrapError(err)
-		}
-		err = resolveAllVariables(scope, ctx.globalParams, string(stepBytes), workflowTemplateValidation)
-		if err != nil {
-			return errors.Errorf(errors.CodeBadRequest, "templates.%s.steps %s", tmpl.Name, err.Error())
-		}
+			stepBytes, err := json.Marshal(step)
+			if err != nil {
+				return errors.InternalWrapError(err)
+			}
+
+			stepScope := make(map[string]interface{})
+			for k, v := range scope {
+				stepScope[k] = v
+			}
+
+			if i := step.Inline; i != nil {
+				for _, p := range i.Inputs.Parameters {
+					stepScope["inputs.parameters."+p.Name] = placeholderGenerator.NextPlaceholder()
+				}
+			}
+
+			err = resolveAllVariables(stepScope, ctx.globalParams, string(stepBytes), workflowTemplateValidation)
+			if err != nil {
+				return errors.Errorf(errors.CodeBadRequest, "templates.%s.steps %s", tmpl.Name, err.Error())
+			}
 
-		for _, step := range stepGroup.Steps {
 			aggregate := len(step.WithItems) > 0 || step.WithParam != ""
-			resolvedTmpl := resolvedTemplates[step.Name]
+
 			ctx.addOutputsToScope(resolvedTmpl, fmt.Sprintf("steps.%s", step.Name), scope, aggregate, false)
 
 			// Validate the template again with actual arguments.