gddo-server: remove call to cloud.NewContext
The logging client does not rely on the legacy cloud context behaviour
(it uses the project ID explicitly passed into the NewClient call), and
the cloud.NewContext function is due to be deleted.
Change-Id: I5a58dc0b8ab25d942a13b0386bccc7f3b2726b33
Reviewed-on: https://go-review.googlesource.com/25418
Reviewed-by: Andrew Gerrand <adg@golang.org>
diff --git a/gddo-server/main.go b/gddo-server/main.go
index 53e5bd5..43fecf8 100644
--- a/gddo-server/main.go
+++ b/gddo-server/main.go
@@ -30,9 +30,7 @@
"time"
"golang.org/x/net/context"
- "golang.org/x/oauth2/google"
"google.golang.org/appengine"
- "google.golang.org/cloud"
"google.golang.org/cloud/compute/metadata"
"google.golang.org/cloud/logging"
@@ -846,14 +844,6 @@
return p.Dir
}
-func cloudContext(projID string) context.Context {
- hc, err := google.DefaultClient(context.Background())
- if err != nil {
- log.Fatal(err)
- }
- return cloud.NewContext(projID, hc)
-}
-
var (
db *database.Database
httpClient *http.Client
@@ -891,7 +881,6 @@
var (
gceLogName string
projID string
- ctx context.Context
)
if metadata.OnGCE() {
@@ -911,7 +900,6 @@
log.Printf("querying metadata for project ID: %v", err)
} else {
projID = id
- ctx = cloudContext(projID)
}
}
} else {
@@ -1023,6 +1011,7 @@
{"", mux},
}
if gceLogName != "" {
+ ctx := context.Background()
logc, err := logging.NewClient(ctx, projID, gceLogName)
if err != nil {
log.Fatalf("Failed to create cloud logging client: %v", err)
