Skip to content

Commit

Permalink
feat: use connect API for instance metadata (#150)
Browse files Browse the repository at this point in the history
  • Loading branch information
enocom authored Mar 23, 2022
1 parent f47a80c commit 1086ad0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion internal/cloudsql/refresh.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func fetchMetadata(ctx context.Context, client *sqladmin.Service, inst connName)
var end trace.EndSpanFunc
ctx, end = trace.StartSpan(ctx, "cloud.google.com/go/cloudsqlconn/internal.FetchMetadata")
defer func() { end(err) }()
db, err := client.Instances.Get(inst.project, inst.name).Context(ctx).Do()
db, err := client.Connect.Get(inst.project, inst.name).Context(ctx).Do()
if err != nil {
return metadata{}, errtype.NewRefreshError("failed to get instance metadata", inst.String(), err)
}
Expand Down
9 changes: 3 additions & 6 deletions internal/mock/sqladmin.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,17 @@ func InstanceGetSuccess(i FakeCSQLInstance, ct int) *Request {
if err != nil {
panic(err)
}
db := &sqladmin.DatabaseInstance{
db := &sqladmin.ConnectSettings{
BackendType: i.backendType,
ConnectionName: fmt.Sprintf("%s:%s:%s", i.project, i.region, i.name),
DatabaseVersion: i.dbVersion,
Project: i.project,
Region: i.region,
Name: i.name,
IpAddresses: ips,
Region: i.region,
ServerCaCert: &sqladmin.SslCert{Cert: string(certBytes)},
}

r := &Request{
reqMethod: http.MethodGet,
reqPath: fmt.Sprintf("/sql/v1beta4/projects/%s/instances/%s", i.project, i.name),
reqPath: fmt.Sprintf("/sql/v1beta4/projects/%s/instances/%s/connectSettings", i.project, i.name),
reqCt: ct,
handle: func(resp http.ResponseWriter, req *http.Request) {
b, err := db.MarshalJSON()
Expand Down

0 comments on commit 1086ad0

Please sign in to comment.