chore: move dormancy to enterprise package (#9468)

mtojek · web-flow · commit 11d4b6f758d9 · 2023-08-31T17:59:53.000+02:00
diff --git a/cli/server.go b/cli/server.go
@@ -70,7 +70,6 @@ import (
 	"github.com/coder/coder/v2/coderd/database/migrations"
 	"github.com/coder/coder/v2/coderd/database/pubsub"
 	"github.com/coder/coder/v2/coderd/devtunnel"
-	"github.com/coder/coder/v2/coderd/dormancy"
 	"github.com/coder/coder/v2/coderd/gitauth"
 	"github.com/coder/coder/v2/coderd/gitsshkey"
 	"github.com/coder/coder/v2/coderd/httpapi"
@@ -866,9 +865,6 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 			options.StatsBatcher = batcher
 			defer closeBatcher()
 
-			closeCheckInactiveUsersFunc := dormancy.CheckInactiveUsers(ctx, logger, options.Database)
-			defer closeCheckInactiveUsersFunc()
-
 			// We use a separate coderAPICloser so the Enterprise API
 			// can have it's own close functions. This is cleaner
 			// than abstracting the Coder API itself.
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -18,6 +18,7 @@ import (
 	"github.com/coder/coder/v2/enterprise/audit"
 	"github.com/coder/coder/v2/enterprise/audit/backends"
 	"github.com/coder/coder/v2/enterprise/coderd"
+	"github.com/coder/coder/v2/enterprise/coderd/dormancy"
 	"github.com/coder/coder/v2/enterprise/trialer"
 	"github.com/coder/coder/v2/tailnet"
 
@@ -67,6 +68,8 @@ func (r *RootCmd) server() *clibase.Cmd {
 			ProxyHealthInterval:       options.DeploymentValues.ProxyHealthStatusInterval.Value(),
 			DefaultQuietHoursSchedule: options.DeploymentValues.UserQuietHoursSchedule.DefaultSchedule.Value(),
 			ProvisionerDaemonPSK:      options.DeploymentValues.Provisioner.DaemonPSK.Value(),
+
+			CheckInactiveUsersCancelFunc: dormancy.CheckInactiveUsers(ctx, options.Logger, options.Database),
 		}
 
 		api, err := coderd.New(ctx, o)
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -378,6 +378,8 @@ type Options struct {
 
 	// optional pre-shared key for authentication of external provisioner daemons
 	ProvisionerDaemonPSK string
+
+	CheckInactiveUsersCancelFunc func()
 }
 
 type API struct {
@@ -414,6 +416,10 @@ func (api *API) Close() error {
 	if api.derpMesh != nil {
 		_ = api.derpMesh.Close()
 	}
+
+	if api.Options.CheckInactiveUsersCancelFunc != nil {
+		api.Options.CheckInactiveUsersCancelFunc()
+	}
 	return api.AGPL.Close()
 }
 
diff --git a/enterprise/coderd/dormancy/dormantusersjob.go b/enterprise/coderd/dormancy/dormantusersjob.go
diff --git a/enterprise/coderd/dormancy/dormantusersjob_test.go b/enterprise/coderd/dormancy/dormantusersjob_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbfake"
-	"github.com/coder/coder/v2/coderd/dormancy"
+	"github.com/coder/coder/v2/enterprise/coderd/dormancy"
 	"github.com/coder/coder/v2/testutil"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -378,6 +378,8 @@ type Options struct {`
`378`	`378`
`379`	`379`	`// optional pre-shared key for authentication of external provisioner daemons`
`380`	`380`	`ProvisionerDaemonPSK string`
	`381`	`+`
	`382`	`+ CheckInactiveUsersCancelFunc func()`
`381`	`383`	`}`
`382`	`384`
`383`	`385`	`type API struct {`
`@@ -414,6 +416,10 @@ func (api *API) Close() error {`
`414`	`416`	`if api.derpMesh != nil {`
`415`	`417`	`_ = api.derpMesh.Close()`
`416`	`418`	`}`
	`419`	`+`
	`420`	`+ if api.Options.CheckInactiveUsersCancelFunc != nil {`
	`421`	`+ api.Options.CheckInactiveUsersCancelFunc()`
	`422`	`+ }`
`417`	`423`	`return api.AGPL.Close()`
`418`	`424`	`}`
`419`	`425`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`"github.com/coder/coder/v2/coderd/database"`
`15`	`15`	`"github.com/coder/coder/v2/coderd/database/dbfake"`
`16`		`- "github.com/coder/coder/v2/coderd/dormancy"`
	`16`	`+ "github.com/coder/coder/v2/enterprise/coderd/dormancy"`
`17`	`17`	`"github.com/coder/coder/v2/testutil"`
`18`	`18`	`)`
`19`	`19`