Use single input struct in interceptor signature

interceptor/interceptor.go

@@ -220,6 +220,10 @@ type ScheduleClientCreateInput = internal.ScheduleClientCreateInput
 // ClientOutoundInterceptor.UpdateWorkflow.
 type ClientUpdateWorkflowInput = internal.ClientUpdateWorkflowInput
 
+// ClientUpdateWithStartWorkflowInput is input for
+// ClientOutboundInterceptor.UpdateWithStartWorkflow.
+type ClientUpdateWithStartWorkflowInput = internal.ClientUpdateWithStartWorkflowInput
+
 // Header provides Temporal header information from the context for reading or
 // writing during specific interceptor calls.
 //

interceptor/tracing_interceptor.go

@@ -381,18 +381,17 @@ func (t *tracingClientOutboundInterceptor) UpdateWorkflow(
 
 func (t *tracingClientOutboundInterceptor) UpdateWithStartWorkflow(
 	ctx context.Context,
-	in *ClientUpdateWorkflowInput,
-	startOperation client.WithStartWorkflowOperation,
+	in *ClientUpdateWithStartWorkflowInput,
 ) (client.WorkflowUpdateHandle, error) {
 	// Only add tracing if enabled
 	if t.root.options.DisableUpdateTracing {
-		return t.Next.UpdateWithStartWorkflow(ctx, in, startOperation)
+		return t.Next.UpdateWithStartWorkflow(ctx, in)
 	}
 	// Start span and write to header
 	span, ctx, err := t.root.startSpanFromContext(ctx, &TracerStartSpanOptions{
 		Operation: "UpdateWithStartWorkflow",
-		Name:      in.UpdateName,
-		Tags:      map[string]string{workflowIDTagKey: in.WorkflowID, updateIDTagKey: in.UpdateID},
+		Name:      in.UpdateInput.UpdateName,
+		Tags:      map[string]string{workflowIDTagKey: in.UpdateInput.WorkflowID, updateIDTagKey: in.UpdateInput.UpdateID},
 		ToHeader:  true,
 		Time:      time.Now(),
 	})
@@ -402,7 +401,7 @@ func (t *tracingClientOutboundInterceptor) UpdateWithStartWorkflow(
 	var finishOpts TracerFinishSpanOptions
 	defer span.Finish(&finishOpts)
 
-	val, err := t.Next.UpdateWithStartWorkflow(ctx, in, startOperation)
+	val, err := t.Next.UpdateWithStartWorkflow(ctx, in)
 	finishOpts.Error = err
 	return val, err
 }

internal/interceptor.go

@@ -396,7 +396,7 @@ type ClientOutboundInterceptor interface {
 	// UpdateWithStartWorkflow intercepts client.Client.UpdateWithStartWorkflow.
 	//
 	// NOTE: Experimental
-	UpdateWithStartWorkflow(context.Context, *ClientUpdateWorkflowInput, WithStartWorkflowOperation) (WorkflowUpdateHandle, error)
+	UpdateWithStartWorkflow(context.Context, *ClientUpdateWithStartWorkflowInput) (WorkflowUpdateHandle, error)
 
 	// PollWorkflowUpdate requests the outcome of a specific update from the
 	// server.
@@ -421,6 +421,11 @@ type ClientUpdateWorkflowInput struct {
 	WaitForStage        WorkflowUpdateStage
 }
 
+type ClientUpdateWithStartWorkflowInput struct {
+	UpdateInput            *ClientUpdateWorkflowInput
+	StartWorkflowOperation WithStartWorkflowOperation
+}
+
 // ClientPollWorkflowUpdateInput is the input to
 // ClientOutboundInterceptor.PollWorkflowUpdate.
 type ClientPollWorkflowUpdateInput struct {

internal/interceptor_base.go

@@ -487,10 +487,9 @@ func (c *ClientOutboundInterceptorBase) PollWorkflowUpdate(
 
 func (c *ClientOutboundInterceptorBase) UpdateWithStartWorkflow(
 	ctx context.Context,
-	in *ClientUpdateWorkflowInput,
-	startOperation WithStartWorkflowOperation,
+	in *ClientUpdateWithStartWorkflowInput,
 ) (WorkflowUpdateHandle, error) {
-	return c.Next.UpdateWithStartWorkflow(ctx, in, startOperation)
+	return c.Next.UpdateWithStartWorkflow(ctx, in)
 }
 
 // ExecuteWorkflow implements ClientOutboundInterceptor.ExecuteWorkflow.

internal/internal_workflow_client.go

@@ -1214,7 +1214,10 @@ func (wc *WorkflowClient) UpdateWithStartWorkflow(
 
 	ctx = contextWithNewHeader(ctx)
 
-	return wc.interceptor.UpdateWithStartWorkflow(ctx, updateInput, startOp)
+	return wc.interceptor.UpdateWithStartWorkflow(ctx, &ClientUpdateWithStartWorkflowInput{
+		UpdateInput:            updateInput,
+		StartWorkflowOperation: startOp,
+	})
 }
 
 // CheckHealthRequest is a request for Client.CheckHealth.
@@ -1736,10 +1739,9 @@ func (w *workflowClientInterceptor) ExecuteWorkflow(
 
 func (w *workflowClientInterceptor) UpdateWithStartWorkflow(
 	ctx context.Context,
-	updateInput *ClientUpdateWorkflowInput,
-	startOperation WithStartWorkflowOperation,
+	in *ClientUpdateWithStartWorkflowInput,
 ) (WorkflowUpdateHandle, error) {
-	startOp, ok := startOperation.(*withStartWorkflowOperationImpl)
+	startOp, ok := in.StartWorkflowOperation.(*withStartWorkflowOperationImpl)
 	if !ok {
 		return nil, fmt.Errorf("%w: startOperation must be created by NewWithStartWorkflowOperation", errInvalidWithStartWorkflowOperation)
 	}
@@ -1757,7 +1759,7 @@ func (w *workflowClientInterceptor) UpdateWithStartWorkflow(
 	}
 
 	// Create update request
-	updateReq, err := w.createUpdateWorkflowRequest(ctx, updateInput)
+	updateReq, err := w.createUpdateWorkflowRequest(ctx, in.UpdateInput)
 	if err != nil {
 		return nil, fmt.Errorf("%w: %w", errInvalidWithStartWorkflowOperation, err)
 	}