From 3066378a62ba3e58c9319b5d381311cd2155d3fc Mon Sep 17 00:00:00 2001
From: Ryan Lettieri <ryanLettieri@microsoft.com>
Date: Wed, 24 Aug 2022 15:14:08 -0600
Subject: [PATCH] Updates to workflow requests and responses

---
 tests/conformance/workflows/workflows.go |  2 +-
 workflows/requests.go                    |  2 +-
 workflows/temporal/temporal.go           | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tests/conformance/workflows/workflows.go b/tests/conformance/workflows/workflows.go
index f88ffcbd2..c12b6a595 100644
--- a/tests/conformance/workflows/workflows.go
+++ b/tests/conformance/workflows/workflows.go
@@ -61,7 +61,7 @@ func ConformanceTests(t *testing.T, props map[string]string, workflowItem workfl
 			req := &workflows.StartRequest{
 				Parameters: 10, // Time that the activity within the workflow runs for
 			}
-			req.WorkflowInfo.WorkflowId = "TestWorkflow"
+			req.WorkflowInfo.InstanceId = "TestWorkflow"
 			req.Options.TaskQueue = "TestTaskQueue"
 			wf, err := workflowItem.Start(context.Background(), req)
 			assert.Nil(t, err)
diff --git a/workflows/requests.go b/workflows/requests.go
index d73573052..b2b4fd8d2 100644
--- a/workflows/requests.go
+++ b/workflows/requests.go
@@ -11,7 +11,6 @@ type StartRequestOptions struct {
 }
 
 type WorkflowStruct struct {
-	WorkflowId string `json:"workflow_id"`
 	InstanceId string `json:"instance_id"`
 }
 
@@ -19,6 +18,7 @@ type WorkflowStruct struct {
 type StartRequest struct {
 	Options      StartRequestOptions `json:"workflow_options"`
 	WorkflowInfo WorkflowStruct      `json:"workflow_info"`
+	WorkflowName string              `json:"function_name"`
 	Parameters   interface{}         `json:"parameters"`
 }
 
diff --git a/workflows/temporal/temporal.go b/workflows/temporal/temporal.go
index 7f0588cc6..1176105d7 100644
--- a/workflows/temporal/temporal.go
+++ b/workflows/temporal/temporal.go
@@ -69,23 +69,25 @@ func (c *TemporalWF) Init(metadata workflows.Metadata) error {
 
 func (c *TemporalWF) Start(ctx context.Context, req *workflows.StartRequest) (*workflows.WorkflowStruct, error) {
 	c.logger.Debugf("starting workflow")
+
 	if req.Options.TaskQueue == "" {
 		c.logger.Debugf("no task queue provided")
 		return &workflows.WorkflowStruct{}, nil
 	}
-	opt := client.StartWorkflowOptions{ID: req.WorkflowInfo.WorkflowId, TaskQueue: req.Options.TaskQueue}
-	run, err := c.client.ExecuteWorkflow(ctx, opt, req.WorkflowInfo.WorkflowId, req.Parameters)
+	opt := client.StartWorkflowOptions{ID: req.WorkflowInfo.InstanceId, TaskQueue: req.Options.TaskQueue}
+	run, err := c.client.ExecuteWorkflow(ctx, opt, req.WorkflowName, req.Parameters)
 	if err != nil {
 		c.logger.Debugf("error when starting workflow")
 		return &workflows.WorkflowStruct{}, err
 	}
-	wfStruct := workflows.WorkflowStruct{WorkflowId: run.GetID(), InstanceId: run.GetRunID()}
+	wfStruct := workflows.WorkflowStruct{InstanceId: run.GetID()}
 	return &wfStruct, nil
 }
 
 func (c *TemporalWF) Terminate(ctx context.Context, req *workflows.WorkflowStruct) error {
 	c.logger.Debugf("terminating workflow")
-	err := c.client.TerminateWorkflow(ctx, req.WorkflowId, req.InstanceId, "")
+
+	err := c.client.TerminateWorkflow(ctx, req.InstanceId, "", "")
 	if err != nil {
 		return err
 	}
@@ -94,13 +96,13 @@ func (c *TemporalWF) Terminate(ctx context.Context, req *workflows.WorkflowStruc
 
 func (c *TemporalWF) Get(ctx context.Context, req *workflows.WorkflowStruct) (*workflows.StateResponse, error) {
 	c.logger.Debugf("getting workflow data")
-	resp, err := c.client.DescribeWorkflowExecution(ctx, req.WorkflowId, req.InstanceId)
+	resp, err := c.client.DescribeWorkflowExecution(ctx, req.InstanceId, "")
 	if err != nil {
 		return nil, err
 	}
 	// Build the output struct
 	outputStruct := workflows.StateResponse{
-		WfInfo:    workflows.WorkflowStruct{WorkflowId: req.WorkflowId, InstanceId: req.InstanceId},
+		WfInfo:    workflows.WorkflowStruct{InstanceId: req.InstanceId},
 		StartTime: resp.WorkflowExecutionInfo.StartTime.String(),
 		TaskQueue: resp.WorkflowExecutionInfo.GetTaskQueue(),
 		Status:    lookupStatus(resp.WorkflowExecutionInfo.Status),