Skip to content

Sync: merge upstream v1.0.7 (DSN format fix for IAM token) #8

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
gcaracuel merged 2 commits into from
Aug 13, 2026
Merged

Sync: merge upstream v1.0.7 (DSN format fix for IAM token) #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0981455
fix: use keyword-value DSN format to avoid IAM token URL breakage (#18)
gcaracuel Aug 13, 2026
89fa44a
Merge remote-tracking branch 'upstream/master' into sync/upstream-202…
gcaracuel Aug 13, 2026
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
15 changes: 14 additions & 1 deletion pkg/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,20 @@ func (c *pg) GetDefaultDatabase() string {
// When useIAMAuth is true and the cloud provider is AWS, it generates an IAM
// auth token to use as the password instead of the static password.
func GetConnection(user, password, host, database, uriArgs string) (*sql.DB, error) {
db, err := sql.Open("postgres", fmt.Sprintf("postgresql://%s:%s@%s/%s?%s", user, password, host, database, uriArgs))
// Split host:port for keyword-value format
hostname, portStr, err := net.SplitHostPort(host)
if err != nil {
hostname = host
portStr = "5432"
}

// Use keyword-value format to avoid URL parsing issues.
// IAM auth tokens contain URL-special characters (:, ?, &, =, /)
// which break the postgresql://user:pass@host/db?args URL format.
uriArgs = strings.TrimPrefix(uriArgs, "?")
connStr := fmt.Sprintf("host=%s port=%s user=%s password=%s dbname=%s %s",
hostname, portStr, user, password, database, uriArgs)
db, err := sql.Open("postgres", connStr)
if err != nil {
return nil, err
}
Expand Down