vendor: update all dependencies to latest versions

vendor/google.golang.org/api/transport/dial.go

@@ -21,8 +21,10 @@ import (
 	"net/http"
 
 	"golang.org/x/net/context"
+	"golang.org/x/oauth2/google"
 	"google.golang.org/grpc"
 
+	"google.golang.org/api/internal"
 	"google.golang.org/api/option"
 	gtransport "google.golang.org/api/transport/grpc"
 	htransport "google.golang.org/api/transport/http"
@@ -47,3 +49,13 @@ func DialGRPC(ctx context.Context, opts ...option.ClientOption) (*grpc.ClientCon
 func DialGRPCInsecure(ctx context.Context, opts ...option.ClientOption) (*grpc.ClientConn, error) {
 	return gtransport.DialInsecure(ctx, opts...)
 }
+
+// Creds constructs a google.DefaultCredentials from the information in the options,
+// or obtains the default credentials in the same way as google.FindDefaultCredentials.
+func Creds(ctx context.Context, opts ...option.ClientOption) (*google.DefaultCredentials, error) {
+	var ds internal.DialSettings
+	for _, opt := range opts {
+		opt.Apply(&ds)
+	}
+	return internal.Creds(ctx, &ds)
+}

vendor/google.golang.org/api/transport/grpc/dial.go

@@ -15,14 +15,12 @@
 // Package transport/grpc supports network connections to GRPC servers.
 // This package is not intended for use by end developers. Use the
 // google.golang.org/api/option package to configure API clients.
-package transport
+package grpc
 
 import (
 	"errors"
-	"fmt"
 
 	"golang.org/x/net/context"
-	"golang.org/x/oauth2/google"
 	"google.golang.org/api/internal"
 	"google.golang.org/api/option"
 	"google.golang.org/grpc"
@@ -46,22 +44,12 @@ func Dial(ctx context.Context, opts ...option.ClientOption) (*grpc.ClientConn, e
 	if o.GRPCConn != nil {
 		return o.GRPCConn, nil
 	}
-	if o.ServiceAccountJSONFilename != "" {
-		ts, err := internal.ServiceAcctTokenSource(ctx, o.ServiceAccountJSONFilename, o.Scopes...)
-		if err != nil {
-			return nil, err
-		}
-		o.TokenSource = ts
-	}
-	if o.TokenSource == nil {
-		var err error
-		o.TokenSource, err = google.DefaultTokenSource(ctx, o.Scopes...)
-		if err != nil {
-			return nil, fmt.Errorf("google.DefaultTokenSource: %v", err)
-		}
+	creds, err := internal.Creds(ctx, &o)
+	if err != nil {
+		return nil, err
 	}
 	grpcOpts := []grpc.DialOption{
-		grpc.WithPerRPCCredentials(oauth.TokenSource{o.TokenSource}),
+		grpc.WithPerRPCCredentials(oauth.TokenSource{creds.TokenSource}),
 		grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(nil, "")),
 	}
 	if appengineDialerHook != nil {

vendor/google.golang.org/api/transport/grpc/dial_appengine.go

@@ -14,18 +14,25 @@
 
 // +build appengine
 
-package transport
+package grpc
 
 import (
 	"net"
 	"time"
 
 	"golang.org/x/net/context"
+	"google.golang.org/appengine"
 	"google.golang.org/appengine/socket"
 	"google.golang.org/grpc"
 )
 
 func init() {
+	// NOTE: dev_appserver doesn't currently support SSL.
+	// When it does, this code can be removed.
+	if appengine.IsDevAppServer() {
+		return
+	}
+
 	appengineDialerHook = func(ctx context.Context) grpc.DialOption {
 		return grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
 			return socket.DialTimeout(ctx, "tcp", addr, timeout)

vendor/google.golang.org/api/transport/grpc/dial_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package transport
+package grpc
 
 import (
 	"errors"

vendor/google.golang.org/api/transport/http/dial.go

@@ -15,17 +15,15 @@
 // Package transport/http supports network connections to HTTP servers.
 // This package is not intended for use by end developers. Use the
 // google.golang.org/api/option package to configure API clients.
-package transport
+package http
 
 import (
 	"errors"
-	"fmt"
 	"net/http"
 
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/google"
-	gtransport "google.golang.org/api/googleapi/transport"
+	"google.golang.org/api/googleapi/transport"
 	"google.golang.org/api/internal"
 	"google.golang.org/api/option"
 )
@@ -47,7 +45,7 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*http.Client,
 	}
 	if o.APIKey != "" {
 		hc := &http.Client{
-			Transport: &gtransport.APIKey{
+			Transport: &transport.APIKey{
 				Key: o.APIKey,
 				Transport: userAgentTransport{
 					base:      baseTransport(ctx),
@@ -57,23 +55,13 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*http.Client,
 		}
 		return hc, o.Endpoint, nil
 	}
-	if o.ServiceAccountJSONFilename != "" {
-		ts, err := internal.ServiceAcctTokenSource(ctx, o.ServiceAccountJSONFilename, o.Scopes...)
-		if err != nil {
-			return nil, "", err
-		}
-		o.TokenSource = ts
-	}
-	if o.TokenSource == nil {
-		var err error
-		o.TokenSource, err = google.DefaultTokenSource(ctx, o.Scopes...)
-		if err != nil {
-			return nil, "", fmt.Errorf("google.DefaultTokenSource: %v", err)
-		}
+	creds, err := internal.Creds(ctx, &o)
+	if err != nil {
+		return nil, "", err
 	}
 	hc := &http.Client{
 		Transport: &oauth2.Transport{
-			Source: o.TokenSource,
+			Source: creds.TokenSource,
 			Base: userAgentTransport{
 				base:      baseTransport(ctx),
 				userAgent: o.UserAgent,

vendor/google.golang.org/api/transport/http/dial_appengine.go

@@ -14,7 +14,7 @@
 
 // +build appengine
 
-package transport
+package http
 
 import (
 	"net/http"