vendor: update all dependencies
This commit is contained in:
+37
-15
@@ -17,16 +17,18 @@
|
||||
package trace
|
||||
|
||||
import (
|
||||
google_protobuf "github.com/golang/protobuf/ptypes/empty"
|
||||
emptypb "github.com/golang/protobuf/ptypes/empty"
|
||||
cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
|
||||
)
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"net"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/golang/protobuf/proto"
|
||||
@@ -36,6 +38,8 @@ import (
|
||||
status "google.golang.org/genproto/googleapis/rpc/status"
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/metadata"
|
||||
gstatus "google.golang.org/grpc/status"
|
||||
)
|
||||
|
||||
var _ = io.EOF
|
||||
@@ -57,7 +61,11 @@ type mockTraceServer struct {
|
||||
resps []proto.Message
|
||||
}
|
||||
|
||||
func (s *mockTraceServer) ListTraces(_ context.Context, req *cloudtracepb.ListTracesRequest) (*cloudtracepb.ListTracesResponse, error) {
|
||||
func (s *mockTraceServer) ListTraces(ctx context.Context, req *cloudtracepb.ListTracesRequest) (*cloudtracepb.ListTracesResponse, error) {
|
||||
md, _ := metadata.FromIncomingContext(ctx)
|
||||
if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
|
||||
return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
|
||||
}
|
||||
s.reqs = append(s.reqs, req)
|
||||
if s.err != nil {
|
||||
return nil, s.err
|
||||
@@ -65,7 +73,11 @@ func (s *mockTraceServer) ListTraces(_ context.Context, req *cloudtracepb.ListTr
|
||||
return s.resps[0].(*cloudtracepb.ListTracesResponse), nil
|
||||
}
|
||||
|
||||
func (s *mockTraceServer) GetTrace(_ context.Context, req *cloudtracepb.GetTraceRequest) (*cloudtracepb.Trace, error) {
|
||||
func (s *mockTraceServer) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceRequest) (*cloudtracepb.Trace, error) {
|
||||
md, _ := metadata.FromIncomingContext(ctx)
|
||||
if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
|
||||
return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
|
||||
}
|
||||
s.reqs = append(s.reqs, req)
|
||||
if s.err != nil {
|
||||
return nil, s.err
|
||||
@@ -73,12 +85,16 @@ func (s *mockTraceServer) GetTrace(_ context.Context, req *cloudtracepb.GetTrace
|
||||
return s.resps[0].(*cloudtracepb.Trace), nil
|
||||
}
|
||||
|
||||
func (s *mockTraceServer) PatchTraces(_ context.Context, req *cloudtracepb.PatchTracesRequest) (*google_protobuf.Empty, error) {
|
||||
func (s *mockTraceServer) PatchTraces(ctx context.Context, req *cloudtracepb.PatchTracesRequest) (*emptypb.Empty, error) {
|
||||
md, _ := metadata.FromIncomingContext(ctx)
|
||||
if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
|
||||
return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
|
||||
}
|
||||
s.reqs = append(s.reqs, req)
|
||||
if s.err != nil {
|
||||
return nil, s.err
|
||||
}
|
||||
return s.resps[0].(*google_protobuf.Empty), nil
|
||||
return s.resps[0].(*emptypb.Empty), nil
|
||||
}
|
||||
|
||||
// clientOpt is the option tests should use to connect to the test server.
|
||||
@@ -111,7 +127,7 @@ func TestMain(m *testing.M) {
|
||||
}
|
||||
|
||||
func TestTraceServicePatchTraces(t *testing.T) {
|
||||
var expectedResponse *google_protobuf.Empty = &google_protobuf.Empty{}
|
||||
var expectedResponse *emptypb.Empty = &emptypb.Empty{}
|
||||
|
||||
mockTrace.err = nil
|
||||
mockTrace.reqs = nil
|
||||
@@ -143,8 +159,8 @@ func TestTraceServicePatchTraces(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestTraceServicePatchTracesError(t *testing.T) {
|
||||
errCode := codes.Internal
|
||||
mockTrace.err = grpc.Errorf(errCode, "test error")
|
||||
errCode := codes.PermissionDenied
|
||||
mockTrace.err = gstatus.Error(errCode, "test error")
|
||||
|
||||
var projectId string = "projectId-1969970175"
|
||||
var traces *cloudtracepb.Traces = &cloudtracepb.Traces{}
|
||||
@@ -160,7 +176,9 @@ func TestTraceServicePatchTracesError(t *testing.T) {
|
||||
|
||||
err = c.PatchTraces(context.Background(), request)
|
||||
|
||||
if c := grpc.Code(err); c != errCode {
|
||||
if st, ok := gstatus.FromError(err); !ok {
|
||||
t.Errorf("got error %v, expected grpc error", err)
|
||||
} else if c := st.Code(); c != errCode {
|
||||
t.Errorf("got error code %q, want %q", c, errCode)
|
||||
}
|
||||
}
|
||||
@@ -205,8 +223,8 @@ func TestTraceServiceGetTrace(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestTraceServiceGetTraceError(t *testing.T) {
|
||||
errCode := codes.Internal
|
||||
mockTrace.err = grpc.Errorf(errCode, "test error")
|
||||
errCode := codes.PermissionDenied
|
||||
mockTrace.err = gstatus.Error(errCode, "test error")
|
||||
|
||||
var projectId string = "projectId-1969970175"
|
||||
var traceId string = "traceId1270300245"
|
||||
@@ -222,7 +240,9 @@ func TestTraceServiceGetTraceError(t *testing.T) {
|
||||
|
||||
resp, err := c.GetTrace(context.Background(), request)
|
||||
|
||||
if c := grpc.Code(err); c != errCode {
|
||||
if st, ok := gstatus.FromError(err); !ok {
|
||||
t.Errorf("got error %v, expected grpc error", err)
|
||||
} else if c := st.Code(); c != errCode {
|
||||
t.Errorf("got error code %q, want %q", c, errCode)
|
||||
}
|
||||
_ = resp
|
||||
@@ -277,8 +297,8 @@ func TestTraceServiceListTraces(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestTraceServiceListTracesError(t *testing.T) {
|
||||
errCode := codes.Internal
|
||||
mockTrace.err = grpc.Errorf(errCode, "test error")
|
||||
errCode := codes.PermissionDenied
|
||||
mockTrace.err = gstatus.Error(errCode, "test error")
|
||||
|
||||
var projectId string = "projectId-1969970175"
|
||||
var request = &cloudtracepb.ListTracesRequest{
|
||||
@@ -292,7 +312,9 @@ func TestTraceServiceListTracesError(t *testing.T) {
|
||||
|
||||
resp, err := c.ListTraces(context.Background(), request).Next()
|
||||
|
||||
if c := grpc.Code(err); c != errCode {
|
||||
if st, ok := gstatus.FromError(err); !ok {
|
||||
t.Errorf("got error %v, expected grpc error", err)
|
||||
} else if c := st.Code(); c != errCode {
|
||||
t.Errorf("got error code %q, want %q", c, errCode)
|
||||
}
|
||||
_ = resp
|
||||
|
||||
Reference in New Issue
Block a user