vendor: update all dependencies to latest versions

This commit is contained in:
Nick Craig-Wood
2017-09-30 15:27:27 +01:00
parent 911d121bb9
commit b017fcfe9a
3048 changed files with 537055 additions and 189679 deletions
+7 -19
View File
@@ -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,
+1 -1
View File
@@ -14,7 +14,7 @@
// +build appengine
package transport
package http
import (
"net/http"