ongoing

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/simcore_storage_datcore_adapter.py

@@ -1,6 +1,7 @@
 import re
 from collections.abc import Iterator
 
+import httpx
 import pytest
 import respx
 from faker import Faker
@@ -25,11 +26,7 @@ def datcore_adapter_service_mock(faker: Faker) -> Iterator[respx.MockRouter]:
         # NOTE: passthrough the locahost and the local ip
         respx_mocker.route(host="127.0.0.1").pass_through()
         respx_mocker.route(host=get_localhost_ip()).pass_through()
-        respx_mocker.get(
-            "/",
-            name="healthcheck",
-        ).respond(status.HTTP_200_OK, json={"message": "ok"})
-        respx_mocker.get("", name="base_endpoint").respond(status.HTTP_200_OK, json={})
+
         respx_mocker.get("/user/profile", name="get_user_profile").respond(
             status.HTTP_200_OK, json=faker.pydict(allowed_types=(str,))
         )
@@ -41,4 +38,22 @@ def datcore_adapter_service_mock(faker: Faker) -> Iterator[respx.MockRouter]:
             ),
         )
 
+        def _create_download_link(request, file_id):
+            return httpx.Response(
+                status.HTTP_404_NOT_FOUND,
+                json={"error": f"{file_id} not found!"},
+            )
+
+        respx_mocker.get(
+            re.compile(r"/files/(?P<file_id>[^/]+)"), name="get_file_dowload_link"
+        ).mock(side_effect=_create_download_link)
+
+        respx_mocker.get(
+            "/",
+            name="healthcheck",
+        ).respond(status.HTTP_200_OK, json={"message": "ok"})
+        respx_mocker.get("", name="base_endpoint").respond(
+            status.HTTP_200_OK, json={"message": "root entrypoint"}
+        )
+
         yield respx_mocker

services/storage/src/simcore_service_storage/modules/datcore_adapter/datcore_adapter.py

@@ -10,7 +10,9 @@
 from models_library.api_schemas_datcore_adapter.datasets import (
     FileMetaData as DatCoreFileMetaData,
 )
-from models_library.api_schemas_datcore_adapter.datasets import PackageMetaData
+from models_library.api_schemas_datcore_adapter.datasets import (
+    PackageMetaData,
+)
 from models_library.api_schemas_storage.storage_schemas import (
     DatCoreCollectionName,
     DatCoreDatasetName,

services/storage/tests/unit/test_handlers_files.py

@@ -110,6 +110,12 @@ class SingleLinkParam:
     expected_chunk_size: ByteSize
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize(
     "single_link_param",
     [
@@ -239,6 +245,12 @@ async def _link_creator(file_id: SimcoreS3FileID, **query_kwargs) -> PresignedLi
     await asyncio.gather(*clean_tasks)
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize(
     "single_link_param",
     [
@@ -320,6 +332,12 @@ class MultiPartParam:
     expected_chunk_size: ByteSize
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize(
     "test_param",
     [
@@ -418,6 +436,12 @@ async def test_create_upload_file_presigned_with_file_size_returns_multipart_lin
     )
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize(
     "link_type, file_size",
     [
@@ -482,6 +506,12 @@ async def test_delete_unuploaded_file_correctly_cleans_up_db_and_s3(
     )
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize(
     "link_type, file_size",
     [
@@ -568,6 +598,12 @@ def complex_file_name(faker: Faker) -> str:
     return f"subfolder_1/sub_folder 2/some file name with spaces and special characters  -_ü!öäàé+|}} {{3245_{faker.file_name()}"
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 @pytest.mark.parametrize(
     "file_size",
     [
@@ -695,6 +731,12 @@ async def test_upload_real_file_with_emulated_storage_restart_after_completion_w
     assert s3_metadata.e_tag == completion_etag
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_upload_of_single_presigned_link_lazily_update_database_on_get(
     sqlalchemy_async_engine: AsyncEngine,
     storage_s3_client: SimcoreS3API,
@@ -738,6 +780,12 @@ async def test_upload_of_single_presigned_link_lazily_update_database_on_get(
     assert received_fmd.entity_tag == upload_e_tag
 
 
+@pytest.mark.parametrize(
+    "location_id",
+    [SimcoreS3DataManager.get_location_id()],
+    ids=[SimcoreS3DataManager.get_location_name()],
+    indirect=True,
+)
 async def test_upload_real_file_with_s3_client(
     sqlalchemy_async_engine: AsyncEngine,
     storage_s3_client: SimcoreS3API,
@@ -949,6 +997,7 @@ async def test_download_file_no_file_was_uploaded(
     user_id: UserID,
     storage_s3_client: SimcoreS3API,
     storage_s3_bucket: S3BucketName,
+    fake_datcore_tokens: tuple[str, str],
 ):
     missing_file = TypeAdapter(SimcoreS3FileID).validate_python(
         f"{project_id}/{node_id}/missing.file"