Update APIs to use new Google cloud paths.

logdog/server/service/service.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package service
 
 import (
         "errors"
         "flag"
         "fmt"
@@ skipping 14 matching lines @@
         "github.com/luci/luci-go/common/logging/gologger"
         "github.com/luci/luci-go/common/tsmon"
         "github.com/luci/luci-go/common/tsmon/target"
         "github.com/luci/luci-go/grpc/prpc"
         "github.com/luci/luci-go/logdog/api/config/svcconfig"
         "github.com/luci/luci-go/logdog/api/endpoints/coordinator/services/v1"
         "github.com/luci/luci-go/logdog/common/storage"
         "github.com/luci/luci-go/logdog/common/storage/bigtable"
         "github.com/luci/luci-go/logdog/server/retryServicesClient"
         "github.com/luci/luci-go/logdog/server/service/config"
+
+        "cloud.google.com/go/compute/metadata"
         "golang.org/x/net/context"
-        "google.golang.org/cloud"
-        "google.golang.org/cloud/compute/metadata"
+        "google.golang.org/api/option"
 )
 
 var (
         // ErrInvalidConfig is an error that is returned when the supplied
         // configuration is invalid.
         ErrInvalidConfig = errors.New("invalid configuration")
 
         // CoordinatorScopes is the set of OAuth2 scopes to use for the Coordinator
         // client.
         CoordinatorScopes = []string{
@@ skipping 337 matching lines @@
         })
         if err != nil {
                 log.WithError(err).Errorf(c, "Failed to create BigTable Authenticator.")
                 return nil, err
         }
 
         bt, err := bigtable.New(c, bigtable.Options{
                 Project:  btcfg.Project,
                 Instance: btcfg.Instance,
                 LogTable: btcfg.LogTableName,
-                ClientOptions: []cloud.ClientOption{
-                        cloud.WithTokenSource(a.TokenSource()),
+                ClientOptions: []option.ClientOption{
+                        option.WithTokenSource(a.TokenSource()),
                 },
         })
         if err != nil {
                 return nil, err
         }
         return bt, nil
 }
 
 // GSClient returns an authenticated Google Storage client instance.
 func (s *Service) GSClient(c context.Context) (gs.Client, error) {
@@ skipping 47 matching lines @@
 //
 // An optional permutation functon can be provided to modify those Options
 // before the Authenticator is created.
 func (s *Service) AuthenticatedClient(c context.Context, f func(o *auth.Options)) (*http.Client, error) {
         a, err := s.Authenticator(c, f)
         if err != nil {
                 return nil, err
         }
         return a.Client()
 }