changes in api-keys

Author: pcrespov

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

@@ -24,7 +24,7 @@
 from ..utils_aiohttp import envelope_json_response
 from . import _service
 from ._exceptions_handlers import handle_plugin_requests_exceptions
-from ._models import ApiKey
+from .models import ApiKey
 
 _logger = logging.getLogger(__name__)
 

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

@@ -10,8 +10,8 @@
 
 from ..rabbitmq import get_rabbitmq_rpc_server
 from . import _service
-from ._models import ApiKey
 from .errors import ApiKeyNotFoundError
+from .models import ApiKey
 
 router = RPCRouter()
 

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

@@ -12,8 +12,8 @@
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from ..db.plugin import get_asyncpg_engine
-from ._models import ApiKey
 from .errors import ApiKeyDuplicatedDisplayNameError
+from .models import ApiKey
 
 _logger = logging.getLogger(__name__)
 
@@ -193,5 +193,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]
+
+    rows = [row async for row in result]
+    return [r.display_name for r in rows]

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

@@ -9,8 +9,8 @@
 from servicelib.utils_secrets import generate_token_secret_key
 
 from . import _repository
-from ._models import ApiKey
 from .errors import ApiKeyNotFoundError
+from .models import ApiKey
 
 _PUNCTUATION_REGEX = re.compile(
     pattern="[" + re.escape(string.punctuation.replace("_", "")) + "]"

services/web/server/src/simcore_service_webserver/api_keys/_models.py renamed to services/web/server/src/simcore_service_webserver/api_keys/models.py

@@ -20,12 +20,8 @@
 from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict
 from servicelib.aiohttp import status
 from servicelib.aiohttp.application_keys import APP_SETTINGS_KEY
-from simcore_service_webserver.api_keys import _repository as repo
-from simcore_service_webserver.api_keys._models import ApiKey
-from simcore_service_webserver.api_keys._service import (
-    get_or_create_api_key,
-    prune_expired_api_keys,
-)
+from simcore_service_webserver.api_keys import _repository, _service, api_keys_service
+from simcore_service_webserver.api_keys.models import ApiKey
 from simcore_service_webserver.application_settings import GarbageCollectorSettings
 from simcore_service_webserver.db.models import UserRole
 from tenacity import (
@@ -45,7 +41,7 @@ async def fake_user_api_keys(
 ) -> AsyncIterable[list[int]]:
     assert client.app
     api_keys: list[ApiKey] = [
-        await repo.create_api_key(
+        await _repository.create_api_key(
             client.app,
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -60,7 +56,7 @@ async def fake_user_api_keys(
     yield api_keys
 
     for api_key in api_keys:
-        await repo.delete_api_key(
+        await _repository.delete_api_key(
             client.app,
             api_key_id=api_key.id,
             user_id=logged_user["id"],
@@ -183,7 +179,7 @@ async def test_create_api_key_with_expiration(
             reraise=True,
         ):
             with attempt:
-                deleted = await prune_expired_api_keys(client.app)
+                deleted = await api_keys_service.prune_expired_api_keys(client.app)
                 assert deleted == ["foo"]
 
         resp = await client.get("/v0/auth/api-keys")
@@ -207,13 +203,15 @@ async def test_get_or_create_api_key(
         }
 
         # create once
-        created = await get_or_create_api_key(client.app, **options)
+        created = await _service.get_or_create_api_key(client.app, **options)
         assert created.display_name == "foo"
         assert created.api_key != created.api_secret
 
         # idempotent
         for _ in range(3):
-            assert await get_or_create_api_key(client.app, **options) == created
+            assert (
+                await _service.get_or_create_api_key(client.app, **options) == created
+            )
 
 
 @pytest.mark.parametrize(

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

@@ -23,8 +23,8 @@
 from settings_library.rabbit import RabbitSettings
 from simcore_postgres_database.models.users import UserRole
 from simcore_service_webserver.api_keys import _repository as repo
-from simcore_service_webserver.api_keys._models import ApiKey
 from simcore_service_webserver.api_keys.errors import ApiKeyNotFoundError
+from simcore_service_webserver.api_keys.models import ApiKey
 from simcore_service_webserver.application_settings import ApplicationSettings
 
 pytest_simcore_core_services_selection = [