check also datcore now

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/helpers/storage_utils.py

@@ -1,5 +1,4 @@
 import logging
-import os
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, TypedDict
@@ -14,14 +13,6 @@
 log = logging.getLogger(__name__)
 
 
-def has_datcore_tokens() -> bool:
-    api_key = os.environ.get("BF_API_KEY")
-    api_secret = os.environ.get("BF_API_SECRET")
-    if not api_key or not api_secret:
-        return False
-    return not (api_key == "none" or api_secret == "none")  # noqa: S105
-
-
 async def get_updated_project(
     sqlalchemy_async_engine: AsyncEngine, project_id: str
 ) -> dict[str, Any]:

packages/pytest-simcore/src/pytest_simcore/simcore_storage_datcore_adapter.py

@@ -1,15 +1,17 @@
 import re
+from collections.abc import Iterator
 
 import pytest
 import respx
+from faker import Faker
 from servicelib.aiohttp import status
 from simcore_service_storage.modules.datcore_adapter.datcore_adapter_settings import (
     DatcoreAdapterSettings,
 )
 
 
 @pytest.fixture
-def datcore_adapter_service_mock() -> respx.MockRouter:
+def datcore_adapter_service_mock(faker: Faker) -> Iterator[respx.MockRouter]:
     dat_core_settings = DatcoreAdapterSettings.create_from_envs()
     datcore_adapter_base_url = dat_core_settings.endpoint
     # mock base endpoint
@@ -22,11 +24,14 @@ def datcore_adapter_service_mock() -> respx.MockRouter:
             datcore_adapter_base_url,
             name="healthcheck",
         ).respond(status.HTTP_200_OK)
+        respx_mocker.get(
+            f"{datcore_adapter_base_url}/user/profile", name="get_user_profile"
+        ).respond(status.HTTP_200_OK, json=faker.pydict(allowed_types=(str,)))
         list_datasets_re = re.compile(rf"^{datcore_adapter_base_url}/datasets")
         respx_mocker.get(list_datasets_re, name="list_datasets").respond(
             status.HTTP_200_OK
         )
         respx_mocker.get(datcore_adapter_base_url, name="base_endpoint").respond(
             status.HTTP_200_OK, json={}
         )
-        return respx_mocker
+        yield respx_mocker

services/storage/tests/conftest.py

@@ -57,9 +57,11 @@
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.aiohttp import status
 from servicelib.utils import limited_gather
+from simcore_postgres_database.models.tokens import tokens
 from simcore_postgres_database.storage_models import file_meta_data, projects, users
 from simcore_service_storage.core.application import create_app
 from simcore_service_storage.core.settings import ApplicationSettings
+from simcore_service_storage.datcore_dsm import DatCoreDataManager
 from simcore_service_storage.dsm import get_dsm_provider
 from simcore_service_storage.models import FileMetaData, FileMetaDataAtDB, S3BucketName
 from simcore_service_storage.modules.long_running_tasks import (
@@ -242,9 +244,11 @@ def simcore_file_id(
 @pytest.fixture(
     params=[
         SimcoreS3DataManager.get_location_id(),
+        DatCoreDataManager.get_location_id(),
     ],
     ids=[
         SimcoreS3DataManager.get_location_name(),
+        DatCoreDataManager.get_location_name(),
     ],
 )
 def location_id(request: pytest.FixtureRequest) -> LocationID:
@@ -895,3 +899,34 @@ async def output_file(
         result = await conn.execute(
             file_meta_data.delete().where(file_meta_data.c.file_id == row.file_id)
         )
+
+
+@pytest.fixture
+async def fake_datcore_tokens(
+    user_id: UserID, sqlalchemy_async_engine: AsyncEngine, faker: Faker
+) -> AsyncIterator[tuple[str, str]]:
+    token_key = cast(str, faker.uuid4())
+    token_secret = cast(str, faker.uuid4())
+    created_token_ids = []
+    async with sqlalchemy_async_engine.begin() as conn:
+        result = await conn.execute(
+            tokens.insert()
+            .values(
+                user_id=user_id,
+                token_service="pytest",  # noqa: S106
+                token_data={
+                    "service": "pytest",
+                    "token_secret": token_secret,
+                    "token_key": token_key,
+                },
+            )
+            .returning(tokens.c.token_id)
+        )
+        row = result.one()
+        created_token_ids.append(row.token_id)
+    yield token_key, token_secret
+
+    async with sqlalchemy_async_engine.begin() as conn:
+        await conn.execute(
+            tokens.delete().where(tokens.c.token_id.in_(created_token_ids))
+        )

services/storage/tests/unit/test_handlers_locations.py

@@ -7,27 +7,53 @@
 
 import httpx
 from fastapi import FastAPI, status
+from models_library.api_schemas_storage.storage_schemas import FileLocation
 from models_library.users import UserID
 from pytest_simcore.helpers.fastapi import url_from_operation_id
-from pytest_simcore.helpers.storage_utils import has_datcore_tokens
+from pytest_simcore.helpers.httpx_assert_checks import assert_status
+from simcore_service_storage.datcore_dsm import DatCoreDataManager
+from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
 
 pytest_simcore_core_services_selection = ["postgres"]
 pytest_simcore_ops_services_selection = ["adminer"]
 
 
 async def test_locations(
-    initialized_app: FastAPI, client: httpx.AsyncClient, user_id: UserID
+    initialized_app: FastAPI,
+    client: httpx.AsyncClient,
+    user_id: UserID,
+    fake_datcore_tokens: tuple[str, str],
 ):
     url = url_from_operation_id(
         client, initialized_app, "list_storage_locations"
     ).with_query(user_id=user_id)
-    resp = await client.get(f"{url}")
-
-    payload = resp.json()
-    assert resp.status_code == status.HTTP_200_OK, str(payload)
-
-    data, error = tuple(payload.get(k) for k in ("data", "error"))
-
-    _locs = 2 if has_datcore_tokens() else 1
-    assert len(data) == _locs
-    assert not error
+    response = await client.get(f"{url}")
+    data, _ = assert_status(response, status.HTTP_200_OK, list[FileLocation])
+    assert data
+    assert len(data) == 2
+    assert data[0] == FileLocation(
+        id=SimcoreS3DataManager.get_location_id(),
+        name=SimcoreS3DataManager.get_location_name(),
+    )
+    assert data[1] == FileLocation(
+        id=DatCoreDataManager.get_location_id(),
+        name=DatCoreDataManager.get_location_name(),
+    )
+
+
+async def test_locations_without_tokens(
+    initialized_app: FastAPI,
+    client: httpx.AsyncClient,
+    user_id: UserID,
+):
+    url = url_from_operation_id(
+        client, initialized_app, "list_storage_locations"
+    ).with_query(user_id=user_id)
+    response = await client.get(f"{url}")
+    data, _ = assert_status(response, status.HTTP_200_OK, list[FileLocation])
+    assert data
+    assert len(data) == 1
+    assert data[0] == FileLocation(
+        id=SimcoreS3DataManager.get_location_id(),
+        name=SimcoreS3DataManager.get_location_name(),
+    )