Merge branch 'master' into taylan/strict_nondeterminism_option

internal/internal_workflow_testsuite.go

@@ -363,6 +363,7 @@ func (env *testWorkflowEnvironmentImpl) newTestWorkflowEnvironmentForChild(param
 	childEnv.testWorkflowEnvironmentShared = env.testWorkflowEnvironmentShared
 	childEnv.workerOptions = env.workerOptions
 	childEnv.workerOptions.DataConverter = params.dataConverter
+	childEnv.workflowInterceptors = env.workflowInterceptors
 	childEnv.registry = env.registry
 
 	if params.workflowID == "" {

internal/workflow.go

@@ -1413,6 +1413,18 @@ func WithWorkflowTaskList(ctx Context, name string) Context {
 	return ctx1
 }
 
+// WithWorkflowTaskListMapper returns a copy of context and changes workflow tasklist with mapper function.
+func WithWorkflowTaskListMapper(ctx Context, mapper func(string) string) Context {
+	ctx1 := setWorkflowEnvOptionsIfNotExist(ctx)
+	var taskList string
+	if getWorkflowEnvOptions(ctx1).taskListName != nil {
+		taskList = *getWorkflowEnvOptions(ctx1).taskListName
+	}
+	newTaskList := mapper(taskList)
+	getWorkflowEnvOptions(ctx1).taskListName = &newTaskList
+	return ctx1
+}
+
 // WithWorkflowID adds a workflowID to the context.
 func WithWorkflowID(ctx Context, workflowID string) Context {
 	ctx1 := setWorkflowEnvOptionsIfNotExist(ctx)
@@ -1794,12 +1806,21 @@ func WithLocalActivityOptions(ctx Context, options LocalActivityOptions) Context
 }
 
 // WithTaskList adds a task list to the copy of the context.
+// Note this shall not confuse with WithWorkflowTaskList. This is the tasklist for activities
 func WithTaskList(ctx Context, name string) Context {
 	ctx1 := setActivityParametersIfNotExist(ctx)
 	getActivityOptions(ctx1).TaskListName = name
 	return ctx1
 }
 
+// WithTaskListMapper makes a copy of the context and apply the tasklist mapper function
+// Note this shall not confuse with WithWorkflowTaskListMapper. This is the tasklist for activities.
+func WithTaskListMapper(ctx Context, mapper func(string) string) Context {
+	ctx1 := setActivityParametersIfNotExist(ctx)
+	getActivityOptions(ctx1).TaskListName = mapper(getActivityOptions(ctx1).TaskListName)
+	return ctx1
+}
+
 // WithScheduleToCloseTimeout adds a timeout to the copy of the context.
 // The current timeout resolution implementation is in seconds and uses math.Ceil(d.Seconds()) as the duration. But is
 // subjected to change in the future.

workflow/activity_options.go

@@ -58,6 +58,12 @@ func WithTaskList(ctx Context, name string) Context {
 	return internal.WithTaskList(ctx, name)
 }
 
+// WithTaskListMapper makes a copy of current context and update the tasklist with mapper function.
+// Note this is the tasklist for activity tasklist. For workflow tasklist, use WithWorkflowTaskListMapper
+func WithTaskListMapper(ctx Context, mapper func(string) string) Context {
+	return internal.WithTaskListMapper(ctx, mapper)
+}
+
 // WithScheduleToCloseTimeout makes a copy of the current context and update
 // the ScheduleToCloseTimeout field in its activity options. An empty activity
 // options will be created if it does not exist in the original context.

workflow/workflow_options.go

@@ -42,6 +42,11 @@ func WithWorkflowTaskList(ctx Context, name string) Context {
 	return internal.WithWorkflowTaskList(ctx, name)
 }
 
+// WithWorkflowTaskListMapper returns a copy of Context with changed tasklist
+func WithWorkflowTaskListMapper(ctx Context, mapper func(name string) string) Context {
+	return internal.WithWorkflowTaskListMapper(ctx, mapper)
+}
+
 // WithWorkflowID adds a workflowID to the context.
 func WithWorkflowID(ctx Context, workflowID string) Context {
 	return internal.WithWorkflowID(ctx, workflowID)