✨ Refactor: Rename postgres lifespan manager for consistency across the codebase

Author: pcrespov

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

@@ -12,15 +12,15 @@
 _logger = logging.getLogger(__name__)
 
 
-postgres_lifespan = LifespanManager()
+postgres_lifespan_manager = LifespanManager()
 
 
 class PostgresLifespanStateKeys(str, Enum):
     POSTGRES_SETTINGS = "postgres_settings"
     POSTGRES_ASYNC_ENGINE = "postgres.async_engine"
 
 
-@postgres_lifespan.add
+@postgres_lifespan_manager.add
 async def setup_postgres_database(_, state: State) -> AsyncIterator[State]:
 
     with log_context(_logger, logging.INFO, f"{__name__}"):

packages/service-library/tests/fastapi/test_lifespan_utils.py

@@ -53,7 +53,7 @@ async def cache_lifespan(app: FastAPI) -> AsyncIterator[State]:
 
 
 @pytest.fixture
-def postgres_lifespan() -> LifespanManager:
+def postgres_lifespan_mng() -> LifespanManager:
     lifespan_manager = LifespanManager()
 
     @lifespan_manager.add
@@ -91,12 +91,12 @@ async def _setup_rabbitmq(app: FastAPI) -> AsyncIterator[State]:
 
 
 async def test_app_lifespan_composition(
-    postgres_lifespan: LifespanManager, rabbitmq_lifespan: LifespanManager
+    postgres_lifespan_mng: LifespanManager, rabbitmq_lifespan: LifespanManager
 ):
     # The app has its own database and rpc-server to initialize
     # this is how you connect the lifespans pre-defined in servicelib
 
-    @postgres_lifespan.add
+    @postgres_lifespan_mng.add
     async def setup_database(app: FastAPI, state: State) -> AsyncIterator[State]:
 
         with log_context(logging.INFO, "app database"):
@@ -126,7 +126,7 @@ async def setup_rpc_server(app: FastAPI, state: State) -> AsyncIterator[State]:
 
     # Composes lifepans
     app_lifespan = LifespanManager()
-    app_lifespan.include(postgres_lifespan)
+    app_lifespan.include(postgres_lifespan_mng)
     app_lifespan.include(rabbitmq_lifespan)
 
     app = FastAPI(lifespan=app_lifespan)

packages/service-library/tests/fastapi/test_postgres_lifespan.py

@@ -18,7 +18,7 @@
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.fastapi.postgres_lifespan import (
     PostgresLifespanStateKeys,
-    postgres_lifespan,
+    postgres_lifespan_manager,
 )
 from settings_library.application import BaseApplicationSettings
 from settings_library.postgres import PostgresSettings
@@ -69,8 +69,8 @@ async def my_database_setup(app: FastAPI, state: State) -> AsyncIterator[State]:
     app_lifespan = LifespanManager()
     app_lifespan.add(my_app_settings)
 
-    postgres_lifespan.add(my_database_setup)
-    app_lifespan.include(postgres_lifespan)
+    postgres_lifespan_manager.add(my_database_setup)
+    app_lifespan.include(postgres_lifespan_manager)
 
     return app_lifespan
 

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

@@ -5,7 +5,7 @@
 from fastapi_lifespan_manager import LifespanManager, State
 from servicelib.fastapi.postgres_lifespan import (
     PostgresLifespanStateKeys,
-    postgres_lifespan,
+    postgres_lifespan_manager,
 )
 from servicelib.fastapi.prometheus_instrumentation import (
     lifespan_prometheus_instrumentation,
@@ -66,8 +66,8 @@ def create_app_lifespan():
     # WARNING: order matters
 
     # - postgres lifespan
-    postgres_lifespan.add(setup_database)
-    app_lifespan.include(postgres_lifespan)
+    postgres_lifespan_manager.add(setup_database)
+    app_lifespan.include(postgres_lifespan_manager)
 
     # - rabbitmq lifespan
     app_lifespan.add(setup_rabbitmq)