SEBA-705 Wrap all gRPC methods;
translate permission errors;
print prefix only when emitting final error message
Change-Id: I3cbb0cf8f321c965d11354cc01491f2b3c0dc1b3
diff --git a/commands/common.go b/commands/common.go
index 12b869f..c79c3ca 100644
--- a/commands/common.go
+++ b/commands/common.go
@@ -27,7 +27,6 @@
"golang.org/x/net/context"
"google.golang.org/grpc"
reflectpb "google.golang.org/grpc/reflection/grpc_reflection_v1alpha"
- "google.golang.org/grpc/status"
"log"
"os"
"strings"
@@ -57,11 +56,11 @@
h := &RpcEventHandler{}
err := grpcurl.InvokeRPC(ctx, descriptor, conn, "xos.utility.GetVersion", headers, h, h.GetParams)
if err != nil {
- return nil, err
+ return nil, corderrors.RpcErrorToCordError(err)
}
if h.Status != nil && h.Status.Err() != nil {
- return nil, h.Status.Err()
+ return nil, corderrors.RpcErrorToCordError(h.Status.Err())
}
d, err := dynamic.AsDynamicMessage(h.Response)
@@ -167,16 +166,3 @@
}
}
}
-
-func HumanReadableError(err error) string {
- st, ok := status.FromError(err)
- if ok {
- grpc_message := st.Message()
- if strings.HasPrefix(grpc_message, "Exception calling application: ") {
- return st.Message()[31:]
- } else {
- return st.Message()
- }
- }
- return err.Error()
-}