Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/errdefs" |
| 10 | 10 |
"github.com/gorilla/mux" |
| 11 | 11 |
"github.com/sirupsen/logrus" |
| 12 |
- "google.golang.org/grpc" |
|
| 13 | 12 |
"google.golang.org/grpc/codes" |
| 13 |
+ "google.golang.org/grpc/status" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
type causer interface {
|
| ... | ... |
@@ -89,14 +89,14 @@ func MakeErrorHandler(err error) http.HandlerFunc {
|
| 89 | 89 |
} |
| 90 | 90 |
WriteJSON(w, statusCode, response) |
| 91 | 91 |
} else {
|
| 92 |
- http.Error(w, grpc.ErrorDesc(err), statusCode) |
|
| 92 |
+ http.Error(w, status.Convert(err).Message(), statusCode) |
|
| 93 | 93 |
} |
| 94 | 94 |
} |
| 95 | 95 |
} |
| 96 | 96 |
|
| 97 | 97 |
// statusCodeFromGRPCError returns status code according to gRPC error |
| 98 | 98 |
func statusCodeFromGRPCError(err error) int {
|
| 99 |
- switch grpc.Code(err) {
|
|
| 99 |
+ switch status.Code(err) {
|
|
| 100 | 100 |
case codes.InvalidArgument: // code 3 |
| 101 | 101 |
return http.StatusBadRequest |
| 102 | 102 |
case codes.NotFound: // code 5 |
| ... | ... |
@@ -7,7 +7,7 @@ import ( |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/errdefs" |
| 9 | 9 |
"github.com/pkg/errors" |
| 10 |
- "google.golang.org/grpc" |
|
| 10 |
+ "google.golang.org/grpc/status" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func errNotRunning(id string) error {
|
| ... | ... |
@@ -122,7 +122,7 @@ func (e startInvalidConfigError) Error() string {
|
| 122 | 122 |
func (e startInvalidConfigError) InvalidParameter() {} // Is this right???
|
| 123 | 123 |
|
| 124 | 124 |
func translateContainerdStartErr(cmd string, setExitCode func(int), err error) error {
|
| 125 |
- errDesc := grpc.ErrorDesc(err) |
|
| 125 |
+ errDesc := status.Convert(err).Message() |
|
| 126 | 126 |
contains := func(s1, s2 string) bool {
|
| 127 | 127 |
return strings.Contains(strings.ToLower(s1), s2) |
| 128 | 128 |
} |