slowly but surely

Author: sanderegg

services/storage/src/simcore_service_storage/core/settings.py

@@ -42,15 +42,17 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
         None, description="Pennsieve API secret ONLY for testing purposes"
     )
 
-    STORAGE_POSTGRES: PostgresSettings = Field(
+    STORAGE_POSTGRES: PostgresSettings | None = Field(
         json_schema_extra={"auto_default_from_env": True}
     )
 
     STORAGE_REDIS: RedisSettings | None = Field(
         json_schema_extra={"auto_default_from_env": True}
     )
 
-    STORAGE_S3: S3Settings = Field(json_schema_extra={"auto_default_from_env": True})
+    STORAGE_S3: S3Settings | None = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
 
     STORAGE_TRACING: TracingSettings | None = Field(
         json_schema_extra={"auto_default_from_env": True}

services/storage/tests/conftest.py

@@ -120,20 +120,16 @@ async def cleanup_user_projects_file_metadata(sqlalchemy_async_engine: AsyncEngi
 
 
 @pytest.fixture
-def simcore_s3_dsm(client: TestClient) -> SimcoreS3DataManager:
-    assert client.app
+def simcore_s3_dsm(initialized_app: FastAPI) -> SimcoreS3DataManager:
     return cast(
         SimcoreS3DataManager,
-        get_dsm_provider(client.app).get(SimcoreS3DataManager.get_location_id()),
+        get_dsm_provider(initialized_app).get(SimcoreS3DataManager.get_location_id()),
     )
 
 
 @pytest.fixture
-async def storage_s3_client(
-    client: TestClient,
-) -> SimcoreS3API:
-    assert client.app
-    return get_s3_client(client.app)
+async def storage_s3_client(initialized_app: FastAPI) -> SimcoreS3API:
+    return get_s3_client(initialized_app)
 
 
 @pytest.fixture

services/storage/tests/unit/test_cli.py

@@ -33,34 +33,3 @@ def test_run(cli_runner: CliRunner):
     result = cli_runner.invoke(main, ["run"])
     assert result.exit_code == 0
     assert "disabled" in result.stdout
-
-
-# @pytest.mark.parametrize(
-#     "arguments", ["--help", "run --help".split(), "settings --help".split()]
-# )
-# def test_cli_help(arguments: list[str] | str, cli_runner: CliRunner):
-#     result = cli_runner.invoke(main, arguments)
-#     assert result.exit_code == os.EX_OK, result
-
-
-# def test_cli_settings_as_json(cli_runner: CliRunner):
-#     result = cli_runner.invoke(main, ["settings", "--as-json"])
-#     assert result.exit_code == os.EX_OK, result
-#     # reuse resulting json to build settings
-#     settings: dict = json.loads(result.stdout)
-#     assert ApplicationSettings(settings)
-
-
-# def test_cli_settings_env_file(cli_runner: CliRunner):
-#     result = cli_runner.invoke(main, ["settings", "--compact"])
-#     assert result.exit_code == os.EX_OK, result
-
-#     # reuse resulting env_file to build settings
-#     env_file = StringIO(result.stdout)
-
-#     settings = dotenv_values(stream=env_file)
-#     for key, value in settings.items():
-#         with contextlib.suppress(json.decoder.JSONDecodeError):
-#             settings[key] = json.loads(str(value))
-
-#     assert ApplicationSettings(settings)

services/storage/tests/unit/test_handlers_files_metadata.py

@@ -10,15 +10,18 @@
 from random import choice
 from typing import Protocol
 
+import httpx
 import pytest
 from aiohttp.test_utils import TestClient
 from faker import Faker
+from fastapi import FastAPI
 from models_library.api_schemas_storage import FileMetaDataGet, SimcoreS3FileID
 from models_library.projects import ProjectID
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pytest_simcore.helpers.assert_checks import assert_status
 from servicelib.aiohttp import status
+from yarl import URL
 
 pytest_simcore_core_services_selection = ["postgres"]
 pytest_simcore_ops_services_selection = ["adminer"]
@@ -32,31 +35,39 @@ async def __call__(
         read: bool,
         write: bool,
         delete: bool,
-    ) -> None: ...
+    ) -> None:
+        ...
 
 
 async def test_list_files_metadata(
     upload_file: Callable[[ByteSize, str], Awaitable[tuple[Path, SimcoreS3FileID]]],
     create_project_access_rights: CreateProjectAccessRightsCallable,
-    client: TestClient,
+    initialized_app: FastAPI,
+    client: httpx.AsyncClient,
     user_id: UserID,
     other_user_id: UserID,
     location_id: int,
     project_id: ProjectID,
     faker: Faker,
 ):
-    assert client.app
-
     url = (
-        client.app.router["list_files_metadata"]
-        .url_for(location_id=f"{location_id}")
+        URL(f"{client.base_url}")
+        .with_path(
+            initialized_app.url_path_for("list_files_metadata", location_id=location_id)
+        )
         .with_query(user_id=f"{user_id}")
     )
+    # url = (
+    #     client.app.router["list_files_metadata"]
+    #     .url_for(location_id=f"{location_id}")
+    #     .with_query(user_id=f"{user_id}")
+    # )
 
     # this should return an empty list
     response = await client.get(f"{url}")
-    data, error = await assert_status(response, status.HTTP_200_OK)
-    assert not error
+    assert response.status_code == status.HTTP_200_OK
+    data = response.json()
+    assert data
     list_fmds = TypeAdapter(list[FileMetaDataGet]).validate_python(data)
     assert not list_fmds
 
@@ -70,8 +81,8 @@ async def test_list_files_metadata(
 
     # we should find these files now
     response = await client.get(f"{url}")
-    data, error = await assert_status(response, status.HTTP_200_OK)
-    assert not error
+    assert response.status_code == status.HTTP_200_OK
+    data = response.json()
     list_fmds = TypeAdapter(list[FileMetaDataGet]).validate_python(data)
     assert len(list_fmds) == NUM_FILES
 
@@ -87,8 +98,8 @@ async def test_list_files_metadata(
         f"{url.update_query(project_id=str(project_id), user_id=other_user_id)}"
     )
     previous_data = deepcopy(data)
-    data, error = await assert_status(response, status.HTTP_200_OK)
-    assert not error
+    assert response.status_code == status.HTTP_200_OK
+    data = response.json()
     list_fmds = TypeAdapter(list[FileMetaDataGet]).validate_python(data)
     assert len(list_fmds) == (NUM_FILES)
     assert previous_data == data
@@ -104,15 +115,15 @@ async def test_list_files_metadata(
 
     # we should find these files now
     response = await client.get(f"{url}")
-    data, error = await assert_status(response, status.HTTP_200_OK)
-    assert not error
+    assert response.status_code == status.HTTP_200_OK
+    data = response.json()
     list_fmds = TypeAdapter(list[FileMetaDataGet]).validate_python(data)
     assert len(list_fmds) == (2 * NUM_FILES)
 
     # we can filter them now
     response = await client.get(f"{url.update_query(uuid_filter='common_name')}")
-    data, error = await assert_status(response, status.HTTP_200_OK)
-    assert not error
+    assert response.status_code == status.HTTP_200_OK
+    data = response.json()
     list_fmds = TypeAdapter(list[FileMetaDataGet]).validate_python(data)
     assert len(list_fmds) == (NUM_FILES)