fix: grpc status code "Unavailable" handling

awakari · Dec 28, 2023 · 77dff43 · 77dff43
1 parent 7deb1fb
commit 77dff43
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/api/grpc/limits/service.go b/api/grpc/limits/service.go
@@ -23,6 +23,8 @@ var ErrInternal = errors.New("internal failure")
 
 var ErrReached = errors.New("usage limit reached")
 
+var ErrUnavailable = errors.New("unavailable")
+
 func NewService(client ServiceClient) Service {
 	return service{
 		client: client,
@@ -59,6 +61,8 @@ func decodeError(src error) (dst error) {
 		case s.Code() == codes.OK:
 		case s.Code() == codes.Unauthenticated:
 			dst = fmt.Errorf("%w: %s", auth.ErrAuth, src)
+		case s.Code() == codes.Unavailable:
+			dst = fmt.Errorf("%w: %s", ErrUnavailable, src)
 		default:
 			dst = fmt.Errorf("%w: %s", ErrInternal, src)
 		}

diff --git a/api/grpc/permits/service.go b/api/grpc/permits/service.go
@@ -24,6 +24,8 @@ type service struct {
 
 var ErrInternal = errors.New("internal failure")
 
+var ErrUnavailable = errors.New("unavailable")
+
 func NewService(client ServiceClient) Service {
 	return service{
 		client: client,
@@ -58,6 +60,8 @@ func decodeError(src error) (dst error) {
 		case s.Code() == codes.OK:
 		case s.Code() == codes.Unauthenticated:
 			dst = fmt.Errorf("%w: %s", auth.ErrAuth, src)
+		case s.Code() == codes.Unavailable:
+			dst = fmt.Errorf("%w: %s", ErrUnavailable, src)
 		default:
 			dst = fmt.Errorf("%w: %s", ErrInternal, src)
 		}

diff --git a/api/grpc/reader/service.go b/api/grpc/reader/service.go
@@ -27,6 +27,8 @@ var ErrInvalidRequest = errors.New("invalid request")
 
 var ErrNotFound = errors.New("subscription not found")
 
+var ErrUnavailable = errors.New("unavailable")
+
 func NewService(client ServiceClient) Service {
 	return service{
 		client: client,
@@ -91,6 +93,8 @@ func decodeError(src error) (dst error) {
 		dst = fmt.Errorf("%w: %s", auth.ErrAuth, src)
 	case status.Code(src) == codes.NotFound:
 		dst = fmt.Errorf("%w: %s", ErrNotFound, src)
+	case status.Code(src) == codes.Unavailable:
+		dst = fmt.Errorf("%w: %s", ErrUnavailable, src)
 	default:
 		dst = fmt.Errorf("%w: %s", ErrInternal, src)
 	}

diff --git a/api/grpc/resolver/service.go b/api/grpc/resolver/service.go
@@ -20,6 +20,7 @@ type service struct {
 	client ServiceClient
 }
 
+var ErrUnavailable = errors.New("unavailable")
 var ErrInternal = errors.New("internal failure")
 
 func NewService(client ServiceClient) Service {
@@ -52,6 +53,10 @@ func decodeError(src error) (dst error) {
 			dst = fmt.Errorf("%w: %s", limits.ErrReached, src)
 		case s.Code() == codes.Unauthenticated:
 			dst = fmt.Errorf("%w: %s", auth.ErrAuth, src)
+		case s.Code() == codes.Unavailable:
+			dst = fmt.Errorf("%w: %s", ErrUnavailable, src)
+		case status.Code(src) == codes.DeadlineExceeded:
+			dst = context.DeadlineExceeded
 		default:
 			dst = fmt.Errorf("%w: %s", ErrInternal, src)
 		}

diff --git a/api/grpc/subscriptions/service.go b/api/grpc/subscriptions/service.go
@@ -48,6 +48,8 @@ var ErrInternal = errors.New("internal failure")
 // ErrInvalid indicates the invalid subscription.
 var ErrInvalid = errors.New("invalid subscription")
 
+var ErrUnavailable = errors.New("unavailable")
+
 func NewService(client ServiceClient) Service {
 	return service{
 		client: client,
@@ -264,6 +266,8 @@ func decodeError(src error) (dst error) {
 			dst = fmt.Errorf("%w: %s", ErrBusy, src)
 		case s.Code() == codes.Unauthenticated:
 			dst = fmt.Errorf("%w: %s", auth.ErrAuth, src)
+		case s.Code() == codes.Unavailable:
+			dst = fmt.Errorf("%w: %s", ErrUnavailable, src)
 		default:
 			dst = fmt.Errorf("%w: %s", ErrInternal, src)
 		}