Skip to content

Commit 865013b

Browse files
gyuhodfawley
gyuho
authored and
dfawley
committed
*: replace deprecated grpc.Errorf calls with status.Errorf (grpc#1651)
1 parent 4318e64 commit 865013b

File tree

10 files changed

+72
-64
lines changed

10 files changed

+72
-64
lines changed

‎benchmark/worker/benchmark_client.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"google.golang.org/grpc/codes"
3535
"google.golang.org/grpc/credentials"
3636
"google.golang.org/grpc/grpclog"
37+
"google.golang.org/grpc/status"
3738
"google.golang.org/grpc/testdata"
3839
)
3940

@@ -117,7 +118,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
117118
case testpb.ClientType_SYNC_CLIENT:
118119
case testpb.ClientType_ASYNC_CLIENT:
119120
default:
120-
return nil, nil, grpc.Errorf(codes.InvalidArgument, "unknow client type: %v", config.ClientType)
121+
return nil, nil, status.Errorf(codes.InvalidArgument, "unknow client type: %v", config.ClientType)
121122
}
122123

123124
// Check and set security options.
@@ -127,7 +128,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
127128
}
128129
creds, err := credentials.NewClientTLSFromFile(*caFile, config.SecurityParams.ServerHostOverride)
129130
if err != nil {
130-
return nil, nil, grpc.Errorf(codes.InvalidArgument, "failed to create TLS credentials %v", err)
131+
return nil, nil, status.Errorf(codes.InvalidArgument, "failed to create TLS credentials %v", err)
131132
}
132133
opts = append(opts, grpc.WithTransportCredentials(creds))
133134
} else {
@@ -141,7 +142,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
141142
opts = append(opts, grpc.WithCodec(byteBufCodec{}))
142143
case *testpb.PayloadConfig_SimpleParams:
143144
default:
144-
return nil, nil, grpc.Errorf(codes.InvalidArgument, "unknow payload config: %v", config.PayloadConfig)
145+
return nil, nil, status.Errorf(codes.InvalidArgument, "unknow payload config: %v", config.PayloadConfig)
145146
}
146147
}
147148

@@ -176,17 +177,17 @@ func performRPCs(config *testpb.ClientConfig, conns []*grpc.ClientConn, bc *benc
176177
payloadRespSize = int(c.SimpleParams.RespSize)
177178
payloadType = "protobuf"
178179
default:
179-
return grpc.Errorf(codes.InvalidArgument, "unknow payload config: %v", config.PayloadConfig)
180+
return status.Errorf(codes.InvalidArgument, "unknow payload config: %v", config.PayloadConfig)
180181
}
181182
}
182183

183184
// TODO add open loop distribution.
184185
switch config.LoadParams.Load.(type) {
185186
case *testpb.LoadParams_ClosedLoop:
186187
case *testpb.LoadParams_Poisson:
187-
return grpc.Errorf(codes.Unimplemented, "unsupported load params: %v", config.LoadParams)
188+
return status.Errorf(codes.Unimplemented, "unsupported load params: %v", config.LoadParams)
188189
default:
189-
return grpc.Errorf(codes.InvalidArgument, "unknown load params: %v", config.LoadParams)
190+
return status.Errorf(codes.InvalidArgument, "unknown load params: %v", config.LoadParams)
190191
}
191192

192193
rpcCountPerConn := int(config.OutstandingRpcsPerChannel)
@@ -199,7 +200,7 @@ func performRPCs(config *testpb.ClientConfig, conns []*grpc.ClientConn, bc *benc
199200
bc.doCloseLoopStreaming(conns, rpcCountPerConn, payloadReqSize, payloadRespSize, payloadType)
200201
// TODO open loop.
201202
default:
202-
return grpc.Errorf(codes.InvalidArgument, "unknown rpc type: %v", config.RpcType)
203+
return status.Errorf(codes.InvalidArgument, "unknown rpc type: %v", config.RpcType)
203204
}
204205

205206
return nil

‎benchmark/worker/benchmark_server.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"google.golang.org/grpc/codes"
3434
"google.golang.org/grpc/credentials"
3535
"google.golang.org/grpc/grpclog"
36+
"google.golang.org/grpc/status"
3637
"google.golang.org/grpc/testdata"
3738
)
3839

@@ -86,7 +87,7 @@ func startBenchmarkServer(config *testpb.ServerConfig, serverPort int) (*benchma
8687
case testpb.ServerType_ASYNC_SERVER:
8788
case testpb.ServerType_ASYNC_GENERIC_SERVER:
8889
default:
89-
return nil, grpc.Errorf(codes.InvalidArgument, "unknow server type: %v", config.ServerType)
90+
return nil, status.Errorf(codes.InvalidArgument, "unknow server type: %v", config.ServerType)
9091
}
9192

9293
// Set security options.
@@ -131,9 +132,9 @@ func startBenchmarkServer(config *testpb.ServerConfig, serverPort int) (*benchma
131132
Type: "protobuf",
132133
}, opts...)
133134
case *testpb.PayloadConfig_ComplexParams:
134-
return nil, grpc.Errorf(codes.Unimplemented, "unsupported payload config: %v", config.PayloadConfig)
135+
return nil, status.Errorf(codes.Unimplemented, "unsupported payload config: %v", config.PayloadConfig)
135136
default:
136-
return nil, grpc.Errorf(codes.InvalidArgument, "unknow payload config: %v", config.PayloadConfig)
137+
return nil, status.Errorf(codes.InvalidArgument, "unknow payload config: %v", config.PayloadConfig)
137138
}
138139
} else {
139140
// Start protobuf server if payload config is nil.

‎benchmark/worker/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
testpb "google.golang.org/grpc/benchmark/grpc_testing"
3535
"google.golang.org/grpc/codes"
3636
"google.golang.org/grpc/grpclog"
37+
"google.golang.org/grpc/status"
3738
)
3839

3940
var (
@@ -114,7 +115,7 @@ func (s *workerServer) RunServer(stream testpb.WorkerService_RunServerServer) er
114115
grpclog.Printf("server mark received:")
115116
grpclog.Printf(" - %v", argtype)
116117
if bs == nil {
117-
return grpc.Errorf(codes.InvalidArgument, "server does not exist when mark received")
118+
return status.Error(codes.InvalidArgument, "server does not exist when mark received")
118119
}
119120
out = &testpb.ServerStatus{
120121
Stats: bs.getStats(argtype.Mark.Reset_),
@@ -167,7 +168,7 @@ func (s *workerServer) RunClient(stream testpb.WorkerService_RunClientServer) er
167168
grpclog.Printf("client mark received:")
168169
grpclog.Printf(" - %v", t)
169170
if bc == nil {
170-
return grpc.Errorf(codes.InvalidArgument, "client does not exist when mark received")
171+
return status.Error(codes.InvalidArgument, "client does not exist when mark received")
171172
}
172173
out = &testpb.ClientStatus{
173174
Stats: bc.getStats(t.Mark.Reset_),

‎grpclb/grpclb_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import (
4242
_ "google.golang.org/grpc/grpclog/glogger"
4343
"google.golang.org/grpc/metadata"
4444
"google.golang.org/grpc/naming"
45+
"google.golang.org/grpc/status"
4546
testpb "google.golang.org/grpc/test/grpc_testing"
4647
"google.golang.org/grpc/test/leakcheck"
4748
)
@@ -225,7 +226,7 @@ func (b *remoteBalancer) BalanceLoad(stream lbspb.LoadBalancer_BalanceLoadServer
225226
}
226227
initReq := req.GetInitialRequest()
227228
if initReq.Name != besn {
228-
return grpc.Errorf(codes.InvalidArgument, "invalid service name: %v", initReq.Name)
229+
return status.Errorf(codes.InvalidArgument, "invalid service name: %v", initReq.Name)
229230
}
230231
resp := &lbmpb.LoadBalanceResponse{
231232
LoadBalanceResponseType: &lbmpb.LoadBalanceResponse_InitialResponse{
@@ -285,10 +286,10 @@ const testmdkey = "testmd"
285286
func (s *testServer) EmptyCall(ctx context.Context, in *testpb.Empty) (*testpb.Empty, error) {
286287
md, ok := metadata.FromIncomingContext(ctx)
287288
if !ok {
288-
return nil, grpc.Errorf(codes.Internal, "failed to receive metadata")
289+
return nil, status.Error(codes.Internal, "failed to receive metadata")
289290
}
290291
if md == nil || md["lb-token"][0] != lbToken {
291-
return nil, grpc.Errorf(codes.Internal, "received unexpected metadata: %v", md)
292+
return nil, status.Errorf(codes.Internal, "received unexpected metadata: %v", md)
292293
}
293294
grpc.SetTrailer(ctx, metadata.Pairs(testmdkey, s.addr))
294295
return &testpb.Empty{}, nil

‎health/health.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"sync"
2727

2828
"golang.org/x/net/context"
29-
"google.golang.org/grpc"
3029
"google.golang.org/grpc/codes"
3130
healthpb "google.golang.org/grpc/health/grpc_health_v1"
31+
"google.golang.org/grpc/status"
3232
)
3333

3434
// Server implements `service Health`.
@@ -60,7 +60,7 @@ func (s *Server) Check(ctx context.Context, in *healthpb.HealthCheckRequest) (*h
6060
Status: status,
6161
}, nil
6262
}
63-
return nil, grpc.Errorf(codes.NotFound, "unknown service")
63+
return nil, status.Error(codes.NotFound, "unknown service")
6464
}
6565

6666
// SetServingStatus is called when need to reset the serving status of a service

‎interop/test_utils.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"google.golang.org/grpc/grpclog"
3737
testpb "google.golang.org/grpc/interop/grpc_testing"
3838
"google.golang.org/grpc/metadata"
39+
"google.golang.org/grpc/status"
3940
)
4041

4142
var (
@@ -533,7 +534,7 @@ func DoCustomMetadata(tc testpb.TestServiceClient, args ...grpc.CallOption) {
533534
func DoStatusCodeAndMessage(tc testpb.TestServiceClient, args ...grpc.CallOption) {
534535
var code int32 = 2
535536
msg := "test status message"
536-
expectedErr := grpc.Errorf(codes.Code(code), msg)
537+
expectedErr := status.Error(codes.Code(code), msg)
537538
respStatus := &testpb.EchoStatus{
538539
Code: code,
539540
Message: msg,
@@ -611,7 +612,7 @@ func serverNewPayload(t testpb.PayloadType, size int32) (*testpb.Payload, error)
611612
}
612613

613614
func (s *testServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*testpb.SimpleResponse, error) {
614-
status := in.GetResponseStatus()
615+
st := in.GetResponseStatus()
615616
if md, ok := metadata.FromIncomingContext(ctx); ok {
616617
if initialMetadata, ok := md[initialMetadataKey]; ok {
617618
header := metadata.Pairs(initialMetadataKey, initialMetadata[0])
@@ -622,8 +623,8 @@ func (s *testServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*
622623
grpc.SetTrailer(ctx, trailer)
623624
}
624625
}
625-
if status != nil && status.Code != 0 {
626-
return nil, grpc.Errorf(codes.Code(status.Code), status.Message)
626+
if st != nil && st.Code != 0 {
627+
return nil, status.Error(codes.Code(st.Code), st.Message)
627628
}
628629
pl, err := serverNewPayload(in.GetResponseType(), in.GetResponseSize())
629630
if err != nil {
@@ -690,9 +691,9 @@ func (s *testServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServ
690691
if err != nil {
691692
return err
692693
}
693-
status := in.GetResponseStatus()
694-
if status != nil && status.Code != 0 {
695-
return grpc.Errorf(codes.Code(status.Code), status.Message)
694+
st := in.GetResponseStatus()
695+
if st != nil && st.Code != 0 {
696+
return status.Error(codes.Code(st.Code), st.Message)
696697
}
697698
cs := in.GetResponseParameters()
698699
for _, c := range cs {

‎reflection/serverreflection.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import (
5252
"google.golang.org/grpc"
5353
"google.golang.org/grpc/codes"
5454
rpb "google.golang.org/grpc/reflection/grpc_reflection_v1alpha"
55+
"google.golang.org/grpc/status"
5556
)
5657

5758
type serverReflectionServer struct {
@@ -388,7 +389,7 @@ func (s *serverReflectionServer) ServerReflectionInfo(stream rpb.ServerReflectio
388389
},
389390
}
390391
default:
391-
return grpc.Errorf(codes.InvalidArgument, "invalid MessageRequest: %v", in.MessageRequest)
392+
return status.Errorf(codes.InvalidArgument, "invalid MessageRequest: %v", in.MessageRequest)
392393
}
393394

394395
if err := stream.Send(out); err != nil {

‎stats/stats_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"google.golang.org/grpc/metadata"
3434
"google.golang.org/grpc/stats"
3535
testpb "google.golang.org/grpc/stats/grpc_testing"
36+
"google.golang.org/grpc/status"
3637
)
3738

3839
func init() {
@@ -63,10 +64,10 @@ func (s *testServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*
6364
md, ok := metadata.FromIncomingContext(ctx)
6465
if ok {
6566
if err := grpc.SendHeader(ctx, md); err != nil {
66-
return nil, grpc.Errorf(grpc.Code(err), "grpc.SendHeader(_, %v) = %v, want <nil>", md, err)
67+
return nil, status.Errorf(grpc.Code(err), "grpc.SendHeader(_, %v) = %v, want <nil>", md, err)
6768
}
6869
if err := grpc.SetTrailer(ctx, testTrailerMetadata); err != nil {
69-
return nil, grpc.Errorf(grpc.Code(err), "grpc.SetTrailer(_, %v) = %v, want <nil>", testTrailerMetadata, err)
70+
return nil, status.Errorf(grpc.Code(err), "grpc.SetTrailer(_, %v) = %v, want <nil>", testTrailerMetadata, err)
7071
}
7172
}
7273

@@ -81,7 +82,7 @@ func (s *testServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServ
8182
md, ok := metadata.FromIncomingContext(stream.Context())
8283
if ok {
8384
if err := stream.SendHeader(md); err != nil {
84-
return grpc.Errorf(grpc.Code(err), "%v.SendHeader(%v) = %v, want %v", stream, md, err, nil)
85+
return status.Errorf(grpc.Code(err), "%v.SendHeader(%v) = %v, want %v", stream, md, err, nil)
8586
}
8687
stream.SetTrailer(testTrailerMetadata)
8788
}
@@ -109,7 +110,7 @@ func (s *testServer) ClientStreamCall(stream testpb.TestService_ClientStreamCall
109110
md, ok := metadata.FromIncomingContext(stream.Context())
110111
if ok {
111112
if err := stream.SendHeader(md); err != nil {
112-
return grpc.Errorf(grpc.Code(err), "%v.SendHeader(%v) = %v, want %v", stream, md, err, nil)
113+
return status.Errorf(grpc.Code(err), "%v.SendHeader(%v) = %v, want %v", stream, md, err, nil)
113114
}
114115
stream.SetTrailer(testTrailerMetadata)
115116
}
@@ -133,7 +134,7 @@ func (s *testServer) ServerStreamCall(in *testpb.SimpleRequest, stream testpb.Te
133134
md, ok := metadata.FromIncomingContext(stream.Context())
134135
if ok {
135136
if err := stream.SendHeader(md); err != nil {
136-
return grpc.Errorf(grpc.Code(err), "%v.SendHeader(%v) = %v, want %v", stream, md, err, nil)
137+
return status.Errorf(grpc.Code(err), "%v.SendHeader(%v) = %v, want %v", stream, md, err, nil)
137138
}
138139
stream.SetTrailer(testTrailerMetadata)
139140
}

‎stress/client/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
"google.golang.org/grpc/grpclog"
3939
"google.golang.org/grpc/interop"
4040
testpb "google.golang.org/grpc/interop/grpc_testing"
41+
"google.golang.org/grpc/status"
4142
metricspb "google.golang.org/grpc/stress/grpc_testing"
4243
"google.golang.org/grpc/testdata"
4344
)
@@ -176,7 +177,7 @@ func (s *server) GetGauge(ctx context.Context, in *metricspb.GaugeRequest) (*met
176177
if g, ok := s.gauges[in.Name]; ok {
177178
return &metricspb.GaugeResponse{Name: in.Name, Value: &metricspb.GaugeResponse_LongValue{LongValue: g.get()}}, nil
178179
}
179-
return nil, grpc.Errorf(codes.InvalidArgument, "gauge with name %s not found", in.Name)
180+
return nil, status.Errorf(codes.InvalidArgument, "gauge with name %s not found", in.Name)
180181
}
181182

182183
// createGauge creates a gauge using the given name in metrics server.

0 commit comments

Comments
 (0)