Skip to content

feat: add awsiamrds db auth driver #12566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Mar 20, 2024
Merged

feat: add awsiamrds db auth driver #12566

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d23ad15
feat: add awsrdsiam db auth connector
f0ssel Mar 12, 2024
f2426d1
fix parent name
f0ssel Mar 12, 2024
03eb9c1
wire to falgs
f0ssel Mar 14, 2024
1ff0291
add aws v2
f0ssel Mar 14, 2024
269097c
remove aws v1
f0ssel Mar 14, 2024
eba4c6b
fix function calls
f0ssel Mar 14, 2024
83d7101
make gen
f0ssel Mar 14, 2024
f25ae4e
implement yaml methods
f0ssel Mar 14, 2024
cb887c0
remove clibase
f0ssel Mar 18, 2024
c0bd787
remove diff
f0ssel Mar 18, 2024
891a7c0
Make gen
f0ssel Mar 18, 2024
7ab2e95
fix complexity
f0ssel Mar 18, 2024
b44becf
lint
f0ssel Mar 18, 2024
66c686d
update serpent
f0ssel Mar 18, 2024
a425f5b
update aws
f0ssel Mar 18, 2024
de7e7d9
log
f0ssel Mar 18, 2024
c256df3
add note
f0ssel Mar 19, 2024
c0a0515
rename awsrdsiam to awsiamrds to match v1
f0ssel Mar 19, 2024
6c3d73d
update golden
f0ssel Mar 19, 2024
c56fddc
rename files
f0ssel Mar 19, 2024
293140b
fix data races
f0ssel Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix function calls
  • Loading branch information
@f0ssel
f0ssel committed Mar 19, 2024
commit eba4c6b04e87a6b3f39792d9f90d7e8431fccdbf
2 changes: 1 addition & 1 deletion cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,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)
}
Expand Down
2 changes: 1 addition & 1 deletion cli/server_createadminuser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion coderd/database/awsrdsiam/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions enterprise/cli/server_dbcrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down