-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement AnyCommandCompleted decider trigger type (#58)
- Loading branch information
1 parent
6a5ddf5
commit 59aa576
Showing
8 changed files
with
270 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package integ | ||
|
|
||
| import ( | ||
| "context" | ||
| "github.com/indeedeng/iwf/gen/iwfidl" | ||
| anycommandclose "github.com/indeedeng/iwf/integ/workflow/any_command_close" | ||
| "github.com/indeedeng/iwf/service" | ||
| "github.com/stretchr/testify/assert" | ||
| "strconv" | ||
| "testing" | ||
| "time" | ||
| ) | ||
|
|
||
| func TestAnyCommandCloseWorkflowTemporal(t *testing.T) { | ||
| doTestAnyCommandCloseWorkflow(t, service.BackendTypeTemporal) | ||
| } | ||
|
|
||
| func TestAnyCommandCloseWorkflowCadence(t *testing.T) { | ||
| doTestAnyCommandCloseWorkflow(t, service.BackendTypeCadence) | ||
| } | ||
|
|
||
| func doTestAnyCommandCloseWorkflow(t *testing.T, backendType service.BackendType) { | ||
| // start test workflow server | ||
| wfHandler := anycommandclose.NewHandler() | ||
| closeFunc1 := startWorkflowWorker(wfHandler) | ||
| defer closeFunc1() | ||
|
|
||
| closeFunc2 := startIwfService(backendType) | ||
| defer closeFunc2() | ||
|
|
||
| // start a workflow | ||
| apiClient := iwfidl.NewAPIClient(&iwfidl.Configuration{ | ||
| Servers: []iwfidl.ServerConfiguration{ | ||
| { | ||
| URL: "http://localhost:" + testIwfServerPort, | ||
| }, | ||
| }, | ||
| }) | ||
| wfId := anycommandclose.WorkflowType + strconv.Itoa(int(time.Now().Unix())) | ||
| req := apiClient.DefaultApi.ApiV1WorkflowStartPost(context.Background()) | ||
| _, httpResp, err := req.WorkflowStartRequest(iwfidl.WorkflowStartRequest{ | ||
| WorkflowId: wfId, | ||
| IwfWorkflowType: anycommandclose.WorkflowType, | ||
| WorkflowTimeoutSeconds: 10, | ||
| IwfWorkerUrl: "http://localhost:" + testWorkflowServerPort, | ||
| StartStateId: anycommandclose.State1, | ||
| }).Execute() | ||
| panicAtHttpError(err, httpResp) | ||
|
|
||
| signalValue := iwfidl.EncodedObject{ | ||
| Encoding: iwfidl.PtrString("json"), | ||
| Data: iwfidl.PtrString("test-data-1"), | ||
| } | ||
|
|
||
| req2 := apiClient.DefaultApi.ApiV1WorkflowSignalPost(context.Background()) | ||
| httpResp, err = req2.WorkflowSignalRequest(iwfidl.WorkflowSignalRequest{ | ||
| WorkflowId: wfId, | ||
| SignalChannelName: anycommandclose.SignalName2, | ||
| SignalValue: &signalValue, | ||
| }).Execute() | ||
| panicAtHttpError(err, httpResp) | ||
|
|
||
| // wait for the workflow | ||
| reqWait := apiClient.DefaultApi.ApiV1WorkflowGetWithWaitPost(context.Background()) | ||
| _, httpResp, err = reqWait.WorkflowGetRequest(iwfidl.WorkflowGetRequest{ | ||
| WorkflowId: wfId, | ||
| }).Execute() | ||
| panicAtHttpError(err, httpResp) | ||
|
|
||
| history, data := wfHandler.GetTestResult() | ||
| assertions := assert.New(t) | ||
| assertions.Equalf(map[string]int64{ | ||
| "S1_start": 1, | ||
| "S1_decide": 1, | ||
| "S2_start": 1, | ||
| "S2_decide": 1, | ||
| }, history, "anycommandclose test fail, %v", history) | ||
|
|
||
| assertions.Equal(anycommandclose.SignalName2, data["signalChannelName1"]) | ||
| assertions.Equal("signal-cmd-id2", data["signalCommandId1"]) | ||
| assertions.Equal(signalValue, data["signalValue1"]) | ||
| assertions.Equal(service.SignalStatusReceived, data["signalStatus1"]) | ||
|
|
||
| assertions.Equal(anycommandclose.SignalName1, data["signalChannelName0"]) | ||
| assertions.Equal("signal-cmd-id1", data["signalCommandId0"]) | ||
| assertions.Equal(service.SignalStatusWaiting, data["signalStatus0"]) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| package anycommandclose | ||
|
|
||
| import ( | ||
| "github.com/gin-gonic/gin" | ||
| "github.com/indeedeng/iwf/gen/iwfidl" | ||
| "github.com/indeedeng/iwf/integ/workflow/common" | ||
| "github.com/indeedeng/iwf/service" | ||
| "log" | ||
| "net/http" | ||
| ) | ||
|
|
||
| const ( | ||
| WorkflowType = "any_command_close" | ||
| State1 = "S1" | ||
| State2 = "S2" | ||
| SignalName1 = "test-signal-name1" | ||
| SignalName2 = "test-signal-name2" | ||
| ) | ||
|
|
||
| type handler struct { | ||
| invokeHistory map[string]int64 | ||
| invokeData map[string]interface{} | ||
| } | ||
|
|
||
| func NewHandler() common.WorkflowHandler { | ||
| return &handler{ | ||
| invokeHistory: make(map[string]int64), | ||
| invokeData: make(map[string]interface{}), | ||
| } | ||
| } | ||
|
|
||
| // ApiV1WorkflowStartPost - for a workflow | ||
| func (h *handler) ApiV1WorkflowStateStart(c *gin.Context) { | ||
| var req iwfidl.WorkflowStateStartRequest | ||
| if err := c.ShouldBindJSON(&req); err != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) | ||
| return | ||
| } | ||
| log.Println("received state start request, ", req) | ||
|
|
||
| if req.GetWorkflowType() == WorkflowType { | ||
| h.invokeHistory[req.GetWorkflowStateId()+"_start"]++ | ||
| if req.GetWorkflowStateId() == State1 { | ||
| c.JSON(http.StatusOK, iwfidl.WorkflowStateStartResponse{ | ||
| CommandRequest: &iwfidl.CommandRequest{ | ||
| SignalCommands: []iwfidl.SignalCommand{ | ||
| { | ||
| CommandId: "signal-cmd-id1", | ||
| SignalChannelName: SignalName1, | ||
| }, | ||
| { | ||
| CommandId: "signal-cmd-id2", | ||
| SignalChannelName: SignalName2, | ||
| }, | ||
| }, | ||
| DeciderTriggerType: service.DeciderTypeAnyCommandCompleted, | ||
| }, | ||
| }) | ||
| return | ||
| } | ||
| if req.GetWorkflowStateId() == State2 { | ||
| c.JSON(http.StatusOK, iwfidl.WorkflowStateStartResponse{ | ||
| CommandRequest: &iwfidl.CommandRequest{ | ||
| DeciderTriggerType: service.DeciderTypeAllCommandCompleted, | ||
| }, | ||
| }) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| c.JSON(http.StatusBadRequest, struct{}{}) | ||
| } | ||
|
|
||
| func (h *handler) ApiV1WorkflowStateDecide(c *gin.Context) { | ||
| var req iwfidl.WorkflowStateDecideRequest | ||
| if err := c.ShouldBindJSON(&req); err != nil { | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) | ||
| return | ||
| } | ||
| log.Println("received state decide request, ", req) | ||
|
|
||
| if req.GetWorkflowType() == WorkflowType { | ||
| h.invokeHistory[req.GetWorkflowStateId()+"_decide"]++ | ||
| if req.GetWorkflowStateId() == State1 { | ||
| signalResults := req.GetCommandResults() | ||
| h.invokeData["signalCommandResultsLength"] = len(signalResults.SignalResults) | ||
|
|
||
| h.invokeData["signalChannelName0"] = signalResults.SignalResults[0].GetSignalChannelName() | ||
| h.invokeData["signalCommandId0"] = signalResults.SignalResults[0].GetCommandId() | ||
| h.invokeData["signalStatus0"] = signalResults.SignalResults[0].GetSignalRequestStatus() | ||
|
|
||
| h.invokeData["signalChannelName1"] = signalResults.SignalResults[1].GetSignalChannelName() | ||
| h.invokeData["signalCommandId1"] = signalResults.SignalResults[1].GetCommandId() | ||
| h.invokeData["signalStatus1"] = signalResults.SignalResults[1].GetSignalRequestStatus() | ||
| h.invokeData["signalValue1"] = signalResults.SignalResults[1].GetSignalValue() | ||
|
|
||
| c.JSON(http.StatusOK, iwfidl.WorkflowStateDecideResponse{ | ||
| StateDecision: &iwfidl.StateDecision{ | ||
| NextStates: []iwfidl.StateMovement{ | ||
| { | ||
| StateId: State2, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| return | ||
| } else if req.GetWorkflowStateId() == State2 { | ||
| // go to complete | ||
| c.JSON(http.StatusOK, iwfidl.WorkflowStateDecideResponse{ | ||
| StateDecision: &iwfidl.StateDecision{ | ||
| NextStates: []iwfidl.StateMovement{ | ||
| { | ||
| StateId: service.GracefulCompletingWorkflowStateId, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| c.JSON(http.StatusBadRequest, struct{}{}) | ||
| } | ||
|
|
||
| func (h *handler) GetTestResult() (map[string]int64, map[string]interface{}) { | ||
| return h.invokeHistory, h.invokeData | ||
| } |
Submodule iwf-idl
updated
from 3b3e5d to 05d022
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters