Skip to content
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

🐛 Restores compatibility with deprecated storage API used in legacy services #5679

Merged
merged 2 commits into from
Apr 16, 2024
Merged

🐛 Restores compatibility with deprecated storage API used in legacy services #5679

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
87637bb
reverts changes in #5659
pcrespov Apr 16, 2024
431a904
adapts test
pcrespov Apr 16, 2024
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
13 changes: 8 additions & 5 deletions services/storage/src/simcore_service_storage/handlers_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,18 @@ async def get_file_metadata(request: web.Request) -> web.Response:
file_id=path_params.file_id,
)
except FileMetaDataNotFoundError:
# NOTE: This is what happens Larry... data must be an empty {} or else some old
# dynamic services will FAIL (sic)
# TODO: once all legacy services are gone, remove the try except, it will default to 404
# NOTE: LEGACY compatibility
# This is what happens Larry... data must be an empty {} or else some old dynamic services will FAIL (sic)
# Cannot remove until we retire all legacy services
# https://github.com/ITISFoundation/osparc-simcore/issues/5676
# https://github.com/ITISFoundation/osparc-simcore/blob/cfdf4f86d844ebb362f4f39e9c6571d561b72897/services/storage/client-sdk/python/simcore_service_storage_sdk/models/file_meta_data_enveloped.py#L34

return web.json_response(
{"error": "No result found", "data": None}, dumps=json_dumps
{"error": "No result found", "data": {}}, dumps=json_dumps
)

if request.headers.get("User-Agent") == "OpenAPI-Generator/0.1.0/python":
# LEGACY compatiblity with API v0.1.0
# NOTE: LEGACY compatiblity with API v0.1.0
# SEE models used in sdk in:
# https://github.com/ITISFoundation/osparc-simcore/blob/cfdf4f86d844ebb362f4f39e9c6571d561b72897/services/storage/client-sdk/python/simcore_service_storage_sdk/models/file_meta_data_enveloped.py#L34
# https://github.com/ITISFoundation/osparc-simcore/blob/cfdf4f86d844ebb362f4f39e9c6571d561b72897/services/storage/client-sdk/python/simcore_service_storage_sdk/models/file_meta_data_type.py#L34
Expand Down
2 changes: 1 addition & 1 deletion services/storage/tests/unit/test_handlers_files_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ async def test_get_file_metadata(

# NOTE: This needs to be a Ok response with empty data until ALL legacy services are gone, then it should be changed to 404! see test above
assert response.status == status.HTTP_200_OK
assert await response.json() == {"data": None, "error": "No result found"}
assert await response.json() == {"data": {}, "error": "No result found"}

# now add some stuff there
NUM_FILES = 10
Expand Down
Loading