Update dependencies

This commit is contained in:
Alexander Neumann
2017-09-13 14:09:48 +02:00
parent f3b49987f8
commit fda563d606
926 changed files with 189726 additions and 98666 deletions

View File

@@ -15,7 +15,7 @@
// 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"

View File

@@ -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)

View File

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

View File

@@ -15,7 +15,7 @@
// 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"
@@ -23,7 +23,7 @@ import (
"golang.org/x/net/context"
"golang.org/x/oauth2"
gtransport "google.golang.org/api/googleapi/transport"
"google.golang.org/api/googleapi/transport"
"google.golang.org/api/internal"
"google.golang.org/api/option"
)
@@ -45,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),

View File

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