rename awsrdsiam to awsiamrds to match v1

coder · f0ssel · Mar 20, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 14, 2024
commit c0a05156350eb202c6e3b0ef2a0ec576ca1d4fc6
diff --git a/cli/server.go b/cli/server.go
@@ -64,7 +64,7 @@ import (
 	"github.com/coder/coder/v2/coderd/autobuild"
 	"github.com/coder/coder/v2/coderd/batchstats"
 	"github.com/coder/coder/v2/coderd/database"
-	"github.com/coder/coder/v2/coderd/database/awsrdsiam"
+	"github.com/coder/coder/v2/coderd/database/awsiamrds"
 	"github.com/coder/coder/v2/coderd/database/dbmem"
 	"github.com/coder/coder/v2/coderd/database/dbmetrics"
 	"github.com/coder/coder/v2/coderd/database/dbpurge"
@@ -2551,8 +2551,8 @@ func getPostgresDB(ctx context.Context, logger slog.Logger, postgresURL string,
 		return nil, "", xerrors.Errorf("escaping postgres URL: %w", err)
 	}
 
-	if auth == codersdk.PostgresAuthAWSRDSIAM {
-		sqlDriver, err = awsrdsiam.Register(ctx, sqlDriver)
+	if auth == codersdk.PostgresAuthAWSIAMRDS {
+		sqlDriver, err = awsiamrds.Register(ctx, sqlDriver)
 		if err != nil {
 			return nil, "", xerrors.Errorf("register aws rds iam auth: %w", err)
 		}

diff --git a/cli/server_createadminuser.go b/cli/server_createadminuser.go
@@ -13,7 +13,7 @@ import (
 	"cdr.dev/slog/sloggers/sloghuman"
 	"github.com/coder/coder/v2/cli/cliui"
 	"github.com/coder/coder/v2/coderd/database"
-	"github.com/coder/coder/v2/coderd/database/awsrdsiam"
+	"github.com/coder/coder/v2/coderd/database/awsiamrds"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/gitsshkey"
 	"github.com/coder/coder/v2/coderd/httpapi"
@@ -65,8 +65,8 @@ func (r *RootCmd) newCreateAdminUserCommand() *serpent.Command {
 			}
 
 			sqlDriver := "postgres"
-			if codersdk.PostgresAuth(newUserPgAuth) == codersdk.PostgresAuthAWSRDSIAM {
-				sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)
+			if codersdk.PostgresAuth(newUserPgAuth) == codersdk.PostgresAuthAWSIAMRDS {
+				sqlDriver, err = awsiamrds.Register(inv.Context(), sqlDriver)
 				if err != nil {
 					return xerrors.Errorf("register aws rds iam auth: %w", err)
 				}

diff --git a/coderd/database/awsrdsiam/driver.go → coderd/database/awsiamrds/driver.go b/coderd/database/awsrdsiam/driver.go → coderd/database/awsiamrds/driver.go
@@ -1,4 +1,4 @@
-package awsrdsiam
+package awsiamrds
 
 import (
 	"context"
@@ -13,14 +13,14 @@ import (
 	"golang.org/x/xerrors"
 )
 
-type awsRdsIamDriver struct {
+type awsIamRdsDriver struct {
 	parent driver.Driver
 	cfg    aws.Config
 }
 
-var _ driver.Driver = &awsRdsIamDriver{}
+var _ driver.Driver = &awsIamRdsDriver{}
 
-// Register initializes and registers our aws rds iam wrapped database driver.
+// Register initializes and registers our aws iam rds wrapped database driver.
 func Register(ctx context.Context, parentName string) (string, error) {
 	cfg, err := config.LoadDefaultConfig(ctx)
 	if err != nil {
@@ -32,24 +32,24 @@ func Register(ctx context.Context, parentName string) (string, error) {
 		return "", err
 	}
 
-	// create a new aws rds iam driver
+	// create a new aws iam rds driver
 	d := newDriver(db.Driver(), cfg)
-	name := fmt.Sprintf("%s-awsrdsiam", parentName)
-	sql.Register(fmt.Sprintf("%s-awsrdsiam", parentName), d)
+	name := fmt.Sprintf("%s-awsiamrds", parentName)
+	sql.Register(fmt.Sprintf("%s-awsiamrds", parentName), d)
 
 	return name, nil
 }
 
-// newDriver will create a new *AwsRdsIamDriver using the environment aws session.
-func newDriver(parentDriver driver.Driver, cfg aws.Config) *awsRdsIamDriver {
-	return &awsRdsIamDriver{
+// newDriver will create a new *AwsIamRdsDriver using the environment aws session.
+func newDriver(parentDriver driver.Driver, cfg aws.Config) *awsIamRdsDriver {
+	return &awsIamRdsDriver{
 		parent: parentDriver,
 		cfg:    cfg,
 	}
 }
 
 // Open creates a new connection to the database using the provided name.
-func (d *awsRdsIamDriver) Open(name string) (driver.Conn, error) {
+func (d *awsIamRdsDriver) Open(name string) (driver.Conn, error) {
 	// set password with signed aws authentication token for the rds instance
 	nURL, err := getAuthenticatedURL(d.cfg, name)
 	if err != nil {

diff --git a/coderd/database/awsrdsiam/driver_test.go → coderd/database/awsiamrds/driver_test.go b/coderd/database/awsrdsiam/driver_test.go → coderd/database/awsiamrds/driver_test.go
@@ -1,4 +1,4 @@
-package awsrdsiam_test
+package awsiamrds_test
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 	"cdr.dev/slog/sloggers/slogtest"
 
 	"github.com/coder/coder/v2/cli"
-	"github.com/coder/coder/v2/coderd/database/awsrdsiam"
+	awsrdsiam "github.com/coder/coder/v2/coderd/database/awsiamrds"
 	"github.com/coder/coder/v2/testutil"
 )
 

diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -139,12 +139,12 @@ type PostgresAuth string
 
 const (
 	PostgresAuthPassword  PostgresAuth = "password"
-	PostgresAuthAWSRDSIAM PostgresAuth = "awsrdsiam"
+	PostgresAuthAWSIAMRDS PostgresAuth = "awsiamrds"
 )
 
 var PostgresAuthDrivers = []string{
 	string(PostgresAuthPassword),
-	string(PostgresAuthAWSRDSIAM),
+	string(PostgresAuthAWSIAMRDS),
 }
 
 // DeploymentValues is the central configuration values the coder server.

diff --git a/docs/cli/server.md b/docs/cli/server.md
diff --git a/docs/cli/server_create-admin-user.md b/docs/cli/server_create-admin-user.md
diff --git a/docs/cli/server_dbcrypt_decrypt.md b/docs/cli/server_dbcrypt_decrypt.md
diff --git a/docs/cli/server_dbcrypt_delete.md b/docs/cli/server_dbcrypt_delete.md
diff --git a/docs/cli/server_dbcrypt_rotate.md b/docs/cli/server_dbcrypt_rotate.md
diff --git a/enterprise/cli/server_dbcrypt.go b/enterprise/cli/server_dbcrypt.go
@@ -12,7 +12,7 @@ import (
 	"cdr.dev/slog/sloggers/sloghuman"
 	"github.com/coder/coder/v2/cli"
 	"github.com/coder/coder/v2/cli/cliui"
-	"github.com/coder/coder/v2/coderd/database/awsrdsiam"
+	"github.com/coder/coder/v2/coderd/database/awsiamrds"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/enterprise/dbcrypt"
 	"github.com/coder/serpent"
@@ -91,8 +91,8 @@ func (*RootCmd) dbcryptRotateCmd() *serpent.Command {
 			}
 
 			sqlDriver := "postgres"
-			if codersdk.PostgresAuth(flags.PostgresAuth) == codersdk.PostgresAuthAWSRDSIAM {
-				sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)
+			if codersdk.PostgresAuth(flags.PostgresAuth) == codersdk.PostgresAuthAWSIAMRDS {
+				sqlDriver, err = awsiamrds.Register(inv.Context(), sqlDriver)
 				if err != nil {
 					return xerrors.Errorf("register aws rds iam auth: %w", err)
 				}
@@ -156,8 +156,8 @@ func (*RootCmd) dbcryptDecryptCmd() *serpent.Command {
 			}
 
 			sqlDriver := "postgres"
-			if codersdk.PostgresAuth(flags.PostgresAuth) == codersdk.PostgresAuthAWSRDSIAM {
-				sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)
+			if codersdk.PostgresAuth(flags.PostgresAuth) == codersdk.PostgresAuthAWSIAMRDS {
+				sqlDriver, err = awsiamrds.Register(inv.Context(), sqlDriver)
 				if err != nil {
 					return xerrors.Errorf("register aws rds iam auth: %w", err)
 				}
@@ -212,8 +212,8 @@ Are you sure you want to continue?`
 
 			var err error
 			sqlDriver := "postgres"
-			if codersdk.PostgresAuth(flags.PostgresAuth) == codersdk.PostgresAuthAWSRDSIAM {
-				sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)
+			if codersdk.PostgresAuth(flags.PostgresAuth) == codersdk.PostgresAuthAWSIAMRDS {
+				sqlDriver, err = awsiamrds.Register(inv.Context(), sqlDriver)
 				if err != nil {
 					return xerrors.Errorf("register aws rds iam auth: %w", err)
 				}

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts