cleanup

Author: pcrespov

services/web/server/src/simcore_service_webserver/security/_authz_policy.py

@@ -13,7 +13,13 @@
 from models_library.products import ProductName
 from models_library.users import UserID
 from servicelib.aiohttp.db_asyncpg_engine import get_async_engine
-from simcore_postgres_database.aiopg_errors import DatabaseError
+from servicelib.logging_errors import create_troubleshotting_log_kwargs
+from simcore_postgres_database.aiopg_errors import (
+    DatabaseError as AiopgDatabaseError,  # type: ignore[import-untyped]
+)
+from sqlalchemy.exc import (
+    DatabaseError as SQLAlchemyDatabaseError,  # type: ignore[import-untyped]
+)
 
 from ._authz_access_model import (
     AuthContextDict,
@@ -43,8 +49,15 @@
 def _handle_exceptions_as_503():
     try:
         yield
-    except DatabaseError as err:
-        _logger.exception("Auth unavailable due to database error")
+    except (AiopgDatabaseError, SQLAlchemyDatabaseError) as err:
+        _logger.exception(
+            **create_troubleshotting_log_kwargs(
+                "Auth unavailable due to database error",
+                error=err,
+                tip="Check database connection",
+            )
+        )
+
         raise web.HTTPServiceUnavailable(text=MSG_AUTH_NOT_AVAILABLE) from err
 
 

services/web/server/tests/unit/isolated/test_security__authz.py

@@ -243,7 +243,7 @@ async def test_check_access_expressions(access_model: RoleBasedAccessModel):
 def mock_db(mocker: MockerFixture) -> MagicMock:
 
     mocker.patch(
-        "simcore_service_webserver.security._authz_policy.get_database_engine",
+        "simcore_service_webserver.security._authz_policy.get_async_engine",
         autospec=True,
         return_value="FAKE-ENGINE",
     )

services/web/server/tests/unit/isolated/test_security_api.py

@@ -243,7 +243,7 @@ async def basic_db_funs_mocked(client: TestClient, mocker: MockerFixture) -> Non
     await clean_auth_policy_cache(client.app)
 
     mocker.patch(
-        "simcore_service_webserver.security._authz_policy.get_database_engine",
+        "simcore_service_webserver.security._authz_policy.get_async_engine",
         autospec=True,
     )
 

services/web/server/tests/unit/with_dbs/03/test_users_rest_profiles.py

@@ -36,6 +36,8 @@
 from simcore_service_webserver.users._preferences_service import (
     get_frontend_user_preferences_aggregation,
 )
+from sqlalchemy.exc import OperationalError as SQLAlchemyOperationalError
+from sqlalchemy.ext.asyncio import AsyncConnection
 
 
 @pytest.fixture
@@ -554,6 +556,14 @@ def mock_failing_database_connection(mocker: Mock) -> MagicMock:
     conn_execute.side_effect = OperationalError(
         "MOCK: server closed the connection unexpectedly"
     )
+
+    aysncpg_conn_execute = mocker.patch.object(AsyncConnection, "execute")
+    aysncpg_conn_execute.side_effect = SQLAlchemyOperationalError(
+        statement="MOCK statement",
+        params=(),
+        orig=OperationalError("MOCK: server closed the connection unexpectedly"),
+    )
+
     return conn_execute