Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions feature/rds/auth/connect.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ func BuildAuthToken(ctx context.Context, endpoint, region, dbUser string, creds
if err != nil {
return "", err
}
req.URL.Path = "/"
values := req.URL.Query()
values.Set("Action", "connect")
values.Set("DBUser", dbUser)
Expand Down
38 changes: 36 additions & 2 deletions feature/rds/auth/connect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ func TestBuildAuthToken(t *testing.T) {
endpoint: "https://prod-instance.us-east-1.rds.amazonaws.com:3306",
region: "us-west-2",
user: "mysqlUser",
expectedRegex: `^prod-instance\.us-east-1\.rds\.amazonaws\.com:3306\?Action=connect.*?DBUser=mysqlUser.*`,
expectedRegex: `^prod-instance\.us-east-1\.rds\.amazonaws\.com:3306/\?Action=connect.*?DBUser=mysqlUser.*`,
},
{
endpoint: "prod-instance.us-east-1.rds.amazonaws.com:3306",
region: "us-west-2",
user: "mysqlUser",
expectedRegex: `^prod-instance\.us-east-1\.rds\.amazonaws\.com:3306\?Action=connect.*?DBUser=mysqlUser.*`,
expectedRegex: `^prod-instance\.us-east-1\.rds\.amazonaws\.com:3306/\?Action=connect.*?DBUser=mysqlUser.*`,
},
{
endpoint: "prod-instance.us-east-1.rds.amazonaws.com",
Expand Down Expand Up @@ -67,6 +67,40 @@ func TestBuildAuthToken(t *testing.T) {
}
}

func TestBuildAuthTokenPath(t *testing.T) {
cases := []struct {
name string
endpoint string
}{
{
name: "endpoint without scheme",
endpoint: "prod-instance.us-east-1.rds.amazonaws.com:3306",
},
{
name: "endpoint with https scheme",
endpoint: "https://prod-instance.us-east-1.rds.amazonaws.com:3306",
},
{
name: "postgresql default port",
endpoint: "aurora-cluster.cluster-xxx.us-east-1.rds.amazonaws.com:5432",
},
}

for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
creds := &staticCredentials{AccessKey: "AKID", SecretKey: "SECRET", Session: "SESSION"}
token, err := auth.BuildAuthToken(context.Background(), c.endpoint, "us-east-1", "dbUser", creds)
if err != nil {
t.Fatalf("expect no err, got: %v", err)
}

if !strings.Contains(token, "/?") {
t.Errorf("expect token to contain '/?' path separator, got: %s", token)
}
})
}
}

type staticCredentials struct {
AccessKey, SecretKey, Session string
}
Expand Down