v08 - fix ContinueAs data field assignment

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

Author: spolti

model/action.go

@@ -86,14 +86,6 @@ func (f *FunctionRef) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-// WorkflowRef holds a reference for a workflow definition
-type WorkflowRef struct {
-	// Sub-workflow unique id
-	WorkflowID string `json:"workflowId" validate:"required"`
-	// Sub-workflow version
-	Version string `json:"version,omitempty"`
-}
-
 // UnmarshalJSON ...
 func (s *WorkflowRef) UnmarshalJSON(data []byte) error {
 	subflowRef := make(map[string]json.RawMessage)

model/states.go

@@ -16,7 +16,6 @@ package model
 
 import (
 	"encoding/json"
-
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 

model/workflow.go

@@ -206,6 +206,14 @@ func (w *Workflow) setDefaults() {
 	}
 }
 
+// WorkflowRef holds a reference for a workflow definition
+type WorkflowRef struct {
+	// Sub-workflow unique id
+	WorkflowID string `json:"workflowId" validate:"required"`
+	// Sub-workflow version
+	Version string `json:"version,omitempty"`
+}
+
 // Timeouts ...
 type Timeouts struct {
 	// WorkflowExecTimeout Workflow execution timeout duration (ISO 8601 duration format). If not specified should be 'unlimited'
@@ -486,12 +494,45 @@ func (e *End) UnmarshalJSON(data []byte) error {
 type ContinueAs struct {
 	WorkflowRef
 	// TODO: add object or string data type
-	// If string type, an expression which selects parts of the states data output to become the workflow data input of continued execution. If object type, a custom object to become the workflow data input of the continued execution
+	// If string type, an expression which selects parts of the states data output to become the workflow data input of
+	// continued execution. If object type, a custom object to become the workflow data input of the continued execution
 	Data interface{} `json:"data,omitempty"`
 	// WorkflowExecTimeout Workflow execution timeout to be used by the workflow continuing execution. Overwrites any specific settings set by that workflow
 	WorkflowExecTimeout WorkflowExecTimeout `json:"workflowExecTimeout,omitempty"`
 }
 
+func (c *ContinueAs) UnmarshalJSON(data []byte) error {
+	rewf := make(map[string]interface{})
+	if err := json.Unmarshal(data, &rewf); err != nil {
+		c.WorkflowID, err = unmarshalString(data)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+
+	c.WorkflowID = requiresNotNilOrEmpty(rewf["workflowId"])
+	if rewf["version"] != "" {
+		c.Version = requiresNotNilOrEmpty(rewf["version"])
+	}
+	if rewf["data"] != "" {
+		c.Data = requiresNotNilOrEmpty(rewf["data"])
+	}
+	if rewf["workflowExecTimeout"] != "" {
+		timeout := make(map[string]json.RawMessage)
+		if err := json.Unmarshal(data, &timeout); err != nil {
+			if err != nil {
+				return err
+			}
+		}
+		if err := unmarshalKey("workflowExecTimeout", timeout, &c.WorkflowExecTimeout); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // ProduceEvent ...
 type ProduceEvent struct {
 	// References a name of a defined event

parser/parser_test.go

@@ -329,6 +329,23 @@ func TestFromFile(t *testing.T) {
 				assert.Equal(t, "PT30D", w.Timeouts.WorkflowExecTimeout.Duration)
 				assert.Equal(t, "CancelOrder", w.Timeouts.WorkflowExecTimeout.RunBefore)
 			},
+		}, {
+			"./testdata/workflows/continue-as-example.yaml", func(t *testing.T, w *model.Workflow) {
+				assert.Equal(t, "Notify Customer", w.Name)
+				eventState := w.States[1].(*model.DataBasedSwitchState)
+
+				assert.NotNil(t, eventState)
+				assert.NotEmpty(t, eventState.DataConditions)
+				assert.IsType(t, &model.EndDataCondition{}, eventState.DataConditions[0])
+
+				endDataCondition := eventState.DataConditions[0].(*model.EndDataCondition)
+				assert.Equal(t, "notifycustomerworkflow", endDataCondition.End.ContinueAs.WorkflowRef.WorkflowID)
+				assert.Equal(t, "1.0", endDataCondition.End.ContinueAs.WorkflowRef.Version)
+				assert.Equal(t, "${ del(.customerCount) }", endDataCondition.End.ContinueAs.Data)
+				assert.Equal(t, "GenerateReport", endDataCondition.End.ContinueAs.WorkflowExecTimeout.RunBefore)
+				assert.Equal(t, true, endDataCondition.End.ContinueAs.WorkflowExecTimeout.Interrupt)
+				assert.Equal(t, "PT1H", endDataCondition.End.ContinueAs.WorkflowExecTimeout.Duration)
+			},
 		},
 	}
 	for _, file := range files {

parser/testdata/workflows/continue-as-example.yaml

@@ -0,0 +1,58 @@
+# Copyright 2022 The Serverless Workflow Specification Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+id: notifycustomerworkflow
+name: Notify Customer
+version: '1.0'
+specVersion: '0.8'
+start: WaitForCustomerEvent
+states:
+  - name: WaitForCustomerEvent
+    type: event
+    onEvents:
+      - eventRefs:
+          - CustomerEvent
+        eventDataFilter:
+          data: "${ .customerId }"
+          toStateData: "${ .eventCustomerId }"
+        actions:
+          - functionRef:
+              refName: NotifyCustomerFunction
+              arguments:
+                customerId: "${ .eventCustomerId }"
+    stateDataFilter:
+      output: "${ .count = .count + 1 }"
+    transition: CheckEventQuota
+  - name: CheckEventQuota
+    type: switch
+    dataConditions:
+      - condition: "${ try(.customerCount) != null and .customerCount > .quota.maxConsumedEvents}"
+        end:
+          continueAs:
+            workflowId: notifycustomerworkflow
+            version: '1.0'
+            data: "${ del(.customerCount) }"
+            workflowExecTimeout:
+              duration: "PT1H"
+              runBefore: "GenerateReport"
+              interrupt: true
+    defaultCondition:
+      transition: WaitForCustomerEvent
+events:
+  - name: CustomerEvent
+    type: org.events.customerEvent
+    source: customerSource
+functions:
+  - name: NotifyCustomerFunction
+    operation: http://myapis.org/customerapis.json#notifyCustomer