Skip to content

fix: fix logmessage for usage with domain names #1006

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 3 commits into from
Sep 10, 2025
Merged

fix: fix logmessage for usage with domain names #1006

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caa6e47
fix: fix logmessage for usage with domain names
panavenue Aug 20, 2025
e62f95a
fix based on comment
panavenue Aug 25, 2025
289db37
fix comment format
panavenue Aug 28, 2025
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
14 changes: 10 additions & 4 deletions dialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,9 @@ func NewDialer(ctx context.Context, opts ...Option) (*Dialer, error) {
}

// Dial returns a net.Conn connected to the specified Cloud SQL instance. The
// icn argument must be the instance's connection name, which is in the format
// "project-name:region:instance-name".
// icn argument may be the instance's connection name in the format
// "project-name:region:instance-name" or a DNS name that resolves to an
// instance connection name.
func (d *Dialer) Dial(ctx context.Context, icn string, opts ...DialOption) (conn net.Conn, err error) {
select {
case <-d.closed:
Expand All @@ -345,9 +346,14 @@ func (d *Dialer) Dial(ctx context.Context, icn string, opts ...DialOption) (conn
if err != nil {
return nil, err
}

// Log if resolver changed the instance name input string.
if cn.String() != icn {
d.logger.Debugf(ctx, "resolved instance %s to %s", icn, cn)
if cn.DomainName() != "" {
// icn is a domain name, which resolves to a actual icn
d.logger.Debugf(ctx, "resolved dns: %s", icn, cn.String())
} else if cn.String() != icn {
// icn was not a domain name, but the resolver changed it and cn != icn
d.logger.Debugf(ctx, "resolved instance connection string %s to %s", icn, cn.String())
}

cfg := d.defaultDialConfig
Expand Down
Loading