[public-api] Handle context cancelled as deadline exceeded error

Author: easyCZ

Diff for: components/public-api-server/pkg/proxy/errors.go

@@ -5,6 +5,7 @@
 package proxy
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -53,6 +54,10 @@ func categorizeRPCError(err error) *connect.Error {
 		}
 	}
 
+	if errors.Is(err, context.Canceled) {
+		return connect.NewError(connect.CodeDeadlineExceeded, fmt.Errorf("Request timed out"))
+	}
+
 	if handshakeErr := new(protocol.ErrBadHandshake); errors.As(err, &handshakeErr) {
 		return connect.NewError(connect.CodeUnauthenticated, fmt.Errorf("Failed to establish caller identity"))
 	}

Diff for: components/public-api-server/pkg/proxy/errors_test.go

@@ -5,6 +5,7 @@
 package proxy
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"testing"
@@ -17,55 +18,59 @@ import (
 
 func TestConvertError(t *testing.T) {
 	scenarios := []struct {
-		WebsocketError error
-		ExpectedError  error
+		Input         error
+		ExpectedError error
 	}{
 		{
-			WebsocketError: &protocol.ErrBadHandshake{
+			Input: &protocol.ErrBadHandshake{
 				URL: "https://foo.bar",
 			},
 			ExpectedError: connect.NewError(connect.CodeUnauthenticated, fmt.Errorf("Failed to establish caller identity")),
 		},
 		{
-			WebsocketError: &jsonrpc2.Error{
+			Input: &jsonrpc2.Error{
 				Code:    400,
 				Message: "user id is a required argument",
 			},
 			ExpectedError: connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("user id is a required argument")),
 		},
 		{
-			WebsocketError: &jsonrpc2.Error{
+			Input: &jsonrpc2.Error{
 				Code:    -32603,
 				Message: "Request getWorkspace failed with message: No workspace with id 'some-id' found.",
 			},
 			ExpectedError: connect.NewError(connect.CodeInternal, fmt.Errorf("Request getWorkspace failed with message: No workspace with id 'some-id' found.")),
 		},
 		{
-			WebsocketError: &jsonrpc2.Error{
+			Input: &jsonrpc2.Error{
 				Code:    409,
 				Message: "already exists",
 			},
 			ExpectedError: connect.NewError(connect.CodeAlreadyExists, fmt.Errorf("already exists")),
 		},
 		{
-			WebsocketError: &jsonrpc2.Error{
+			Input: &jsonrpc2.Error{
 				Code:    470,
 				Message: "user blocked",
 			},
 			ExpectedError: connect.NewError(connect.CodePermissionDenied, fmt.Errorf("user blocked")),
 		},
 		{
-			WebsocketError: nil,
-			ExpectedError:  nil,
+			Input:         nil,
+			ExpectedError: nil,
 		},
 		{
-			WebsocketError: errors.New("some other random error returns internal error"),
-			ExpectedError:  connect.NewError(connect.CodeInternal, fmt.Errorf("some other random error returns internal error")),
+			Input:         errors.New("some other random error returns internal error"),
+			ExpectedError: connect.NewError(connect.CodeInternal, fmt.Errorf("some other random error returns internal error")),
+		},
+		{
+			Input:         context.Canceled,
+			ExpectedError: connect.NewError(connect.CodeDeadlineExceeded, fmt.Errorf("Request timed out")),
 		},
 	}
 
 	for _, s := range scenarios {
-		converted := ConvertError(s.WebsocketError)
+		converted := ConvertError(s.Input)
 		require.Equal(t, s.ExpectedError, converted)
 	}
 }