Skip to content

Commit 91390d4

Browse files
fix test
1 parent f7cfe72 commit 91390d4

File tree

4 files changed

+23
-6
lines changed

4 files changed

+23
-6
lines changed
Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
1-
from pydantic import BaseModel
1+
from typing import Annotated
2+
3+
from pydantic import BaseModel, ConfigDict, Field
24

35

46
class ApiKeyGet(BaseModel):
7+
display_name: Annotated[str, Field(..., min_length=3)]
58
api_key: str
69
api_secret: str
10+
11+
model_config = ConfigDict(
12+
from_attributes=True,
13+
json_schema_extra={
14+
"examples": [
15+
{
16+
"display_name": "test-api-forever",
17+
"api_key": "key",
18+
"api_secret": "secret",
19+
},
20+
]
21+
},
22+
)

services/director-v2/src/simcore_service_director_v2/modules/osparc_variables/_api_auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
from aiocache import cached # type: ignore[import-untyped]
66
from fastapi import FastAPI
7-
from models_library.api_schemas_webserver.auth import ApiKeyGet
87
from models_library.products import ProductName
8+
from models_library.rpc_auth_api_keys import ApiKeyGet
99
from models_library.users import UserID
1010

1111
from ._api_auth_rpc import get_or_create_api_key_and_secret

services/director-v2/tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
from asgi_lifespan import LifespanManager
2121
from faker import Faker
2222
from fastapi import FastAPI
23-
from models_library.api_schemas_webserver.auth import ApiKeyGet
2423
from models_library.products import ProductName
2524
from models_library.projects import Node, NodesDict
25+
from models_library.rpc_auth_api_keys import ApiKeyGet
2626
from models_library.users import UserID
2727
from pytest_mock import MockerFixture
2828
from pytest_simcore.helpers.monkeypatch_envs import (
@@ -347,15 +347,15 @@ async def _create(
347347
*,
348348
product_name: ProductName,
349349
user_id: UserID,
350-
name: str,
350+
display_name: str,
351351
expiration: timedelta,
352352
):
353353
assert app
354354
assert product_name
355355
assert user_id
356356
assert expiration is None
357357

358-
fake_data.display_name = name
358+
fake_data.display_name = display_name
359359
return fake_data
360360

361361
# mocks RPC interface

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
from aiohttp import web
44
from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
5-
from models_library.api_schemas_webserver.auth import ApiKeyCreateRequest, ApiKeyGet
5+
from models_library.api_schemas_webserver.auth import ApiKeyCreateRequest
66
from models_library.products import ProductName
7+
from models_library.rpc_auth_api_keys import ApiKeyGet
78
from models_library.users import UserID
89
from servicelib.rabbitmq import RPCRouter
910
from simcore_service_webserver.api_keys import _service

0 commit comments

Comments
 (0)