mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-09-07 01:26:43 +00:00
771c2f8512
I'm working on Stackdriver monitoring in another branch, which required updating `google.golang.org/genproto`, which required updating `google.golang.org/grpc`, which required updating `github.com/golang/protobuf`, and so on. This PR updates all of the Google-provided deps to their latest versions. In addition, there is: - A change in config.go to reflect an updated type name - Five files changed by `make fmt` Tested with `make build`, `make test`, and `make testacc`.
54 lines
1.5 KiB
Go
54 lines
1.5 KiB
Go
// +build go1.7
|
|
|
|
/*
|
|
*
|
|
* Copyright 2016 gRPC authors.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*
|
|
*/
|
|
|
|
package transport
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"net/http"
|
|
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
|
|
netctx "golang.org/x/net/context"
|
|
)
|
|
|
|
// dialContext connects to the address on the named network.
|
|
func dialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
return (&net.Dialer{}).DialContext(ctx, network, address)
|
|
}
|
|
|
|
// ContextErr converts the error from context package into a status error.
|
|
func ContextErr(err error) error {
|
|
switch err {
|
|
case context.DeadlineExceeded, netctx.DeadlineExceeded:
|
|
return status.Error(codes.DeadlineExceeded, err.Error())
|
|
case context.Canceled, netctx.Canceled:
|
|
return status.Error(codes.Canceled, err.Error())
|
|
}
|
|
return status.Errorf(codes.Internal, "Unexpected error from context packet: %v", err)
|
|
}
|
|
|
|
// contextFromRequest returns a context from the HTTP Request.
|
|
func contextFromRequest(r *http.Request) context.Context {
|
|
return r.Context()
|
|
}
|