Merge branch 'master' into fix-invitation-url

Author: giancarloromeo

packages/service-library/requirements/_base.in

@@ -30,3 +30,4 @@ repro-zipfile
 tenacity
 toolz
 tqdm
+yarl

packages/service-library/requirements/_base.txt

@@ -274,6 +274,7 @@ wrapt==1.16.0
     #   opentelemetry-instrumentation-redis
 yarl==1.12.1
     # via
+    #   -r requirements/_base.in
     #   aio-pika
     #   aiohttp
     #   aiormq

packages/service-library/src/servicelib/aiohttp/tracing.py

@@ -20,6 +20,7 @@
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from servicelib.logging_utils import log_context
 from settings_library.tracing import TracingSettings
+from yarl import URL
 
 _logger = logging.getLogger(__name__)
 try:
@@ -54,7 +55,7 @@ def setup_tracing(
     """
     _ = app
     opentelemetry_collector_endpoint = (
-        tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT
+        f"{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}"
     )
     opentelemetry_collector_port = tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_PORT
     if not opentelemetry_collector_endpoint and not opentelemetry_collector_port:
@@ -72,9 +73,8 @@ def setup_tracing(
     resource = Resource(attributes={"service.name": service_name})
     trace.set_tracer_provider(TracerProvider(resource=resource))
     tracer_provider: trace.TracerProvider = trace.get_tracer_provider()
-    tracing_destination: str = (
-        f"{opentelemetry_collector_endpoint}:{opentelemetry_collector_port}/v1/traces"
-    )
+
+    tracing_destination: str = f"{URL(opentelemetry_collector_endpoint).with_port(opentelemetry_collector_port).with_path('/v1/traces')}"
 
     _logger.info(
         "Trying to connect service %s to tracing collector at %s.",

packages/service-library/src/servicelib/fastapi/tracing.py

@@ -17,6 +17,7 @@
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from servicelib.logging_utils import log_context
 from settings_library.tracing import TracingSettings
+from yarl import URL
 
 _logger = logging.getLogger(__name__)
 
@@ -75,7 +76,13 @@ def setup_tracing(
     trace.set_tracer_provider(TracerProvider(resource=resource))
     global_tracer_provider = trace.get_tracer_provider()
     assert isinstance(global_tracer_provider, TracerProvider)  # nosec
-    tracing_destination: str = f"{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_PORT}/v1/traces"
+
+    opentelemetry_collector_endpoint: str = (
+        f"{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}"
+    )
+
+    tracing_destination: str = f"{URL(opentelemetry_collector_endpoint).with_port(tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_PORT).with_path('/v1/traces')}"
+
     _logger.info(
         "Trying to connect service %s to opentelemetry tracing collector at %s.",
         service_name,

packages/settings-library/src/settings_library/docker_registry.py

@@ -1,7 +1,14 @@
 from functools import cached_property
-from typing import Any
+from typing import Any, Self
 
-from pydantic import Field, SecretStr, field_validator
+from pydantic import (
+    AnyHttpUrl,
+    Field,
+    SecretStr,
+    TypeAdapter,
+    field_validator,
+    model_validator,
+)
 from pydantic_settings import SettingsConfigDict
 
 from .base import BaseCustomSettings
@@ -12,31 +19,49 @@ class RegistrySettings(BaseCustomSettings):
     REGISTRY_PATH: str | None = Field(
         default=None,
         # This is useful in case of a local registry, where the registry url (path) is relative to the host docker engine"
-        description="development mode only, in case a local registry is used",
+        description="development mode only, in case a local registry is used - "
+        "this is the hostname to the docker registry as seen from the host running the containers (e.g. 127.0.0.1:5000)",
     )
     # NOTE: name is missleading, http or https protocol are not included
-    REGISTRY_URL: str = Field(default="", description="address to the docker registry")
+    REGISTRY_URL: str = Field(
+        ...,
+        description="hostname of docker registry (without protocol but with port if available)",
+        min_length=1,
+    )
 
     REGISTRY_USER: str = Field(
         ..., description="username to access the docker registry"
     )
     REGISTRY_PW: SecretStr = Field(
         ..., description="password to access the docker registry"
     )
-    REGISTRY_SSL: bool = Field(..., description="access to registry through ssl")
+    REGISTRY_SSL: bool = Field(
+        ..., description="True if docker registry is using HTTPS protocol"
+    )
 
     @field_validator("REGISTRY_PATH", mode="before")
     @classmethod
     def _escape_none_string(cls, v) -> Any | None:
         return None if v == "None" else v
 
+    @model_validator(mode="after")
+    def check_registry_authentication(self: Self) -> Self:
+        if self.REGISTRY_AUTH and any(
+            not v for v in (self.REGISTRY_USER, self.REGISTRY_PW)
+        ):
+            msg = "If REGISTRY_AUTH is True, both REGISTRY_USER and REGISTRY_PW must be provided"
+            raise ValueError(msg)
+        return self
+
     @cached_property
     def resolved_registry_url(self) -> str:
         return self.REGISTRY_PATH or self.REGISTRY_URL
 
     @cached_property
-    def api_url(self) -> str:
-        return f"{self.REGISTRY_URL}/v2"
+    def api_url(self) -> AnyHttpUrl:
+        return TypeAdapter(AnyHttpUrl).validate_python(
+            f"http{'s' if self.REGISTRY_SSL else ''}://{self.REGISTRY_URL}/v2"
+        )
 
     model_config = SettingsConfigDict(
         json_schema_extra={

packages/settings-library/tests/test_docker_registry.py

@@ -11,6 +11,7 @@
     "REGISTRY_USER": "usr",
     "REGISTRY_PW": "pwd",
     "REGISTRY_SSL": "False",
+    "REGISTRY_URL": "pytest.registry.com",
 }
 
 

services/director-v2/tests/conftest.py

@@ -186,6 +186,7 @@ def mock_env(
             "REGISTRY_PW": "test",
             "REGISTRY_SSL": "false",
             "REGISTRY_USER": "test",
+            "REGISTRY_URL": faker.url(),
             "SC_BOOT_MODE": "production",
             "SIMCORE_SERVICES_NETWORK_NAME": "test_network_name",
             "SWARM_STACK_NAME": "pytest-simcore",

services/director/requirements/_base.in

@@ -15,6 +15,7 @@
 aiocache
 aiodocker
 fastapi[all]
-httpx
+httpx[http2]
 prometheus-client
 pydantic
+tenacity

services/director/requirements/_base.txt

@@ -114,6 +114,10 @@ h11==0.14.0
     # via
     #   httpcore
     #   uvicorn
+h2==4.1.0
+    # via httpx
+hpack==4.0.0
+    # via h2
 httpcore==1.0.6
     # via httpx
 httptools==0.6.4
@@ -135,6 +139,8 @@ httpx==0.27.2
     #   -r requirements/../../../packages/service-library/requirements/_fastapi.in
     #   -r requirements/_base.in
     #   fastapi
+hyperframe==6.0.1
+    # via h2
 idna==3.10
     # via
     #   anyio
@@ -422,7 +428,9 @@ starlette==0.41.3
     #   -c requirements/../../../requirements/constraints.txt
     #   fastapi
 tenacity==9.0.0
-    # via -r requirements/../../../packages/service-library/requirements/_base.in
+    # via
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/_base.in
 toolz==1.0.0
     # via -r requirements/../../../packages/service-library/requirements/_base.in
 tqdm==4.67.0

services/director/requirements/_test.in

@@ -16,6 +16,7 @@ faker
 jsonref
 pytest
 pytest-asyncio
+pytest-benchmark
 pytest-cov
 pytest-docker
 pytest-instafail