✨ Add Redis settings to application configuration and Docker Compose

Author: pcrespov

services/catalog/src/simcore_service_catalog/cli.py

@@ -5,6 +5,7 @@
 from settings_library.http_client_request import ClientRequestSettings
 from settings_library.postgres import PostgresSettings
 from settings_library.rabbit import RabbitSettings
+from settings_library.redis import RedisSettings
 from settings_library.utils_cli import (
     create_settings_command,
     create_version_callback,
@@ -80,6 +81,16 @@ def echo_dotenv(ctx: typer.Context, *, minimal: bool = True) -> None:
                 ),
             ),
         ),
+        CATALOG_REDIS=os.environ.get(
+            "CATALOG_REDIS",
+            RedisSettings.create_from_envs(
+                REDIS_HOST=os.environ.get("REDIS_HOST", "replace-with-redis-host"),
+                REDIS_PORT=os.environ.get("REDIS_PORT", "6379"),
+                REDIS_PASSWORD=os.environ.get(
+                    "REDIS_PASSWORD", "replace-with-redis-password"
+                ),
+            ),
+        ),
         CATALOG_DIRECTOR=DirectorSettings.create_from_envs(
             DIRECTOR_HOST=os.environ.get("DIRECTOR_HOST", "fake-director")
         ),

services/catalog/src/simcore_service_catalog/core/settings.py

@@ -22,6 +22,7 @@
 from settings_library.http_client_request import ClientRequestSettings
 from settings_library.postgres import PostgresSettings
 from settings_library.rabbit import RabbitSettings
+from settings_library.redis import RedisSettings
 from settings_library.tracing import TracingSettings
 from settings_library.utils_logging import MixinLoggingSettings
 
@@ -96,6 +97,10 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
         RabbitSettings, Field(json_schema_extra={"auto_default_from_env": True})
     ]
 
+    CATALOG_REDIS: Annotated[
+        RedisSettings, Field(json_schema_extra={"auto_default_from_env": True})
+    ]
+
     CATALOG_CLIENT_REQUEST: Annotated[
         ClientRequestSettings | None,
         Field(json_schema_extra={"auto_default_from_env": True}),

services/catalog/tests/unit/test_core_settings.py

@@ -20,3 +20,6 @@ def test_valid_web_application_settings(app_environment: EnvVarsDict):
     assert settings
 
     assert settings == ApplicationSettings.create_from_envs()
+
+    assert app_environment["REDIS_HOST"] == settings.CATALOG_REDIS.REDIS_HOST
+    assert app_environment["POSTGRES_HOST"] == settings.CATALOG_POSTGRES.POSTGRES_HOST

services/docker-compose.yml

@@ -150,18 +150,20 @@ services:
     init: true
     hostname: "cat-{{.Node.Hostname}}-{{.Task.Slot}}"
     environment:
+
       CATALOG_BACKGROUND_TASK_REST_TIME: ${CATALOG_BACKGROUND_TASK_REST_TIME}
       CATALOG_DEV_FEATURES_ENABLED: ${CATALOG_DEV_FEATURES_ENABLED}
       CATALOG_LOGLEVEL: ${CATALOG_LOGLEVEL}
       CATALOG_PROFILING: ${CATALOG_PROFILING}
       CATALOG_SERVICES_DEFAULT_RESOURCES: ${CATALOG_SERVICES_DEFAULT_RESOURCES}
       CATALOG_SERVICES_DEFAULT_SPECIFICATIONS: ${CATALOG_SERVICES_DEFAULT_SPECIFICATIONS}
+      CATALOG_TRACING: ${CATALOG_TRACING}
       DIRECTOR_DEFAULT_MAX_MEMORY: ${DIRECTOR_DEFAULT_MAX_MEMORY}
       DIRECTOR_DEFAULT_MAX_NANO_CPUS: ${DIRECTOR_DEFAULT_MAX_NANO_CPUS}
       DIRECTOR_HOST: ${DIRECTOR_HOST:-director}
       DIRECTOR_PORT: ${DIRECTOR_PORT:-8080}
-      LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
+      LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_HOST: ${POSTGRES_HOST}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
@@ -172,7 +174,11 @@ services:
       RABBIT_PORT: ${RABBIT_PORT}
       RABBIT_SECURE: ${RABBIT_SECURE}
       RABBIT_USER: ${RABBIT_USER}
-      CATALOG_TRACING: ${CATALOG_TRACING}
+      REDIS_HOST: ${REDIS_HOST}
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+      REDIS_PORT: ${REDIS_PORT}
+      REDIS_SECURE: ${REDIS_SECURE}
+      REDIS_USER: ${REDIS_USER}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
     networks: