Skip to content

chore: use read-only pattern in proxy #1480

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
enocom merged 2 commits into from
Oct 17, 2022
Merged

chore: use read-only pattern in proxy #1480

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef14278
chore: use read-only pattern in proxy
enocom Oct 14, 2022
5a3f737
Merge branch 'main' into read-only
enocom Oct 17, 2022
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
10 changes: 5 additions & 5 deletions internal/proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ type Config struct {
Dialer cloudsql.Dialer
}

// DialOptions interprets appropriate dial options for a particular instance
// dialOptions interprets appropriate dial options for a particular instance
// configuration
func (c *Config) DialOptions(i InstanceConnConfig) []cloudsqlconn.DialOption {
func dialOptions(c Config, i InstanceConnConfig) []cloudsqlconn.DialOption {
var opts []cloudsqlconn.DialOption

if i.IAMAuthN != nil {
Expand All @@ -199,7 +199,7 @@ func (c *Config) DialOptions(i InstanceConnConfig) []cloudsqlconn.DialOption {
return opts
}

func (c *Config) credentialsOpt(l cloudsql.Logger) (cloudsqlconn.Option, error) {
func credentialsOpt(c Config, l cloudsql.Logger) (cloudsqlconn.Option, error) {
// If service account impersonation is configured, set up an impersonated
// credentials token source.
if c.ImpersonateTarget != "" {
Expand Down Expand Up @@ -274,7 +274,7 @@ func (c *Config) DialerOptions(l cloudsql.Logger) ([]cloudsqlconn.Option, error)
opts := []cloudsqlconn.Option{
cloudsqlconn.WithUserAgent(c.UserAgent),
}
co, err := c.credentialsOpt(l)
co, err := credentialsOpt(*c, l)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -700,7 +700,7 @@ func newSocketMount(ctx context.Context, conf *Config, pc *portConfig, inst Inst
// access.
_ = os.Chmod(address, 0777)
}
opts := conf.DialOptions(inst)
opts := dialOptions(*conf, inst)
m := &socketMount{inst: inst.Name, dialOpts: opts, listener: ln}
return m, nil
}
Expand Down