Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Unified Diff: common/gcloud/gs/gs.go

Issue 2219023003: Update APIs to use new Google cloud paths. (Closed) Base URL: https://github.com/luci/luci-go@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: common/gcloud/gs/gs.go
diff --git a/common/gcloud/gs/gs.go b/common/gcloud/gs/gs.go
index f0828465cc488070250db1dd9ff253b0c5ce16b6..75d8a602955fefcfc1812529df827013a85bdb1d 100644
--- a/common/gcloud/gs/gs.go
+++ b/common/gcloud/gs/gs.go
@@ -13,10 +13,11 @@ import (
"github.com/luci/luci-go/common/errors"
log "github.com/luci/luci-go/common/logging"
"github.com/luci/luci-go/common/retry"
+
+ gs "cloud.google.com/go/storage"
"golang.org/x/net/context"
"google.golang.org/api/googleapi"
- "google.golang.org/cloud"
- gs "google.golang.org/cloud/storage"
+ "google.golang.org/api/option"
)
var (
@@ -197,10 +198,10 @@ func (c *prodClient) deleteObject(o *gs.ObjectHandle) error {
}
func (c *prodClient) newClient() (*gs.Client, error) {
- var optsArray [1]cloud.ClientOption
+ var optsArray [1]option.ClientOption
opts := optsArray[:0]
if c.rt != nil {
- opts = append(opts, cloud.WithBaseHTTP(&http.Client{
+ opts = append(opts, option.WithHTTPClient(&http.Client{
Transport: c.rt,
}))
}

Powered by Google App Engine
This is Rietveld 408576698