Move core package to internal

cschleiden · cschleiden · commit 631f09090a77 · 2022-03-04T16:56:47.000-08:00
diff --git a/backend/backend.go b/backend/backend.go
@@ -3,7 +3,7 @@ package backend
 import (
 	"context"
 
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/history"
 	"github.com/cschleiden/go-workflows/internal/task"
 )
diff --git a/backend/mock_Backend.go b/backend/mock_Backend.go
diff --git a/backend/mysql/mysql.go b/backend/mysql/mysql.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/cschleiden/go-workflows/backend"
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/history"
 	"github.com/cschleiden/go-workflows/internal/task"
 	_ "github.com/go-sql-driver/mysql"
diff --git a/backend/sqlite/sqlite.go b/backend/sqlite/sqlite.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/cschleiden/go-workflows/backend"
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/history"
 	"github.com/cschleiden/go-workflows/internal/task"
 	"github.com/google/uuid"
diff --git a/backend/test/backend.go b/backend/test/backend.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/cschleiden/go-workflows/backend"
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/history"
 	"github.com/cschleiden/go-workflows/internal/task"
 	"github.com/google/uuid"
diff --git a/client/client.go b/client/client.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/cschleiden/go-workflows/backend"
-	"github.com/cschleiden/go-workflows/core"
 	a "github.com/cschleiden/go-workflows/internal/args"
 	"github.com/cschleiden/go-workflows/internal/converter"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/fn"
 	"github.com/cschleiden/go-workflows/internal/history"
 	"github.com/cschleiden/go-workflows/workflow"
@@ -20,9 +20,9 @@ type WorkflowInstanceOptions struct {
 }
 
 type Client interface {
-	CreateWorkflowInstance(ctx context.Context, options WorkflowInstanceOptions, wf workflow.Workflow, args ...interface{}) (core.WorkflowInstance, error)
+	CreateWorkflowInstance(ctx context.Context, options WorkflowInstanceOptions, wf workflow.Workflow, args ...interface{}) (workflow.WorkflowInstance, error)
 
-	CancelWorkflowInstance(ctx context.Context, instance core.WorkflowInstance) error
+	CancelWorkflowInstance(ctx context.Context, instance workflow.WorkflowInstance) error
 
 	SignalWorkflow(ctx context.Context, instanceID string, name string, arg interface{}) error
 }
@@ -37,7 +37,7 @@ func New(backend backend.Backend) Client {
 	}
 }
 
-func (c *client) CreateWorkflowInstance(ctx context.Context, options WorkflowInstanceOptions, wf workflow.Workflow, args ...interface{}) (core.WorkflowInstance, error) {
+func (c *client) CreateWorkflowInstance(ctx context.Context, options WorkflowInstanceOptions, wf workflow.Workflow, args ...interface{}) (workflow.WorkflowInstance, error) {
 	inputs, err := a.ArgsToInputs(converter.DefaultConverter, args...)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not convert arguments")
@@ -65,7 +65,7 @@ func (c *client) CreateWorkflowInstance(ctx context.Context, options WorkflowIns
 	return wfi, nil
 }
 
-func (c *client) CancelWorkflowInstance(ctx context.Context, instance core.WorkflowInstance) error {
+func (c *client) CancelWorkflowInstance(ctx context.Context, instance workflow.WorkflowInstance) error {
 	return c.backend.CancelWorkflowInstance(ctx, instance)
 }
 
diff --git a/internal/core/instance.go b/internal/core/instance.go
diff --git a/internal/history/workflowevent.go b/internal/history/workflowevent.go
@@ -1,6 +1,6 @@
 package history
 
-import "github.com/cschleiden/go-workflows/core"
+import "github.com/cschleiden/go-workflows/internal/core"
 
 // WorkflowEvent is a event addressed for a specific workflow instance
 type WorkflowEvent struct {
diff --git a/internal/task/activity.go b/internal/task/activity.go
@@ -1,7 +1,7 @@
 package task
 
 import (
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/history"
 )
 
diff --git a/internal/task/workflow.go b/internal/task/workflow.go
@@ -1,7 +1,7 @@
 package task
 
 import (
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/history"
 )
 
diff --git a/internal/tester/tester.go b/internal/tester/tester.go
@@ -11,10 +11,10 @@ import (
 	"time"
 
 	"github.com/benbjohnson/clock"
-	"github.com/cschleiden/go-workflows/core"
 	"github.com/cschleiden/go-workflows/internal/activity"
 	margs "github.com/cschleiden/go-workflows/internal/args"
 	"github.com/cschleiden/go-workflows/internal/converter"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/fn"
 	"github.com/cschleiden/go-workflows/internal/history"
 	"github.com/cschleiden/go-workflows/internal/payload"
diff --git a/internal/tester/tester_subworkflow_test.go b/internal/tester/tester_subworkflow_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/workflow"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/internal/workflow/cache.go b/internal/workflow/cache.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 )
 
 type WorkflowExecutorCache interface {
diff --git a/internal/workflow/cache_test.go b/internal/workflow/cache_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/benbjohnson/clock"
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/workflow/executor.go b/internal/workflow/executor.go
@@ -9,8 +9,8 @@ import (
 	"reflect"
 
 	"github.com/benbjohnson/clock"
-	"github.com/cschleiden/go-workflows/core"
 	"github.com/cschleiden/go-workflows/internal/command"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/history"
 	"github.com/cschleiden/go-workflows/internal/payload"
 	"github.com/cschleiden/go-workflows/internal/sync"
diff --git a/internal/workflow/executor_test.go b/internal/workflow/executor_test.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/benbjohnson/clock"
-	"github.com/cschleiden/go-workflows/core"
 	"github.com/cschleiden/go-workflows/internal/command"
 	"github.com/cschleiden/go-workflows/internal/converter"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/history"
 	"github.com/cschleiden/go-workflows/internal/payload"
 	"github.com/cschleiden/go-workflows/internal/sync"
diff --git a/internal/workflow/instance.go b/internal/workflow/instance.go
@@ -1,11 +1,11 @@
 package workflow
 
 import (
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/sync"
 )
 
-func WorkflowInstance(ctx sync.Context) core.WorkflowInstance {
+func WorkflowInstance2(ctx sync.Context) core.WorkflowInstance {
 	wfState := getWfState(ctx)
 	return wfState.instance
 }
diff --git a/internal/workflow/state.go b/internal/workflow/state.go
@@ -4,8 +4,8 @@ import (
 	"time"
 
 	"github.com/benbjohnson/clock"
-	"github.com/cschleiden/go-workflows/core"
 	"github.com/cschleiden/go-workflows/internal/command"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/sync"
 )
 
diff --git a/samples/trace.go b/samples/trace.go
@@ -14,7 +14,7 @@ func Trace(ctx workflow.Context, v ...interface{}) {
 		r = "[replay]"
 	}
 
-	prefix := fmt.Sprintf("[%v][%v]%v", workflow.WorkflowInstance(ctx).GetInstanceID(), workflow.Now(ctx).Format(time.StampMilli), r)
+	prefix := fmt.Sprintf("[%v][%v]%v", workflow.WorkflowInstance2(ctx).GetInstanceID(), workflow.Now(ctx).Format(time.StampMilli), r)
 	args := make([]interface{}, len(v)+1)
 	args[0] = prefix
 	copy(args[1:], v)
diff --git a/workflow/workflow.go b/workflow/workflow.go
@@ -3,12 +3,13 @@ package workflow
 import (
 	"time"
 
-	"github.com/cschleiden/go-workflows/core"
+	"github.com/cschleiden/go-workflows/internal/core"
 	"github.com/cschleiden/go-workflows/internal/sync"
 	internal "github.com/cschleiden/go-workflows/internal/workflow"
 )
 
 type (
+	WorkflowInstance   = core.WorkflowInstance
 	Workflow           = internal.Workflow
 	SubWorkflowOptions = internal.SubWorkflowOptions
 	Activity           = internal.Activity
@@ -47,8 +48,9 @@ func NewSignalChannel(ctx Context, name string) Channel {
 	return internal.NewSignalChannel(ctx, name)
 }
 
-func WorkflowInstance(ctx Context) core.WorkflowInstance {
-	return internal.WorkflowInstance(ctx)
+// TODO: Rename
+func WorkflowInstance2(ctx Context) WorkflowInstance {
+	return internal.WorkflowInstance2(ctx)
 }
 
 func Now(ctx Context) time.Time {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package backend`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "github.com/cschleiden/go-workflows/core"`
	`6`	`+ "github.com/cschleiden/go-workflows/internal/core"`
`7`	`7`	`"github.com/cschleiden/go-workflows/internal/history"`
`8`	`8`	`"github.com/cschleiden/go-workflows/internal/task"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`	`"time"`
`6`	`6`
`7`	`7`	`"github.com/cschleiden/go-workflows/backend"`
`8`		`- "github.com/cschleiden/go-workflows/core"`
`9`	`8`	`a "github.com/cschleiden/go-workflows/internal/args"`
`10`	`9`	`"github.com/cschleiden/go-workflows/internal/converter"`
	`10`	`+ "github.com/cschleiden/go-workflows/internal/core"`
`11`	`11`	`"github.com/cschleiden/go-workflows/internal/fn"`
`12`	`12`	`"github.com/cschleiden/go-workflows/internal/history"`
`13`	`13`	`"github.com/cschleiden/go-workflows/workflow"`
`@@ -20,9 +20,9 @@ type WorkflowInstanceOptions struct {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`type Client interface {`
`23`		`- CreateWorkflowInstance(ctx context.Context, options WorkflowInstanceOptions, wf workflow.Workflow, args ...interface{}) (core.WorkflowInstance, error)`
	`23`	`+ CreateWorkflowInstance(ctx context.Context, options WorkflowInstanceOptions, wf workflow.Workflow, args ...interface{}) (workflow.WorkflowInstance, error)`
`24`	`24`
`25`		`- CancelWorkflowInstance(ctx context.Context, instance core.WorkflowInstance) error`
	`25`	`+ CancelWorkflowInstance(ctx context.Context, instance workflow.WorkflowInstance) error`
`26`	`26`
`27`	`27`	`SignalWorkflow(ctx context.Context, instanceID string, name string, arg interface{}) error`
`28`	`28`	`}`
`@@ -37,7 +37,7 @@ func New(backend backend.Backend) Client {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-func (c *client) CreateWorkflowInstance(ctx context.Context, options WorkflowInstanceOptions, wf workflow.Workflow, args ...interface{}) (core.WorkflowInstance, error) {`
	`40`	`+func (c *client) CreateWorkflowInstance(ctx context.Context, options WorkflowInstanceOptions, wf workflow.Workflow, args ...interface{}) (workflow.WorkflowInstance, error) {`
`41`	`41`	`inputs, err := a.ArgsToInputs(converter.DefaultConverter, args...)`
`42`	`42`	`if err != nil {`
`43`	`43`	`return nil, errors.Wrap(err, "could not convert arguments")`
`@@ -65,7 +65,7 @@ func (c *client) CreateWorkflowInstance(ctx context.Context, options WorkflowIns`
`65`	`65`	`return wfi, nil`
`66`	`66`	`}`
`67`	`67`
`68`		`-func (c *client) CancelWorkflowInstance(ctx context.Context, instance core.WorkflowInstance) error {`
	`68`	`+func (c *client) CancelWorkflowInstance(ctx context.Context, instance workflow.WorkflowInstance) error {`
`69`	`69`	`return c.backend.CancelWorkflowInstance(ctx, instance)`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package task`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/cschleiden/go-workflows/core"`
	`4`	`+ "github.com/cschleiden/go-workflows/internal/core"`
`5`	`5`	`"github.com/cschleiden/go-workflows/internal/history"`
`6`	`6`	`)`
`7`	`7`