✨ feat(tests): Update service name and refactor hostname generation for wb-auth service

Author: pcrespov

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

@@ -9,6 +9,7 @@
 from typing import Any
 
 import pytest
+from faker import Faker
 
 from .helpers.monkeypatch_envs import load_dotenv, setenvs_from_dict
 from .helpers.typing_env import EnvVarsDict
@@ -112,7 +113,7 @@ def service_name(project_slug_dir: Path) -> str:
 
 
 @pytest.fixture(scope="session")
-def services_docker_compose_dict(services_docker_compose_file: Path) -> EnvVarsDict:
+def docker_compose_services_dict(services_docker_compose_file: Path) -> EnvVarsDict:
     # NOTE: By keeping import here, this library is ONLY required when the fixture is used
     import yaml
 
@@ -121,9 +122,28 @@ def services_docker_compose_dict(services_docker_compose_file: Path) -> EnvVarsD
     return content
 
 
+@pytest.fixture
+def docker_compose_service_hostname(
+    faker: Faker, service_name: str, docker_compose_services_dict: dict[str, Any]
+) -> str:
+    """Evaluates `hostname` from docker-compose service"""
+    hostname_template = docker_compose_services_dict["services"][service_name][
+        "hostname"
+    ]
+
+    # Generate fake values to replace Docker Swarm template variables
+    node_hostname = faker.hostname(levels=1)
+    task_slot = faker.random_int(min=0, max=10)
+
+    # Replace the Docker Swarm template variables with faker values
+    return hostname_template.replace("{{.Node.Hostname}}", node_hostname).replace(
+        "{{.Task.Slot}}", str(task_slot)
+    )
+
+
 @pytest.fixture
 def docker_compose_service_environment_dict(
-    services_docker_compose_dict: dict[str, Any],
+    docker_compose_services_dict: dict[str, Any],
     env_devel_dict: EnvVarsDict,
     service_name: str,
     env_devel_file: Path,
@@ -133,7 +153,7 @@ def docker_compose_service_environment_dict(
     - env_devel_dict in environment_configs plugin
     - service_name needs to be defined
     """
-    service = services_docker_compose_dict["services"][service_name]
+    service = docker_compose_services_dict["services"][service_name]
 
     def _substitute(key, value) -> tuple[str, str]:
         if m := re.match(r"\${([^{}:-]\w+)", f"{value}"):

services/docker-compose.yml

@@ -1110,6 +1110,14 @@ services:
       WEBSERVER_APP_FACTORY_NAME: WEBSERVER_AUTHZ_APP_FACTORY
       WEBSERVER_LOGLEVEL: ${WB_AUTH_LOGLEVEL}
 
+      # WEBSERVER_DB
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
+      POSTGRES_HOST: ${POSTGRES_HOST}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PORT: ${POSTGRES_PORT}
+      POSTGRES_USER: ${POSTGRES_USER}
+
       # WEBSERVER_REST
       REST_SWAGGER_API_DOC_ENABLED: 0
 

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

@@ -25,16 +25,14 @@
 
 @pytest.fixture
 def service_name() -> str:
-    return "wb-authz"
+    return "wb-auth"
 
 
 @pytest.fixture
 def app_environment_for_wb_authz_service_dict(
     docker_compose_service_environment_dict: EnvVarsDict,
-    service_name: str,
-    faker: Faker,
+    docker_compose_service_hostname: str,
 ) -> EnvVarsDict:
-    hostname, task_slot = faker.hostname(levels=0), faker.random_int(min=0, max=10)
 
     assert (
         docker_compose_service_environment_dict["WEBSERVER_APP_FACTORY_NAME"]
@@ -43,7 +41,7 @@ def app_environment_for_wb_authz_service_dict(
 
     return {
         **docker_compose_service_environment_dict,
-        "HOSTNAME": f"auth-{hostname}-{task_slot}",  # TODO: load from docker-compose
+        "HOSTNAME": docker_compose_service_hostname,
         # TODO: add everything coming from Dockerfile?
     }
 
@@ -70,6 +68,9 @@ def app_environment_for_wb_authz_service(
     )
 
     assert service_name == settings.WEBSERVER_HOST
+    assert settings.WEBSERVER_DB is not None
+    assert settings.WEBSERVER_SESSION is not None
+    assert settings.WEBSERVER_SECURITY is not None
 
     return mocked_envs