changes in api-keys

Author: pcrespov

services/web/server/src/simcore_service_webserver/api_keys/_repository.py

@@ -7,7 +7,10 @@
 from models_library.products import ProductName
 from models_library.users import UserID
 from simcore_postgres_database.models.api_keys import api_keys
-from simcore_postgres_database.utils_repos import transaction_context
+from simcore_postgres_database.utils_repos import (
+    pass_or_acquire_connection,
+    transaction_context,
+)
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.ext.asyncio import AsyncConnection
 
@@ -45,7 +48,7 @@ async def create_api_key(
             )
 
             result = await conn.stream(stmt)
-            row = await result.first()
+            row = await result.one()
 
             return ApiKey(
                 id=f"{row.id}",  # NOTE See: https://github.com/ITISFoundation/osparc-simcore/issues/6919
@@ -111,7 +114,7 @@ async def list_api_keys(
     user_id: UserID,
     product_name: ProductName,
 ) -> list[ApiKey]:
-    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         stmt = sa.select(api_keys.c.id, api_keys.c.display_name).where(
             (api_keys.c.user_id == user_id) & (api_keys.c.product_name == product_name)
         )
@@ -136,7 +139,7 @@ async def get_api_key(
     user_id: UserID,
     product_name: ProductName,
 ) -> ApiKey | None:
-    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         stmt = sa.select(api_keys).where(
             (
                 api_keys.c.id == int(api_key_id)
@@ -145,8 +148,8 @@ async def get_api_key(
             & (api_keys.c.product_name == product_name)
         )
 
-        result = await conn.stream(stmt)
-        row = await result.first()
+        result = await conn.execute(stmt)
+        row = result.one_or_none()
 
         return (
             ApiKey(
@@ -180,7 +183,7 @@ async def delete_api_key(
         await conn.execute(stmt)
 
 
-async def prune_expired(
+async def delete_expired_api_keys(
     app: web.Application, connection: AsyncConnection | None = None
 ) -> list[str]:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
@@ -192,7 +195,6 @@ async def prune_expired(
             )
             .returning(api_keys.c.display_name)
         )
-        result = await conn.stream(stmt)
-
-    rows = [row async for row in result]
-    return [r.display_name for r in rows]
+        result = await conn.execute(stmt)
+        rows = result.fetchall()
+        return [r.display_name for r in rows]

services/web/server/src/simcore_service_webserver/api_keys/_service.py

@@ -32,8 +32,8 @@ async def create_api_key(
     *,
     user_id: UserID,
     product_name: ProductName,
-    display_name=str,
-    expiration=dt.timedelta,
+    display_name: str,
+    expiration: dt.timedelta | None,
 ) -> ApiKey:
     api_key, api_secret = _generate_api_key_and_secret(display_name)
 
@@ -119,5 +119,5 @@ async def delete_api_key(
 
 
 async def prune_expired_api_keys(app: web.Application) -> list[str]:
-    names: list[str] = await _repository.prune_expired(app)
+    names: list[str] = await _repository.delete_expired_api_keys(app)
     return names

services/web/server/tests/unit/with_dbs/01/test_api_keys.py

@@ -3,6 +3,7 @@
 # pylint: disable=unused-variable
 # pylint: disable=too-many-arguments
 
+import asyncio
 from collections.abc import AsyncIterable
 from datetime import timedelta
 from http import HTTPStatus
@@ -27,7 +28,6 @@
 from tenacity import (
     retry_if_exception_type,
     stop_after_attempt,
-    stop_after_delay,
     wait_fixed,
 )
 
@@ -172,15 +172,10 @@ async def test_create_api_key_with_expiration(
         assert [d["displayName"] for d in data] == ["foo"]
 
         # wait for api-key for it to expire and force-run scheduled task
-        async for attempt in tenacity.AsyncRetrying(
-            wait=wait_fixed(1),
-            retry=retry_if_exception_type(AssertionError),
-            stop=stop_after_delay(5 * expiration_interval.seconds),
-            reraise=True,
-        ):
-            with attempt:
-                deleted = await api_keys_service.prune_expired_api_keys(client.app)
-                assert deleted == ["foo"]
+        await asyncio.sleep(1.1 * expiration_interval.seconds)
+
+        deleted = await api_keys_service.prune_expired_api_keys(client.app)
+        assert deleted == ["foo"]
 
         resp = await client.get("/v0/auth/api-keys")
         data, _ = await assert_status(resp, expected)