✨ Refactor: Enhance Postgres settings validation and update test fixtures to use MockType

Author: pcrespov

packages/service-library/src/servicelib/fastapi/postgres_lifespan.py

@@ -25,9 +25,14 @@ async def setup_postgres_database(_, state: State) -> AsyncIterator[State]:
 
     with log_context(_logger, logging.INFO, f"{__name__}"):
 
-        pg_settings: PostgresSettings = state[
+        pg_settings: PostgresSettings | None = state[
             PostgresLifespanStateKeys.POSTGRES_SETTINGS
         ]
+
+        if pg_settings is None or not isinstance(pg_settings, PostgresSettings):
+            msg = f"Invalid {pg_settings=} on startup. Postgres cannot be disabled using settings"
+            raise RuntimeError(msg)
+
         assert isinstance(pg_settings, PostgresSettings)  # nosec
 
         async_engine: AsyncEngine = await create_async_engine_and_database_ready(

services/catalog/tests/unit/conftest.py

@@ -216,8 +216,10 @@ def service_caching_disabled(monkeypatch: pytest.MonkeyPatch) -> None:
 
 
 @pytest.fixture
-def postgres_setup_disabled(monkeypatch: pytest.MonkeyPatch) -> None:
-    monkeypatch.setenv("CATALOG_POSTGRES", "null")
+def postgres_setup_disabled(mocker: MockerFixture) -> MockType:
+    return mocker.patch.object(
+        simcore_service_catalog.core.application, "postgres_lifespan"
+    )
 
 
 @pytest.fixture

services/catalog/tests/unit/test_api_rest.py

@@ -6,10 +6,11 @@
 import httpx
 from fastapi import status
 from fastapi.testclient import TestClient
+from pytest_mock import MockType
 
 
 def test_sync_client(
-    postgres_setup_disabled: None,
+    postgres_setup_disabled: MockType,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,
     director_setup_disabled: None,
@@ -24,7 +25,7 @@ def test_sync_client(
 
 
 async def test_async_client(
-    postgres_setup_disabled: None,
+    postgres_setup_disabled: MockType,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,
     director_setup_disabled: None,

services/catalog/tests/unit/test_utils_service_extras.py

@@ -8,6 +8,7 @@
 from httpx import AsyncClient
 from models_library.api_schemas_directorv2.services import ServiceExtras
 from pydantic import TypeAdapter
+from pytest_mock import MockType
 from respx import MockRouter
 
 
@@ -17,7 +18,7 @@ def mock_engine(app: FastAPI) -> None:
 
 
 async def test_get_service_extras(
-    postgres_setup_disabled: None,
+    postgres_setup_disabled: MockType,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,

services/catalog/tests/unit/test_utils_service_labels.py

@@ -7,6 +7,7 @@
 import pytest
 from fastapi import FastAPI, status
 from httpx import AsyncClient
+from pytest_mock import MockType
 from respx import MockRouter
 
 
@@ -16,7 +17,7 @@ def mock_engine(app: FastAPI) -> None:
 
 
 async def test_get_service_labels(
-    postgres_setup_disabled: None,
+    postgres_setup_disabled: MockType,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,