astelm
/
grpcurl
mirror of https://github.com/fullstorydev/grpcurl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

made change backwards compatible

This commit is contained in:
Mikhail Katychev 2020-09-29 18:17:34 -05:00
parent 1e796ea75f
commit 064101bc06
No known key found for this signature in database
GPG Key ID: 9E8549CD2CEB5E59
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/grpcurl/grpcurl.go
View File

@ -695,7 +695,7 @@ func main() {
err = grpcurl.InvokeRPC(ctx, descSource, cc, symbol, append(addlHeaders, rpcHeaders...), h, rf.Next) err = grpcurl.InvokeRPC(ctx, descSource, cc, symbol, append(addlHeaders, rpcHeaders...), h, rf.Next)
if err != nil { if err != nil {
if errStatus, ok := status.FromError(err); ok { if errStatus, ok := status.FromError(err); ok && *formatError {
h.Status = errStatus h.Status = errStatus
} else { } else {
fail(err, "Error invoking method %q", symbol) fail(err, "Error invoking method %q", symbol)

6
invoke.go
View File

@ -99,9 +99,9 @@ func InvokeRPC(ctx context.Context, source DescriptorSource, ch grpcdynamic.Chan
if isNotFoundError(err) { if isNotFoundError(err) {
return fmt.Errorf("target server does not expose service %q", svc) return fmt.Errorf("target server does not expose service %q", svc)
} }
// return the error unstringified if it is a gRPC status.Status error // return the error unstringified if it is a gRPC status error
if _, ok := status.FromError(err); ok { if statusErr, ok := status.FromError(err); ok {
return err return status.Errorf(statusErr.Code(), "failed to query for service descriptor %q: %v", svc, err)
} }
return fmt.Errorf("failed to query for service descriptor %q: %v", svc, err) return fmt.Errorf("failed to query for service descriptor %q: %v", svc, err)
} }