[DOP-21268] - split Settings to SyncmasterSettings, WorkerSettings(SyncmasterSettings), BackendSettings(SyncmasterSettings)

Author: maxim-lixakov

.env.docker

@@ -4,13 +4,10 @@ ENV=LOCAL
 # Debug
 SYNCMASTER__SERVER__DEBUG=true
 
-# Logging Backend
-SYNCMASTER__SERVER__LOGGING__SETUP=True
-SYNCMASTER__SERVER__LOGGING__PRESET=colored
-
-# Logging Worker
-SYNCMASTER__WORKER__LOGGING__SETUP=True
-SYNCMASTER__WORKER__LOGGING__PRESET=json
+# TODO: split to backend and worker loggins
+# Logging
+SYNCMASTER__LOGGING__SETUP=True
+SYNCMASTER__LOGGING__PRESET=colored
 
 # Encrypt / Decrypt credentials data
 SYNCMASTER__CRYPTO_KEY=UBgPTioFrtH2unlC4XFDiGf5sYfzbdSf_VgiUSaQc94=

.readthedocs.yaml

@@ -17,7 +17,7 @@ build:
       - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry install --no-root --all-extras --with docs --without dev,test
       - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry show -v
       - python -m pip list -v
-      - SYNCMASTER__DATABASE__URL=postgresql+psycopg://fake:[email protected]:5432/fake SYNCMASTER__BROKER__URL=amqp://fake:faket@fake:5672/ python -m syncmaster.backend.export_openapi_schema docs/_static/openapi.json
+      - SYNCMASTER__DATABASE__URL=postgresql+psycopg://fake:[email protected]:5432/fake SYNCMASTER__BROKER__URL=amqp://fake:faket@fake:5672/ SYNCMASTER__CRYPTO_KEY=crypto_key  python -m syncmaster.backend.export_openapi_schema docs/_static/openapi.json
 
 sphinx:
   configuration: docs/conf.py

docker-compose.test.yml

@@ -198,3 +198,4 @@ services:
 volumes:
   postgres_test_data:
   rabbitmq_test_data:
+  keycloak_data:

poetry.lock

@@ -110,6 +110,7 @@ worker = [
     "uuid6",
     "coloredlogs",
     "python-json-logger",
+    "python-keycloak",
 ]
 
 scheduler = [

pyproject.toml

@@ -17,9 +17,9 @@
 from syncmaster.backend.middlewares import apply_middlewares
 from syncmaster.backend.providers.auth import AuthProvider
 from syncmaster.backend.services.unit_of_work import UnitOfWork
+from syncmaster.backend.settings import BackendSettings as Settings
 from syncmaster.db.factory import create_session_factory, get_uow
 from syncmaster.exceptions import SyncmasterError
-from syncmaster.settings import Settings
 
 
 def application_factory(settings: Settings) -> FastAPI:

syncmaster/backend/__init__.py

@@ -2,14 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 import asyncio
 from datetime import datetime
-from typing import Annotated
 
 from asgi_correlation_id import correlation_id
 from fastapi import APIRouter, Depends, Query
 from jinja2 import Template
 from kombu.exceptions import KombuError
 
-from syncmaster.backend.dependencies import Stub
 from syncmaster.backend.services import UnitOfWork, get_user
 from syncmaster.db.models import RunType, Status, User
 from syncmaster.db.utils import Permission
@@ -23,8 +21,8 @@
     ReadRunSchema,
     RunPageSchema,
 )
-from syncmaster.settings import Settings
 from syncmaster.worker.config import celery
+from syncmaster.worker.settings import worker_settings
 
 router = APIRouter(tags=["Runs"], responses=get_error_responses())
 
@@ -83,7 +81,6 @@ async def read_run(
 @router.post("/runs")
 async def start_run(
     create_run_data: CreateRunSchema,
-    settings: Annotated[Settings, Depends(Stub(Settings))],
     unit_of_work: UnitOfWork = Depends(UnitOfWork),
     current_user: User = Depends(get_user(is_active=True)),
 ) -> ReadRunSchema:
@@ -120,7 +117,7 @@ async def start_run(
             type=RunType.MANUAL,
         )
 
-        log_url = Template(settings.worker.LOG_URL_TEMPLATE).render(
+        log_url = Template(worker_settings.LOG_URL_TEMPLATE).render(
             run=run,
             correlation_id=correlation_id.get(),
         )

syncmaster/backend/api/v1/runs.py

@@ -8,7 +8,7 @@
 from fastapi import FastAPI
 
 from syncmaster.backend import application_factory
-from syncmaster.settings import Settings
+from syncmaster.backend.settings import BackendSettings as Settings
 
 
 def get_openapi_schema(app: FastAPI) -> dict:

syncmaster/backend/export_openapi_schema.py

@@ -12,7 +12,7 @@
 from syncmaster.backend.middlewares.request_id import apply_request_id_middleware
 from syncmaster.backend.middlewares.session import apply_session_middleware
 from syncmaster.backend.middlewares.static_files import apply_static_files
-from syncmaster.settings import Settings
+from syncmaster.backend.settings import BackendSettings as Settings
 
 
 def apply_middlewares(
@@ -21,8 +21,8 @@ def apply_middlewares(
 ) -> FastAPI:
     """Add middlewares to the application."""
 
-    if settings.server.logging.setup:
-        setup_logging(settings.server.logging.get_log_config_path())
+    if settings.logging.setup:
+        setup_logging(settings.logging.get_log_config_path())
 
     apply_cors_middleware(application, settings.server.cors)
     apply_monitoring_metrics_middleware(application, settings.server.monitoring)

syncmaster/backend/middlewares/__init__.py

@@ -3,7 +3,7 @@
 from fastapi import FastAPI
 from starlette.middleware.cors import CORSMiddleware
 
-from syncmaster.settings.server import CORSSettings
+from syncmaster.backend.settings.server import CORSSettings
 
 
 def apply_cors_middleware(app: FastAPI, settings: CORSSettings) -> FastAPI: