made names better

Author: Andrei Neagu

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

@@ -21,7 +21,7 @@
 _DOCKER_API_PROXY_SETTINGS: Final[str] = "docker_api_proxy_settings"
 
 
-def get_remote_docker_client_main_lifespan(settings: DockerApiProxysettings) -> State:
+def create_remote_docker_client_input_state(settings: DockerApiProxysettings) -> State:
     return {_DOCKER_API_PROXY_SETTINGS: settings}
 
 

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

@@ -23,7 +23,7 @@ class PostgresConfigurationError(LifespanOnStartupError):
     msg_template = "Invalid postgres settings [={settings}] on startup. Note that postgres cannot be disabled using settings"
 
 
-def get_postgres_database_main_lifespan(settings: PostgresSettings) -> State:
+def create_postgres_database_input_state(settings: PostgresSettings) -> State:
     return {PostgresLifespanState.POSTGRES_SETTINGS: settings}
 
 

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

@@ -57,7 +57,7 @@ def _on_shutdown() -> None:
 _PROMETHEUS_INSTRUMENTATION_ENABLED: Final[str] = "prometheus_instrumentation_enabled"
 
 
-def get_prometheus_instrumentationmain_main_lifespan(*, enabled: bool) -> State:
+def create_prometheus_instrumentationmain_input_state(*, enabled: bool) -> State:
     return {_PROMETHEUS_INSTRUMENTATION_ENABLED: enabled}
 
 

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

@@ -4,11 +4,11 @@
 from fastapi import FastAPI
 from fastapi_lifespan_manager import LifespanManager, State
 from servicelib.fastapi.postgres_lifespan import (
-    get_postgres_database_main_lifespan,
+    create_postgres_database_input_state,
     postgres_database_lifespan,
 )
 from servicelib.fastapi.prometheus_instrumentation import (
-    get_prometheus_instrumentationmain_main_lifespan,
+    create_prometheus_instrumentationmain_input_state,
     prometheus_instrumentation_lifespan,
 )
 
@@ -40,12 +40,12 @@ async def _banners_lifespan(_) -> AsyncIterator[State]:
     _flush_finished_banner()
 
 
-async def _main_lifespan(app: FastAPI) -> AsyncIterator[State]:
+async def _settings_lifespan(app: FastAPI) -> AsyncIterator[State]:
     settings: ApplicationSettings = app.state.settings
 
     yield {
-        **get_postgres_database_main_lifespan(settings.CATALOG_POSTGRES),
-        **get_prometheus_instrumentationmain_main_lifespan(
+        **create_postgres_database_input_state(settings.CATALOG_POSTGRES),
+        **create_prometheus_instrumentationmain_input_state(
             enabled=settings.CATALOG_PROMETHEUS_INSTRUMENTATION_ENABLED
         ),
     }
@@ -54,7 +54,7 @@ async def _main_lifespan(app: FastAPI) -> AsyncIterator[State]:
 def create_app_lifespan() -> LifespanManager:
     # WARNING: order matters
     app_lifespan = LifespanManager()
-    app_lifespan.add(_main_lifespan)
+    app_lifespan.add(_settings_lifespan)
 
     # - postgres
     app_lifespan.add(postgres_database_lifespan)

services/docker-api-proxy/tests/integration/conftest.py

@@ -12,8 +12,8 @@
 from pydantic import Field
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from servicelib.fastapi.docker import (
+    create_remote_docker_client_input_state,
     get_remote_docker_client,
-    get_remote_docker_client_main_lifespan,
     remote_docker_client_lifespan,
 )
 from settings_library.application import BaseApplicationSettings
@@ -40,19 +40,19 @@ class ApplicationSetting(BaseApplicationSettings):
     ]
 
 
-async def _main_lifespan(app: FastAPI) -> AsyncIterator[State]:
+async def _settings_lifespan(app: FastAPI) -> AsyncIterator[State]:
     settings: ApplicationSetting = app.state.settings
 
     yield {
-        **get_remote_docker_client_main_lifespan(settings.DOCKER_API_PROXY),
+        **create_remote_docker_client_input_state(settings.DOCKER_API_PROXY),
     }
 
 
 def _get_test_app() -> FastAPI:
     settings = ApplicationSetting.create_from_envs()
 
     lifespan_manager = LifespanManager()
-    lifespan_manager.add(_main_lifespan)
+    lifespan_manager.add(_settings_lifespan)
     lifespan_manager.add(remote_docker_client_lifespan)
 
     app = FastAPI(lifespan=lifespan_manager)

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/events.py

@@ -3,11 +3,11 @@
 from fastapi import FastAPI
 from fastapi_lifespan_manager import LifespanManager, State
 from servicelib.fastapi.docker import (
-    get_remote_docker_client_main_lifespan,
+    create_remote_docker_client_input_state,
     remote_docker_client_lifespan,
 )
 from servicelib.fastapi.prometheus_instrumentation import (
-    get_prometheus_instrumentationmain_main_lifespan,
+    create_prometheus_instrumentationmain_input_state,
     prometheus_instrumentation_lifespan,
 )
 
@@ -32,22 +32,22 @@ async def _banner_lifespan(app: FastAPI) -> AsyncIterator[State]:
     print(APP_FINISHED_BANNER_MSG, flush=True)  # noqa: T201
 
 
-async def _main_lifespan(app: FastAPI) -> AsyncIterator[State]:
+async def _settings_lifespan(app: FastAPI) -> AsyncIterator[State]:
     settings: ApplicationSettings = app.state.settings
 
     yield {
-        **get_prometheus_instrumentationmain_main_lifespan(
+        **create_prometheus_instrumentationmain_input_state(
             enabled=settings.DYNAMIC_SCHEDULER_PROMETHEUS_INSTRUMENTATION_ENABLED
         ),
-        **get_remote_docker_client_main_lifespan(
+        **create_remote_docker_client_input_state(
             settings.DYNAMIC_SCHEDULER_DOCKER_API_PROXY
         ),
     }
 
 
 def create_app_lifespan() -> LifespanManager:
     app_lifespan = LifespanManager()
-    app_lifespan.add(_main_lifespan)
+    app_lifespan.add(_settings_lifespan)
 
     app_lifespan.add(director_v2_lifespan)
     app_lifespan.add(director_v0_lifespan)