export cli.connectToPostgres

johnstcn · johnstcn · commit 09cad5b99822 · 2023-08-28T14:07:38.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -685,7 +685,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 				options.Database = dbfake.New()
 				options.Pubsub = pubsub.NewInMemory()
 			} else {
-				sqlDB, err := connectToPostgres(ctx, logger, sqlDriver, vals.PostgresURL.String())
+				sqlDB, err := ConnectToPostgres(ctx, logger, sqlDriver, vals.PostgresURL.String())
 				if err != nil {
 					return xerrors.Errorf("connect to postgres: %w", err)
 				}
@@ -1950,7 +1950,7 @@ func BuildLogger(inv *clibase.Invocation, cfg *codersdk.DeploymentValues) (slog.
 	}, nil
 }
 
-func connectToPostgres(ctx context.Context, logger slog.Logger, driver string, dbURL string) (*sql.DB, error) {
+func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, dbURL string) (*sql.DB, error) {
 	logger.Debug(ctx, "connecting to postgresql")
 
 	// Try to connect for 30 seconds.
diff --git a/cli/server_createadminuser.go b/cli/server_createadminuser.go
@@ -62,7 +62,7 @@ func (r *RootCmd) newCreateAdminUserCommand() *clibase.Cmd {
 				newUserDBURL = url
 			}
 
-			sqlDB, err := connectToPostgres(ctx, logger, "postgres", newUserDBURL)
+			sqlDB, err := ConnectToPostgres(ctx, logger, "postgres", newUserDBURL)
 			if err != nil {
 				return xerrors.Errorf("connect to postgres: %w", err)
 			}
diff --git a/enterprise/cli/dbcrypt_rotate.go b/enterprise/cli/dbcrypt_rotate.go
@@ -0,0 +1,22 @@
+//go:build !slim
+
+package cli
+
+import (
+	"github.com/coder/coder/v2/cli/clibase"
+)
+
+func (r *RootCmd) dbcryptRotate() *clibase.Cmd {
+	cmd := &clibase.Cmd{
+		Use:   "dbcrypt-rotate",
+		Short: "Rotate database encryption keys",
+		Middleware: clibase.Chain(
+			clibase.RequireNArgs(0),
+		),
+		Handler: func(inv *clibase.Invocation) error {
+			// TODO: implement
+			return nil
+		},
+	}
+	return cmd
+}
diff --git a/enterprise/cli/dbcrypt_rotate_test.go b/enterprise/cli/dbcrypt_rotate_test.go
@@ -0,0 +1,36 @@
+package cli_test
+
+import (
+	"testing"
+
+	"github.com/coder/coder/v2/cli/clitest"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
+	"github.com/coder/coder/v2/enterprise/coderd/license"
+	"github.com/coder/coder/v2/pty/ptytest"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDBCryptRotate(t *testing.T) {
+	t.Parallel()
+
+	// TODO: create a test database and populate some encrypted data with cipher A
+
+	client, _ := coderdenttest.New(t, &coderdenttest.Options{LicenseOptions: &coderdenttest.LicenseOptions{
+		Features: license.Features{
+			codersdk.FeatureExternalTokenEncryption: 1,
+		},
+	}})
+
+	// Run the cmd with ciphers B,A
+
+	inv, conf := newCLI(t, "dbcrypt-rotate") // TODO: env?
+	pty := ptytest.New(t)
+	inv.Stdout = pty.Output()
+	clitest.SetupConfig(t, client, conf)
+
+	err := inv.Run()
+	require.NoError(t, err)
+
+	// TODO: validate that all data has been updated with the checksum of the new cipher.
+}

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (r RootCmd) newCreateAdminUserCommand() clibase.Cmd {`
`62`	`62`	`newUserDBURL = url`
`63`	`63`	`}`
`64`	`64`
`65`		`- sqlDB, err := connectToPostgres(ctx, logger, "postgres", newUserDBURL)`
	`65`	`+ sqlDB, err := ConnectToPostgres(ctx, logger, "postgres", newUserDBURL)`
`66`	`66`	`if err != nil {`
`67`	`67`	`return xerrors.Errorf("connect to postgres: %w", err)`
`68`	`68`	`}`