Skip to content

fix: raise when presigned URL response is missing or malformed #5073

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
aicam merged 10 commits into from
May 20, 2026
Merged

fix: raise when presigned URL response is missing or malformed #5073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9f457c0
raise when presigned URL response is missing or malformed
Ma77Ball May 15, 2026
992a21c
Merge branch 'main' into fix/get_presigned_url_none
Ma77Ball May 15, 2026
00e77e4
ran lint
Ma77Ball May 15, 2026
dd4bd5b
Merge remote-tracking branch 'origin/fix/get_presigned_url_none' into…
Ma77Ball May 15, 2026
44b386c
fixed old test case
Ma77Ball May 15, 2026
032e006
Added test
Ma77Ball May 15, 2026
bf916e3
Merge branch 'main' into fix/get_presigned_url_none
Ma77Ball May 15, 2026
8b66093
Merge branch 'main' into fix/get_presigned_url_none
aicam May 15, 2026
3139682
Merge branch 'main' into fix/get_presigned_url_none
Ma77Ball May 19, 2026
0c34245
Merge branch 'main' into fix/get_presigned_url_none
Ma77Ball May 20, 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
16 changes: 15 additions & 1 deletion amber/src/main/python/pytexera/storage/dataset_file_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,21 @@ def get_presigned_url(self) -> str:
f"Failed to get presigned URL: {response.status_code} {response.text}"
)

return response.json().get("presignedUrl")
try:
payload = response.json()
except ValueError as e:
raise RuntimeError(
f"Failed to get presigned URL: invalid JSON response: {response.text}"
) from e

presigned_url = payload.get("presignedUrl")
if not isinstance(presigned_url, str) or not presigned_url:
raise RuntimeError(
f"Failed to get presigned URL: 'presignedUrl' missing from "
f"response: {response.text}"
)

return presigned_url

def read_file(self) -> io.BytesIO:
"""
Expand Down
32 changes: 28 additions & 4 deletions amber/src/test/python/pytexera/storage/test_dataset_file_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,37 @@ def test_raises_runtime_error_with_status_and_body_on_failure(self, monkeypatch)
with pytest.raises(RuntimeError, match=r"403.*forbidden"):
doc.get_presigned_url()

def test_returns_none_when_response_body_lacks_presigned_url_key(self, monkeypatch):
# Pins current behavior: a 200 with no "presignedUrl" key yields None
# rather than raising. read_file() will then call requests.get(None).
def test_raises_when_response_body_lacks_presigned_url_key(self, monkeypatch):
doc = self._make_doc(monkeypatch)
with patch("pytexera.storage.dataset_file_document.requests.get") as mock_get:
mock_get.return_value = make_response(200, body={"other": "value"})
assert doc.get_presigned_url() is None
with pytest.raises(RuntimeError, match="'presignedUrl' missing"):
doc.get_presigned_url()

def test_raises_when_response_body_is_not_valid_json(self, monkeypatch):
doc = self._make_doc(monkeypatch)
with patch("pytexera.storage.dataset_file_document.requests.get") as mock_get:
response = MagicMock()
response.status_code = 200
response.json.side_effect = ValueError("Expecting value")
response.text = "<html>not json</html>"
mock_get.return_value = response
with pytest.raises(RuntimeError, match="invalid JSON response"):
doc.get_presigned_url()

def test_raises_when_presigned_url_is_empty_string(self, monkeypatch):
doc = self._make_doc(monkeypatch)
with patch("pytexera.storage.dataset_file_document.requests.get") as mock_get:
mock_get.return_value = make_response(200, body={"presignedUrl": ""})
with pytest.raises(RuntimeError, match="'presignedUrl' missing"):
doc.get_presigned_url()

def test_raises_when_presigned_url_is_not_a_string(self, monkeypatch):
doc = self._make_doc(monkeypatch)
with patch("pytexera.storage.dataset_file_document.requests.get") as mock_get:
mock_get.return_value = make_response(200, body={"presignedUrl": None})
with pytest.raises(RuntimeError, match="'presignedUrl' missing"):
doc.get_presigned_url()


class TestReadFile:
Expand Down
Loading