move rotator out of coderd

sreya · sreya · commit 9ad187d8754c · 2024-10-17T01:49:02.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -746,6 +746,12 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 				return xerrors.Errorf("set deployment id: %w", err)
 			}
 
+			// Start a background process that rotates keys.
+			err = cryptokeys.StartRotator(ctx, options.Logger.Named("keyrotator"), options.Database)
+			if err != nil {
+				return xerrors.Errorf("start key rotator: %w", err)
+			}
+
 			fetcher := &cryptokeys.DBFetcher{
 				DB: options.Database,
 			}
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -449,12 +449,6 @@ func New(options *Options) *API {
 		panic(xerrors.Errorf("get deployment ID: %w", err))
 	}
 
-	// Start a background process that rotates keys.
-	err = cryptokeys.StartRotator(ctx, options.Logger.Named("keyrotator"), options.Database)
-	if err != nil {
-		options.Logger.Fatal(ctx, "start key rotator", slog.Error(err))
-	}
-
 	fetcher := &cryptokeys.DBFetcher{
 		DB: options.Database,
 	}

Original file line number	Diff line number	Diff line change
`@@ -746,6 +746,12 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`746`	`746`	`return xerrors.Errorf("set deployment id: %w", err)`
`747`	`747`	`}`
`748`	`748`
	`749`	`+ // Start a background process that rotates keys.`
	`750`	`+ err = cryptokeys.StartRotator(ctx, options.Logger.Named("keyrotator"), options.Database)`
	`751`	`+ if err != nil {`
	`752`	`+ return xerrors.Errorf("start key rotator: %w", err)`
	`753`	`+ }`
	`754`	`+`
`749`	`755`	`fetcher := &cryptokeys.DBFetcher{`
`750`	`756`	`DB: options.Database,`
`751`	`757`	`}`
Original file line number	Diff line number	Diff line change
`@@ -449,12 +449,6 @@ func New(options Options) API {`
`449`	`449`	`panic(xerrors.Errorf("get deployment ID: %w", err))`
`450`	`450`	`}`
`451`	`451`
`452`		`- // Start a background process that rotates keys.`
`453`		`- err = cryptokeys.StartRotator(ctx, options.Logger.Named("keyrotator"), options.Database)`
`454`		`- if err != nil {`
`455`		`- options.Logger.Fatal(ctx, "start key rotator", slog.Error(err))`
`456`		`- }`
`457`		`-`
`458`	`452`	`fetcher := &cryptokeys.DBFetcher{`
`459`	`453`	`DB: options.Database,`
`460`	`454`	`}`