switch string to ErrorCode analysis

Signed-off-by: Alexander Bezzubov <bzz@apache.org>
bblfsh · Nov 22, 2018 · 6709d6a · 6709d6a
1 parent 0694920
commit 6709d6a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/daemon/protocol/service.go b/daemon/protocol/service.go
@@ -123,7 +123,7 @@ func (s *protocolServiceServer) InstallDriver(ctx xcontext.Context, req *Install
 		return nil, status.New(codes.AlreadyExists, err.Error()).Err()
 	} else if errs, ok := err.(errcode.Errors); ok { //docker err codes analysis
 		for _, erro := range errs {
-			if strings.HasPrefix(erro.Error(), "unauthorized") {
+			if errc, ok := erro.(errcode.Error); ok && errc.ErrorCode() == errcode.ErrorCodeUnauthorized {
 				return nil, status.New(codes.Unauthenticated, err.Error()).Err()
 			}
 		}

diff --git a/daemon/protocol/service_test.go b/daemon/protocol/service_test.go
@@ -42,7 +42,10 @@ type mockedServiceUnauthorizedErr struct {
 }
 
 func (s *mockedServiceUnauthorizedErr) InstallDriver(language string, image string, update bool) error {
-	var errors errcode.Errors = []error{errcode.ErrorCodeDenied, errcode.ErrorCodeUnauthorized}
+	var errors errcode.Errors = []error{
+		errcode.Error{Code: errcode.ErrorCodeDenied},
+		errcode.Error{Code: errcode.ErrorCodeUnauthorized},
+	}
 	return errors
 }