Skip to content

accept project:region:instance for GCP cloud db instances #48

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

Open
omar-polo wants to merge 1 commit into
base: integration/mysql
Choose a base branch
from
Open

accept project:region:instance for GCP cloud db instances #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 21 additions & 12 deletions mysql/mysqlconn/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,31 @@ func ParseConnConfig(proxy bool, config map[string]string) (ConnConfig, error) {
Port: "3306",
}

if location, ok := config["location"]; ok && location != "" {
if err := parseURI(location, &cc); err != nil {
return cc, fmt.Errorf("parsing location URI: %w", err)
if proxy {
_, host, ok := strings.Cut(config["location"], "://")
if !ok {
return cc, fmt.Errorf("failed to parse location URI: expected protocol://identifier")
}
cc.Host = host
} else {
if location, ok := config["location"]; ok && location != "" {
if err := parseURI(location, &cc); err != nil {
return cc, fmt.Errorf("parsing location URI: %w", err)
}
}
}

if v := config["host"]; v != "" {
cc.Host = v
}
if v := config["port"]; v != "" {
p, err := strconv.Atoi(v)
if err != nil || p < 1 || p > 65535 {
return cc, fmt.Errorf("invalid port %q: must be an integer between 1 and 65535", v)
if v := config["host"]; v != "" {
cc.Host = v
}
if v := config["port"]; v != "" {
p, err := strconv.Atoi(v)
if err != nil || p < 1 || p > 65535 {
return cc, fmt.Errorf("invalid port %q: must be an integer between 1 and 65535", v)
}
cc.Port = v
}
cc.Port = v
}

if v := config["username"]; v != "" {
cc.Username = v
}
Expand Down