Skip to content

Commit b291807

Browse files
committed
Executor never fails
1 parent fda4c6e commit b291807

File tree

5 files changed

+10
-22
lines changed

5 files changed

+10
-22
lines changed

internal/worker/workflow.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,8 @@ func (ww *WorkflowWorker) getExecutor(ctx context.Context, t *task.Workflow) (wo
192192
}
193193

194194
if !ok {
195-
executor, err = workflow.NewExecutor(
195+
executor = workflow.NewExecutor(
196196
ww.backend.Logger(), ww.backend.Tracer(), ww.registry, ww.backend, t.WorkflowInstance, clock.New())
197-
if err != nil {
198-
return nil, fmt.Errorf("creating workflow executor: %w", err)
199-
}
200197
}
201198

202199
// Cache executor instance for future continuation tasks, or refresh last access time

internal/workflow/cache/cache_test.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,14 @@ func Test_Cache_StoreAndGet(t *testing.T) {
2525
r.RegisterWorkflow(workflowWithActivity)
2626

2727
i := core.NewWorkflowInstance("instanceID", "executionID")
28-
e, err := wf.NewExecutor(
28+
e := wf.NewExecutor(
2929
logger.NewDefaultLogger(), trace.NewNoopTracerProvider().Tracer(backend.TracerName), r, &testHistoryProvider{}, i, clock.New())
30-
require.NoError(t, err)
3130

3231
i2 := core.NewWorkflowInstance("instanceID2", "executionID2")
33-
e2, err := wf.NewExecutor(
32+
e2 := wf.NewExecutor(
3433
logger.NewDefaultLogger(), trace.NewNoopTracerProvider().Tracer(backend.TracerName), r, &testHistoryProvider{}, i, clock.New())
35-
require.NoError(t, err)
3634

37-
err = c.Store(context.Background(), i, e)
35+
err := c.Store(context.Background(), i, e)
3836
require.NoError(t, err)
3937

4038
re, ok, err := c.Get(context.Background(), i)
@@ -61,11 +59,10 @@ func Test_Cache_Evict(t *testing.T) {
6159
i := core.NewWorkflowInstance("instanceID", "executionID")
6260
r := wf.NewRegistry()
6361
r.RegisterWorkflow(workflowWithActivity)
64-
e, err := wf.NewExecutor(
62+
e := wf.NewExecutor(
6563
logger.NewDefaultLogger(), trace.NewNoopTracerProvider().Tracer(backend.TracerName), r, &testHistoryProvider{}, i, clock.New())
66-
require.NoError(t, err)
6764

68-
err = c.Store(context.Background(), i, e)
65+
err := c.Store(context.Background(), i, e)
6966
require.NoError(t, err)
7067

7168
go c.StartEviction(context.Background())

internal/workflow/executor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ type executor struct {
5454
wfStartedEventSeen bool
5555
}
5656

57-
func NewExecutor(logger log.Logger, tracer trace.Tracer, registry *Registry, historyProvider WorkflowHistoryProvider, instance *core.WorkflowInstance, clock clock.Clock) (WorkflowExecutor, error) {
57+
func NewExecutor(logger log.Logger, tracer trace.Tracer, registry *Registry, historyProvider WorkflowHistoryProvider, instance *core.WorkflowInstance, clock clock.Clock) WorkflowExecutor {
5858
s := workflowstate.NewWorkflowState(instance, logger, clock)
5959

6060
wfTracer := workflowtracer.New(tracer)
@@ -80,7 +80,7 @@ func NewExecutor(logger log.Logger, tracer trace.Tracer, registry *Registry, his
8080
logger: logger,
8181
tracer: tracer,
8282
wfStartedEventSeen: false,
83-
}, nil
83+
}
8484
}
8585

8686
func (e *executor) ExecuteTask(ctx context.Context, t *task.Workflow) (*ExecutionResult, error) {

internal/workflow/executor_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ func newExecutor(r *Registry, i *core.WorkflowInstance, historyProvider Workflow
3535
logger := logger.NewDefaultLogger()
3636
tracer := trace.NewNoopTracerProvider().Tracer("test")
3737

38-
e, err := NewExecutor(logger, tracer, r, historyProvider, i, clock.New())
39-
if err != nil {
40-
panic(err)
41-
}
38+
e := NewExecutor(logger, tracer, r, historyProvider, i, clock.New())
4239

4340
return e.(*executor)
4441
}

tester/tester.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,7 @@ func (wt *workflowTester[TResult]) Execute(args ...interface{}) {
252252
tw.pendingEvents = tw.pendingEvents[:0]
253253

254254
// Execute task
255-
e, err := workflow.NewExecutor(wt.logger, wt.tracer, wt.registry, &testHistoryProvider{tw.history}, tw.instance, wt.clock)
256-
if err != nil {
257-
panic("could not create workflow executor" + err.Error())
258-
}
255+
e := workflow.NewExecutor(wt.logger, wt.tracer, wt.registry, &testHistoryProvider{tw.history}, tw.instance, wt.clock)
259256

260257
result, err := e.ExecuteTask(context.Background(), t)
261258
if err != nil {

0 commit comments

Comments
 (0)