fix: fix compatibility for output

Signed-off-by: FogDong <[email protected]>

Author: FogDong

pkg/hooks/data_passing.go

@@ -64,6 +64,14 @@ func Output(ctx wfContext.Context, taskValue cue.Value, step v1alpha1.WorkflowSt
 		SetAdditionalNameInStatus(stepStatus, step.Name, step.Properties, status)
 		for _, output := range step.Outputs {
 			v, err := value.LookupValueByScript(taskValue, output.ValueFrom)
+			if err != nil && strings.Contains(err.Error(), "not exist") && !strings.Contains(output.ValueFrom, "$returns.") {
+				parts := strings.Split(output.ValueFrom, ".")
+				if len(parts) > 1 {
+					v, err = value.LookupValueByScript(taskValue, fmt.Sprintf("%s.$returns.%s", parts[0], strings.Join(parts[1:], ".")))
+				} else {
+					v, err = value.LookupValueByScript(taskValue, fmt.Sprintf("%s.$returns", output.ValueFrom))
+				}
+			}
 			// if the error is not nil and the step is not skipped, return the error
 			if err != nil && status.Phase != v1alpha1.WorkflowStepPhaseSkipped {
 				errMsg += fmt.Sprintf("failed to get output from %s: %s\n", output.ValueFrom, err.Error())

pkg/hooks/data_passing_test.go

@@ -114,6 +114,53 @@ func TestOutput(t *testing.T) {
 	r.NoError(err)
 	r.Equal(int(resultInt), 99)
 	r.Equal(stepStatus["mystep"].Phase, v1alpha1.WorkflowStepPhaseSucceeded)
+
+	taskValue = cuectx.CompileString(`output: $returns: score: 99`)
+	stepStatus = make(map[string]v1alpha1.StepStatus)
+	err = Output(wfCtx, taskValue, v1alpha1.WorkflowStep{
+		WorkflowStepBase: v1alpha1.WorkflowStepBase{
+			Properties: &runtime.RawExtension{
+				Raw: []byte("{\"name\":\"mystep\"}"),
+			},
+			Outputs: v1alpha1.StepOutputs{{
+				ValueFrom: "output.$returns.score",
+				Name:      "myscore2",
+			}},
+		},
+	}, v1alpha1.StepStatus{
+		Phase: v1alpha1.WorkflowStepPhaseSucceeded,
+	}, stepStatus)
+	r.NoError(err)
+	result, err = wfCtx.GetVar("myscore2")
+	r.NoError(err)
+	resultInt, err = result.Int64()
+	r.NoError(err)
+	r.Equal(int(resultInt), 99)
+	r.Equal(stepStatus["mystep"].Phase, v1alpha1.WorkflowStepPhaseSucceeded)
+
+
+	taskValue = cuectx.CompileString(`output: $returns: score: 99`)
+	stepStatus = make(map[string]v1alpha1.StepStatus)
+	err = Output(wfCtx, taskValue, v1alpha1.WorkflowStep{
+		WorkflowStepBase: v1alpha1.WorkflowStepBase{
+			Properties: &runtime.RawExtension{
+				Raw: []byte("{\"name\":\"mystep\"}"),
+			},
+			Outputs: v1alpha1.StepOutputs{{
+				ValueFrom: "output.score",
+				Name:      "myscore3",
+			}},
+		},
+	}, v1alpha1.StepStatus{
+		Phase: v1alpha1.WorkflowStepPhaseSucceeded,
+	}, stepStatus)
+	r.NoError(err)
+	result, err = wfCtx.GetVar("myscore3")
+	r.NoError(err)
+	resultInt, err = result.Int64()
+	r.NoError(err)
+	r.Equal(int(resultInt), 99)
+	r.Equal(stepStatus["mystep"].Phase, v1alpha1.WorkflowStepPhaseSucceeded)
 }
 
 func mockContext(t *testing.T) wfContext.Context {