chore: rename package autostart/lifecycle to lifecycle/executor

johnstcn · johnstcn · commit faebe2e27e09 · 2022-05-10T20:47:03.000Z
diff --git a/cli/autostart.go b/cli/autostart.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/coder/coder/coderd/autostart/schedule"
+	"github.com/coder/coder/coderd/lifecycle/schedule"
 	"github.com/coder/coder/codersdk"
 )
 
diff --git a/cli/autostop.go b/cli/autostop.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/coder/coder/coderd/autostart/schedule"
+	"github.com/coder/coder/coderd/lifecycle/schedule"
 	"github.com/coder/coder/codersdk"
 )
 
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -24,8 +24,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coder/coder/coderd/autostart/lifecycle"
-
 	"cloud.google.com/go/compute/metadata"
 	"github.com/fullsailor/pkcs7"
 	"github.com/golang-jwt/jwt"
@@ -43,6 +41,7 @@ import (
 	"github.com/coder/coder/coderd/database/databasefake"
 	"github.com/coder/coder/coderd/database/postgres"
 	"github.com/coder/coder/coderd/gitsshkey"
+	"github.com/coder/coder/coderd/lifecycle/executor"
 	"github.com/coder/coder/coderd/turnconn"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/cryptorand"
@@ -105,7 +104,7 @@ func New(t *testing.T, options *Options) *codersdk.Client {
 	}
 
 	ctx, cancelFunc := context.WithCancel(context.Background())
-	lifecycleExecutor := lifecycle.NewExecutor(
+	lifecycleExecutor := executor.New(
 		ctx,
 		db,
 		slogtest.Make(t, nil).Named("lifecycle.executor").Leveled(slog.LevelDebug),
diff --git a/coderd/lifecycle/executor/lifecycle_executor.go b/coderd/lifecycle/executor/lifecycle_executor.go
@@ -1,4 +1,4 @@
-package lifecycle
+package executor
 
 import (
 	"context"
@@ -7,8 +7,8 @@ import (
 
 	"cdr.dev/slog"
 
-	"github.com/coder/coder/coderd/autostart/schedule"
 	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/lifecycle/schedule"
 
 	"github.com/google/uuid"
 	"github.com/moby/moby/pkg/namesgenerator"
@@ -23,8 +23,8 @@ type Executor struct {
 	tick <-chan time.Time
 }
 
-// NewExecutor returns a new instance of Executor.
-func NewExecutor(ctx context.Context, db database.Store, log slog.Logger, tick <-chan time.Time) *Executor {
+// New returns a new lifecycle executor.
+func New(ctx context.Context, db database.Store, log slog.Logger, tick <-chan time.Time) *Executor {
 	le := &Executor{
 		ctx:  ctx,
 		db:   db,
diff --git a/coderd/lifecycle/executor/lifecycle_executor_test.go b/coderd/lifecycle/executor/lifecycle_executor_test.go
@@ -1,13 +1,13 @@
-package lifecycle_test
+package executor_test
 
 import (
 	"context"
 	"testing"
 	"time"
 
-	"github.com/coder/coder/coderd/autostart/schedule"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/lifecycle/schedule"
 	"github.com/coder/coder/codersdk"
 
 	"github.com/google/uuid"
diff --git a/coderd/lifecycle/schedule/schedule.go b/coderd/lifecycle/schedule/schedule.go
diff --git a/coderd/lifecycle/schedule/schedule_test.go b/coderd/lifecycle/schedule/schedule_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/coderd/autostart/schedule"
+	"github.com/coder/coder/coderd/lifecycle/schedule"
 )
 
 func Test_Weekly(t *testing.T) {
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -13,10 +13,10 @@ import (
 	"github.com/moby/moby/pkg/namesgenerator"
 	"golang.org/x/xerrors"
 
-	"github.com/coder/coder/coderd/autostart/schedule"
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
+	"github.com/coder/coder/coderd/lifecycle/schedule"
 	"github.com/coder/coder/codersdk"
 )
 
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/coderd/autostart/schedule"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/lifecycle/schedule"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/spf13/cobra"`
`9`	`9`
`10`		`- "github.com/coder/coder/coderd/autostart/schedule"`
	`10`	`+ "github.com/coder/coder/coderd/lifecycle/schedule"`
`11`	`11`	`"github.com/coder/coder/codersdk"`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/stretchr/testify/require"`
`8`	`8`
`9`		`- "github.com/coder/coder/coderd/autostart/schedule"`
	`9`	`+ "github.com/coder/coder/coderd/lifecycle/schedule"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func Test_Weekly(t *testing.T) {`