Skip to content

fix: catch JSONDecodeError in _throw_on_error #2207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
estellesoulard merged 2 commits into from
Sep 24, 2026
+55 −1
Merged

fix: catch JSONDecodeError in _throw_on_error #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71429c9
fix: catch json decode error first
luxifer Sep 24, 2026
03d3934
feat: add test to validate json decode error catched
luxifer Sep 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion scaleway-core/scaleway_core/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,11 @@ def _request(

def _throw_on_error(self, res: requests.Response) -> None:
if res.status_code is not None and res.status_code >= 400:
data = res.json()
data = None
try:
data = res.json()
except requests.exceptions.JSONDecodeError:
pass

if data:
if "message" in data:
Expand Down
50 changes: 50 additions & 0 deletions scaleway-core/tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import unittest
import uuid

from requests.models import Response

from scaleway_core.api import API, ScalewayException, ValidationError
from scaleway_core.client import Client


def _response(status_code: int, body: bytes) -> Response:
response = Response()
response.status_code = status_code
response._content = body
return response


def _api() -> API:
client = Client(
access_key="SCW" + "A" * 17,
secret_key=str(uuid.uuid4()),
)
return API(client)


class TestThrowOnError(unittest.TestCase):
def test_non_json_error_raises_scaleway_exception_with_raw_body(self):
response = _response(502, b"<html>Bad Gateway</html>")

with self.assertRaises(ScalewayException) as context:
_api()._throw_on_error(response)

self.assertEqual(context.exception.status_code, 502)
self.assertIn("<html>Bad Gateway</html>", str(context.exception))

def test_json_error_raises_scaleway_exception(self):
response = _response(500, b'{"message": "boom"}')

with self.assertRaises(ScalewayException):
_api()._throw_on_error(response)

def test_validation_error_raises_validation_error(self):
response = _response(
400,
b'{"message": "Validation Error", "fields": {"name": "required"}}',
)

with self.assertRaises(ValidationError) as context:
_api()._throw_on_error(response)

self.assertEqual(context.exception.errors, {"name": "required"})
Loading