From 639d60b1b983c2de5a6f3a7056eb897174a3e052 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 1 Jun 2023 10:13:05 -0800 Subject: [PATCH] fix: standardize on CODER_PG_CONNECTION_URL Fixes #7513. --- cli/server_createadminuser.go | 2 +- cli/server_createadminuser_test.go | 2 +- cli/testdata/coder_server_create-admin-user_--help.golden | 2 +- docs/cli/server_create-admin-user.md | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/server_createadminuser.go b/cli/server_createadminuser.go index c947675e287bb..fbdfed6b8016e 100644 --- a/cli/server_createadminuser.go +++ b/cli/server_createadminuser.go @@ -238,7 +238,7 @@ func (r *RootCmd) newCreateAdminUserCommand() *clibase.Cmd { createAdminUserCommand.Options.Add( clibase.Option{ - Env: "CODER_POSTGRES_URL", + Env: "CODER_PG_CONNECTION_URL", Flag: "postgres-url", Description: "URL of a PostgreSQL database. If empty, the built-in PostgreSQL deployment will be used (Coder must not be already running in this case).", Value: clibase.StringOf(&newUserDBURL), diff --git a/cli/server_createadminuser_test.go b/cli/server_createadminuser_test.go index 3d6bebf2a4a15..4daca225d71f7 100644 --- a/cli/server_createadminuser_test.go +++ b/cli/server_createadminuser_test.go @@ -157,7 +157,7 @@ func TestServerCreateAdminUser(t *testing.T) { defer cancel() inv, _ := clitest.New(t, "server", "create-admin-user") - inv.Environ.Set("CODER_POSTGRES_URL", connectionURL) + inv.Environ.Set("CODER_PG_CONNECTION_URL", connectionURL) inv.Environ.Set("CODER_SSH_KEYGEN_ALGORITHM", "ed25519") inv.Environ.Set("CODER_USERNAME", username) inv.Environ.Set("CODER_EMAIL", email) diff --git a/cli/testdata/coder_server_create-admin-user_--help.golden b/cli/testdata/coder_server_create-admin-user_--help.golden index cec159f7f0414..6c95fb1954756 100644 --- a/cli/testdata/coder_server_create-admin-user_--help.golden +++ b/cli/testdata/coder_server_create-admin-user_--help.golden @@ -12,7 +12,7 @@ to every organization. The password of the new user. If not specified, you will be prompted via stdin. - --postgres-url string, $CODER_POSTGRES_URL + --postgres-url string, $CODER_PG_CONNECTION_URL URL of a PostgreSQL database. If empty, the built-in PostgreSQL deployment will be used (Coder must not be already running in this case). diff --git a/docs/cli/server_create-admin-user.md b/docs/cli/server_create-admin-user.md index 798ff1beca54d..bc9ebbc39b697 100644 --- a/docs/cli/server_create-admin-user.md +++ b/docs/cli/server_create-admin-user.md @@ -32,10 +32,10 @@ The password of the new user. If not specified, you will be prompted via stdin. ### --postgres-url -| | | -| ----------- | -------------------------------- | -| Type | string | -| Environment | $CODER_POSTGRES_URL | +| | | +| ----------- | ------------------------------------- | +| Type | string | +| Environment | $CODER_PG_CONNECTION_URL | URL of a PostgreSQL database. If empty, the built-in PostgreSQL deployment will be used (Coder must not be already running in this case).