fix function calls

f0ssel · f0ssel · commit 55c81d64ecc3 · 2024-03-18T15:01:32.000Z
diff --git a/cli/cliui/provisionerjob_test.go b/cli/cliui/provisionerjob_test.go
@@ -11,9 +11,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coder/coder/v2/testutil"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/coder/coder/v2/testutil"
+
 	"github.com/coder/coder/v2/cli/cliui"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/codersdk"
diff --git a/cli/server.go b/cli/server.go
@@ -673,7 +673,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 				}
 
 				if codersdk.PostgresAuth(vals.PostgresAuth) == codersdk.PostgresAuthAWSRDSIAM {
-					sqlDriver, err = awsrdsiam.Register(sqlDriver)
+					sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)
 					if err != nil {
 						return xerrors.Errorf("register aws rds iam auth: %w", err)
 					}
diff --git a/cli/server_createadminuser.go b/cli/server_createadminuser.go
@@ -66,7 +66,7 @@ func (r *RootCmd) newCreateAdminUserCommand() *serpent.Command {
 
 			sqlDriver := "postgres"
 			if codersdk.PostgresAuth(newUserPgAuth) == codersdk.PostgresAuthAWSRDSIAM {
-				sqlDriver, err = awsrdsiam.Register(sqlDriver)
+				sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)
 				if err != nil {
 					return xerrors.Errorf("register aws rds iam auth: %w", err)
 				}
diff --git a/coderd/database/awsrdsiam/driver_test.go b/coderd/database/awsrdsiam/driver_test.go
@@ -25,7 +25,7 @@ func TestDriver(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
 
-	sqlDriver, err := awsrdsiam.Register("postgres")
+	sqlDriver, err := awsrdsiam.Register(ctx, "postgres")
 	require.NoError(t, err)
 
 	db, err := cli.ConnectToPostgres(ctx, slogtest.Make(t, nil), sqlDriver, url)
diff --git a/enterprise/cli/server_dbcrypt.go b/enterprise/cli/server_dbcrypt.go
@@ -92,7 +92,7 @@ func (*RootCmd) dbcryptRotateCmd() *serpent.Command {
 
 			sqlDriver := "postgres"
 			if codersdk.PostgresAuth(flags.PostgresAuth) == codersdk.PostgresAuthAWSRDSIAM {
-				sqlDriver, err = awsrdsiam.Register(sqlDriver)
+				sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)
 				if err != nil {
 					return xerrors.Errorf("register aws rds iam auth: %w", err)
 				}
@@ -157,7 +157,7 @@ func (*RootCmd) dbcryptDecryptCmd() *serpent.Command {
 
 			sqlDriver := "postgres"
 			if codersdk.PostgresAuth(flags.PostgresAuth) == codersdk.PostgresAuthAWSRDSIAM {
-				sqlDriver, err = awsrdsiam.Register(sqlDriver)
+				sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)
 				if err != nil {
 					return xerrors.Errorf("register aws rds iam auth: %w", err)
 				}
@@ -213,7 +213,7 @@ Are you sure you want to continue?`
 			var err error
 			sqlDriver := "postgres"
 			if codersdk.PostgresAuth(flags.PostgresAuth) == codersdk.PostgresAuthAWSRDSIAM {
-				sqlDriver, err = awsrdsiam.Register(sqlDriver)
+				sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)
 				if err != nil {
 					return xerrors.Errorf("register aws rds iam auth: %w", err)
 				}

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`673`	`673`	`}`
`674`	`674`
`675`	`675`	`if codersdk.PostgresAuth(vals.PostgresAuth) == codersdk.PostgresAuthAWSRDSIAM {`
`676`		`- sqlDriver, err = awsrdsiam.Register(sqlDriver)`
	`676`	`+ sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)`
`677`	`677`	`if err != nil {`
`678`	`678`	`return xerrors.Errorf("register aws rds iam auth: %w", err)`
`679`	`679`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func (r RootCmd) newCreateAdminUserCommand() serpent.Command {`
`66`	`66`
`67`	`67`	`sqlDriver := "postgres"`
`68`	`68`	`if codersdk.PostgresAuth(newUserPgAuth) == codersdk.PostgresAuthAWSRDSIAM {`
`69`		`- sqlDriver, err = awsrdsiam.Register(sqlDriver)`
	`69`	`+ sqlDriver, err = awsrdsiam.Register(inv.Context(), sqlDriver)`
`70`	`70`	`if err != nil {`
`71`	`71`	`return xerrors.Errorf("register aws rds iam auth: %w", err)`
`72`	`72`	`}`