Skip to content

Commit ee25886

Browse files
authored
chore: Update go connector to wrap nested errors during dial. (#1015)
1 parent 725f672 commit ee25886

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

dialer.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,15 +235,15 @@ func NewDialer(ctx context.Context, opts ...Option) (*Dialer, error) {
235235
Scopes: []string{sqladmin.SqlserviceAdminScope},
236236
})
237237
if err != nil {
238-
return nil, fmt.Errorf("failed to create default credentials: %v", err)
238+
return nil, fmt.Errorf("failed to create default credentials: %w", err)
239239
}
240240
cfg.authCredentials = c
241241
// create second set of credentials, scoped for IAM AuthN login only
242242
scoped, err := credentials.DetectDefault(&credentials.DetectOptions{
243243
Scopes: []string{iamLoginScope},
244244
})
245245
if err != nil {
246-
return nil, fmt.Errorf("failed to create scoped credentials: %v", err)
246+
return nil, fmt.Errorf("failed to create scoped credentials: %w", err)
247247
}
248248
cfg.iamLoginTokenProvider = scoped.TokenProvider
249249
}
@@ -265,7 +265,7 @@ func NewDialer(ctx context.Context, opts ...Option) (*Dialer, error) {
265265
UniverseDomain: cfg.getClientUniverseDomain(),
266266
})
267267
if err != nil {
268-
return nil, fmt.Errorf("failed to create auth client: %v", err)
268+
return nil, fmt.Errorf("failed to create auth client: %w", err)
269269
}
270270
// If callers have not provided an HTTPClient explicitly with
271271
// WithHTTPClient, then use auth client
@@ -282,7 +282,7 @@ func NewDialer(ctx context.Context, opts ...Option) (*Dialer, error) {
282282

283283
client, err := sqladmin.NewService(ctx, cfg.sqladminOpts...)
284284
if err != nil {
285-
return nil, fmt.Errorf("failed to create sqladmin client: %v", err)
285+
return nil, fmt.Errorf("failed to create sqladmin client: %w", err)
286286
}
287287

288288
dc := dialConfig{

internal/cloudsql/resolver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (r *DNSInstanceConnectionNameResolver) queryDNS(ctx context.Context, domain
103103
records, err := r.dnsResolver.LookupTXT(ctx, domainName)
104104
// If resolve failed and no records were found, return the error.
105105
if err != nil {
106-
return instance.ConnName{}, fmt.Errorf("unable to resolve TXT record for %q: %v", domainName, err)
106+
return instance.ConnName{}, fmt.Errorf("unable to resolve TXT record for %q: %w", domainName, err)
107107
}
108108

109109
// Process the records returning the first valid TXT record.
@@ -119,7 +119,7 @@ func (r *DNSInstanceConnectionNameResolver) queryDNS(ctx context.Context, domain
119119
// Parse the target as a CN
120120
cn, parseErr := instance.ParseConnNameWithDomainName(record, domainName)
121121
if parseErr != nil {
122-
perr = fmt.Errorf("unable to parse TXT for %q -> %q : %v", domainName, record, parseErr)
122+
perr = fmt.Errorf("unable to parse TXT for %q -> %q : %w", domainName, record, parseErr)
123123
continue
124124
}
125125
return cn, nil

internal/trace/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func InitMetrics() error {
137137
bytesSentView,
138138
bytesReceivedView,
139139
); rErr != nil {
140-
registerErr = fmt.Errorf("failed to initialize metrics: %v", rErr)
140+
registerErr = fmt.Errorf("failed to initialize metrics: %w", rErr)
141141
}
142142
})
143143
return registerErr

0 commit comments

Comments
 (0)