Improved errors on chalice

Author: syrusakbary

src/graphql_server/chalice/views.py

@@ -138,7 +138,6 @@ def get_sub_response(self, request: Request) -> TemporalResponse:
     @staticmethod
     def error_response(
         message: str,
-        error_code: str,
         http_status_code: int,
         headers: Optional[dict[str, str | list[str]]] = None,
     ) -> Response:
@@ -153,9 +152,7 @@ def error_response(
         Returns:
             An errors response.
         """
-        body = {"Code": error_code, "Message": message}
-
-        return Response(body=body, status_code=http_status_code, headers=headers)
+        return Response(body=message, status_code=http_status_code, headers=headers)
 
     def get_context(self, request: Request, response: TemporalResponse) -> Context:
         return {"request": request, "response": response}  # type: ignore
@@ -181,18 +178,7 @@ def execute_request(self, request: Request) -> Response:
         try:
             return self.run(request=request)
         except HTTPException as e:
-            error_code_map = {
-                400: "BadRequestError",
-                401: "UnauthorizedError",
-                403: "ForbiddenError",
-                404: "NotFoundError",
-                409: "ConflictError",
-                429: "TooManyRequestsError",
-                500: "ChaliceViewError",
-            }
-
             return self.error_response(
-                error_code=error_code_map.get(e.status_code, "ChaliceViewError"),
                 message=e.reason,
                 http_status_code=e.status_code,
             )

src/tests/http/test_query.py

@@ -289,15 +289,7 @@ async def test_invalid_operation_selection(http_client: HttpClient, operation_na
     )
 
     assert response.status_code == 400
-
-    if isinstance(http_client, ChaliceHttpClient):
-        # Our Chalice integration purposely wraps errors messages with a JSON object
-        assert response.json == {
-            "Code": "BadRequestError",
-            "Message": f'Unknown operation named "{operation_name}".',
-        }
-    else:
-        assert response.data == f'Unknown operation named "{operation_name}".'.encode()
+    assert response.data == f'Unknown operation named "{operation_name}".'.encode()
 
 
 async def test_operation_selection_without_operations(http_client: HttpClient):
@@ -308,12 +300,4 @@ async def test_operation_selection_without_operations(http_client: HttpClient):
     )
 
     assert response.status_code == 400
-
-    if isinstance(http_client, ChaliceHttpClient):
-        # Our Chalice integration purposely wraps errors messages with a JSON object
-        assert response.json == {
-            "Code": "BadRequestError",
-            "Message": "Can't get GraphQL operation type",
-        }
-    else:
-        assert response.data == b"Can't get GraphQL operation type"
+    assert response.data == b"Can't get GraphQL operation type"

src/tests/http/test_upload.py

@@ -34,17 +34,6 @@ async def test_multipart_uploads_are_disabled_by_default(http_client: HttpClient
     )
 
     assert response.status_code == 400
-
-    with contextlib.suppress(ImportError):
-        from .clients.chalice import ChaliceHttpClient
-
-        if isinstance(http_client, ChaliceHttpClient):
-            assert response.json == {
-                "Code": "BadRequestError",
-                "Message": "Unsupported content type",
-            }
-            return
-
     assert response.data == b"Unsupported content type"