Remove Worker interface, return type instead

cschleiden · cschleiden · commit 99cb895e4e96 · 2023-09-21T12:35:42.000-07:00
diff --git a/backend/test/e2e.go b/backend/test/e2e.go
@@ -23,14 +23,14 @@ type backendTest struct {
 	name         string
 	options      []backend.BackendOption
 	withoutCache bool // If set, test will only be run when the cache is disabled
-	f            func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend)
+	f            func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend)
 }
 
 func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOption) TestBackend, teardown func(b TestBackend)) {
 	tests := []backendTest{
 		{
 			name: "SimpleWorkflow",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				wf := func(ctx workflow.Context, msg string) (string, error) {
 					return msg + " world", nil
 				}
@@ -44,7 +44,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "SimpleWorkflow_ExpectedHistory",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				wf := func(ctx workflow.Context, msg string) (string, error) {
 					return msg + " world", nil
 				}
@@ -66,7 +66,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "UnregisteredWorkflow_Errors",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				wf := func(ctx workflow.Context, msg string) (string, error) {
 					return msg + " world", nil
 				}
@@ -80,7 +80,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "WorkflowArgumentMismatch",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				wf := func(ctx workflow.Context, p1 int) (int, error) {
 					return 42, nil
 				}
@@ -96,7 +96,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "UnregisteredActivity_Errors",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				a := func(context.Context) error { return nil }
 				wf := func(ctx workflow.Context) (int, error) {
 					return workflow.ExecuteActivity[int](ctx, workflow.ActivityOptions{
@@ -115,7 +115,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "ActivityArgumentMismatch",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				a := func(context.Context, int, int) error { return nil }
 				wf := func(ctx workflow.Context) (int, error) {
 					return workflow.ExecuteActivity[int](ctx, workflow.ActivityOptions{
@@ -134,7 +134,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "SideEffect_Simple",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				i := 2
 				wf := func(ctx workflow.Context) (int, error) {
 					r1, _ := workflow.SideEffect(ctx, func(ctx workflow.Context) int {
@@ -163,7 +163,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "Signal_after_completion",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				wf := func(ctx workflow.Context) error {
 					return nil
 				}
@@ -180,7 +180,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "SubWorkflow_Simple",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				swf := func(ctx workflow.Context, i int) (int, error) {
 					return i * 2, nil
 				}
@@ -203,7 +203,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "SubWorkflow_PropagateCancellation",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				canceled := int32(0)
 
 				swf := func(ctx workflow.Context, i int) (int, error) {
@@ -267,7 +267,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "SubWorkflow_CancelBeforeStarting",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				swInstanceID := "subworkflow"
 
 				swfrun := 0
@@ -313,7 +313,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "SubWorkflow_Signal",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				swf := func(ctx workflow.Context, i int) (int, error) {
 					workflow.NewSignalChannel[string](ctx, "signal").Receive(ctx)
 
@@ -347,7 +347,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "SubWorkflow_Signal_BeforeStarting",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				wf := func(ctx workflow.Context) (int, error) {
 					id, _ := workflow.SideEffect(ctx, func(ctx workflow.Context) string {
 						id := uuid.New().String()
@@ -371,7 +371,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "Timer_CancelWorkflowInstance",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				a := func(ctx context.Context) error {
 					return nil
 				}
@@ -398,7 +398,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "Timer_CancelBeforeStarting",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				a := func(ctx context.Context) error {
 					return nil
 				}
@@ -441,7 +441,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "Timer_CancelTwice",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				a := func(ctx context.Context) error {
 					return nil
 				}
@@ -484,7 +484,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "Timer_CancelBeforeFiringRemovesFutureEvent",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				a := func(ctx context.Context) error {
 					return nil
 				}
@@ -523,7 +523,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		{
 			name:         "NonDeterminism",
 			withoutCache: true,
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				i := 0
 				wf := func(ctx workflow.Context) (int, error) {
 					var r int
@@ -553,7 +553,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "RemoveWorkflowInstance",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				wf := func(ctx workflow.Context, msg string) (string, error) {
 					return msg + " world", nil
 				}
@@ -576,7 +576,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		{
 			name:    "ContextPropagation",
 			options: []backend.BackendOption{backend.WithContextPropagator(&testContextPropagator{})},
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				a := func(ctx context.Context) (int, error) {
 					d := myValues(ctx)
 					return d.Count, nil
@@ -610,7 +610,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "ContinueAsNew",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				wf := func(ctx workflow.Context, run int) (int, error) {
 					run = run + 1
 					if run < 3 {
@@ -634,7 +634,7 @@ func EndToEndBackendTest(t *testing.T, setup func(options ...backend.BackendOpti
 		},
 		{
 			name: "ContinueAsNew_Subworkflow",
-			f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+			f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 				swf := func(ctx workflow.Context, run int) (int, error) {
 					l := workflow.Logger(ctx)
 
@@ -727,7 +727,7 @@ func (*noopWorkflowExecutorCache) Store(ctx context.Context, instance *core.Work
 	return nil
 }
 
-func register(t *testing.T, ctx context.Context, w worker.Worker, workflows []interface{}, activities []interface{}) {
+func register(t *testing.T, ctx context.Context, w *worker.Worker, workflows []interface{}, activities []interface{}) {
 	for _, wf := range workflows {
 		require.NoError(t, w.RegisterWorkflow(wf))
 	}
diff --git a/backend/test/e2e_activity.go b/backend/test/e2e_activity.go
@@ -22,7 +22,7 @@ func (e *CustomError) Error() string {
 var e2eActivityTests = []backendTest{
 	{
 		name: "Activity_Panic",
-		f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+		f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 			a := func(context.Context) error {
 				panic("activity panic")
 			}
@@ -47,7 +47,7 @@ var e2eActivityTests = []backendTest{
 	},
 	{
 		name: "Activity_CustomError",
-		f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+		f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 			a := func(context.Context) error {
 				return &CustomError{msg: "custom error"}
 			}
diff --git a/backend/test/e2e_stats.go b/backend/test/e2e_stats.go
@@ -14,7 +14,7 @@ import (
 var e2eStatsTests = []backendTest{
 	{
 		name: "Stats_ActiveInstance",
-		f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {
+		f: func(t *testing.T, ctx context.Context, c client.Client, w *worker.Worker, b TestBackend) {
 			as := make(chan bool, 1)
 			af := make(chan bool, 1)
 
diff --git a/contextpropagation/contextpropagator.go b/contextpropagation/contextpropagator.go
@@ -7,6 +7,7 @@ import (
 	"github.com/cschleiden/go-workflows/internal/sync"
 )
 
+// TODO!
 type ContextPropagator interface {
 	Inject(context.Context, *metadata.WorkflowMetadata) error
 	Extract(context.Context, *metadata.WorkflowMetadata) (context.Context, error)
diff --git a/samples/context-propagation/context_propagation.go b/samples/context-propagation/context_propagation.go
@@ -55,7 +55,7 @@ func runWorkflow(ctx context.Context, c client.Client) {
 	log.Println("Workflow finished. Result:", result)
 }
 
-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {
+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {
 	w := worker.New(mb, nil)
 
 	w.RegisterWorkflow(Workflow1)
diff --git a/samples/continue-as-new/continue-as-new.go b/samples/continue-as-new/continue-as-new.go
@@ -71,7 +71,7 @@ func runWorkflow(ctx context.Context, c client.Client) {
 	log.Println("Workflow finished. Result:", result)
 }
 
-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {
+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {
 	w := worker.New(mb, nil)
 
 	w.RegisterWorkflow(Workflow1)
diff --git a/samples/converter/converter.go b/samples/converter/converter.go
@@ -83,7 +83,7 @@ func runWorkflow(ctx context.Context, c client.Client) {
 	log.Println("Workflow finished. Result:", result)
 }
 
-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {
+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {
 	w := worker.New(mb, nil)
 
 	w.RegisterWorkflow(Workflow1)
diff --git a/samples/simple/simple.go b/samples/simple/simple.go
@@ -53,7 +53,7 @@ func runWorkflow(ctx context.Context, c client.Client) {
 	log.Println("Workflow finished. Result:", result)
 }
 
-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {
+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {
 	w := worker.New(mb, nil)
 
 	w.RegisterWorkflow(Workflow1)
diff --git a/samples/subworkflow/subworkflow.go b/samples/subworkflow/subworkflow.go
@@ -53,7 +53,7 @@ func startWorkflow(ctx context.Context, c client.Client) {
 	log.Println("Workflow finished. Result:", result)
 }
 
-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {
+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {
 	w := worker.New(mb, nil)
 
 	w.RegisterWorkflow(ParentWorkflow)
diff --git a/samples/timer/timer.go b/samples/timer/timer.go
@@ -48,7 +48,7 @@ func startWorkflow(ctx context.Context, c client.Client) {
 	log.Println("Workflow finished. Result:", result)
 }
 
-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {
+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {
 	w := worker.New(mb, nil)
 
 	w.RegisterWorkflow(Workflow1)
diff --git a/samples/tracing/tracing.go b/samples/tracing/tracing.go
@@ -99,7 +99,7 @@ func runWorkflow(ctx context.Context, c client.Client) {
 	log.Println("Workflow finished. Result:", result)
 }
 
-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {
+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {
 	w := worker.New(mb, nil)
 
 	w.RegisterWorkflow(Workflow1)
diff --git a/samples/web/web.go b/samples/web/web.go
@@ -72,7 +72,7 @@ func runWorkflow(ctx context.Context, c client.Client) {
 	log.Println("Workflow finished. Result:", result)
 }
 
-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {
+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {
 	w := worker.New(mb, nil)
 
 	w.RegisterWorkflow(Workflow1)
diff --git a/worker/worker.go b/worker/worker.go

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func (e *CustomError) Error() string {`
`22`	`22`	`var e2eActivityTests = []backendTest{`
`23`	`23`	`{`
`24`	`24`	`name: "Activity_Panic",`
`25`		`- f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {`
	`25`	`+ f: func(t testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {`
`26`	`26`	`a := func(context.Context) error {`
`27`	`27`	`panic("activity panic")`
`28`	`28`	`}`
`@@ -47,7 +47,7 @@ var e2eActivityTests = []backendTest{`
`47`	`47`	`},`
`48`	`48`	`{`
`49`	`49`	`name: "Activity_CustomError",`
`50`		`- f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {`
	`50`	`+ f: func(t testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {`
`51`	`51`	`a := func(context.Context) error {`
`52`	`52`	`return &CustomError{msg: "custom error"}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`var e2eStatsTests = []backendTest{`
`15`	`15`	`{`
`16`	`16`	`name: "Stats_ActiveInstance",`
`17`		`- f: func(t *testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {`
	`17`	`+ f: func(t testing.T, ctx context.Context, c client.Client, w worker.Worker, b TestBackend) {`
`18`	`18`	`as := make(chan bool, 1)`
`19`	`19`	`af := make(chan bool, 1)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"github.com/cschleiden/go-workflows/internal/sync"`
`8`	`8`	`)`
`9`	`9`
	`10`	`+// TODO!`
`10`	`11`	`type ContextPropagator interface {`
`11`	`12`	`Inject(context.Context, *metadata.WorkflowMetadata) error`
`12`	`13`	`Extract(context.Context, *metadata.WorkflowMetadata) (context.Context, error)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func runWorkflow(ctx context.Context, c client.Client) {`
`55`	`55`	`log.Println("Workflow finished. Result:", result)`
`56`	`56`	`}`
`57`	`57`
`58`		`-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {`
	`58`	`+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {`
`59`	`59`	`w := worker.New(mb, nil)`
`60`	`60`
`61`	`61`	`w.RegisterWorkflow(Workflow1)`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func runWorkflow(ctx context.Context, c client.Client) {`
`71`	`71`	`log.Println("Workflow finished. Result:", result)`
`72`	`72`	`}`
`73`	`73`
`74`		`-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {`
	`74`	`+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {`
`75`	`75`	`w := worker.New(mb, nil)`
`76`	`76`
`77`	`77`	`w.RegisterWorkflow(Workflow1)`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func runWorkflow(ctx context.Context, c client.Client) {`
`83`	`83`	`log.Println("Workflow finished. Result:", result)`
`84`	`84`	`}`
`85`	`85`
`86`		`-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {`
	`86`	`+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {`
`87`	`87`	`w := worker.New(mb, nil)`
`88`	`88`
`89`	`89`	`w.RegisterWorkflow(Workflow1)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func runWorkflow(ctx context.Context, c client.Client) {`
`53`	`53`	`log.Println("Workflow finished. Result:", result)`
`54`	`54`	`}`
`55`	`55`
`56`		`-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {`
	`56`	`+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {`
`57`	`57`	`w := worker.New(mb, nil)`
`58`	`58`
`59`	`59`	`w.RegisterWorkflow(Workflow1)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func startWorkflow(ctx context.Context, c client.Client) {`
`53`	`53`	`log.Println("Workflow finished. Result:", result)`
`54`	`54`	`}`
`55`	`55`
`56`		`-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {`
	`56`	`+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {`
`57`	`57`	`w := worker.New(mb, nil)`
`58`	`58`
`59`	`59`	`w.RegisterWorkflow(ParentWorkflow)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func startWorkflow(ctx context.Context, c client.Client) {`
`48`	`48`	`log.Println("Workflow finished. Result:", result)`
`49`	`49`	`}`
`50`	`50`
`51`		`-func RunWorker(ctx context.Context, mb backend.Backend) worker.Worker {`
	`51`	`+func RunWorker(ctx context.Context, mb backend.Backend) *worker.Worker {`
`52`	`52`	`w := worker.New(mb, nil)`
`53`	`53`
`54`	`54`	`w.RegisterWorkflow(Workflow1)`