feat: allow lifespan overrides via kwargs

Author: alukach

src/stac_auth_proxy/__init__.py

@@ -8,11 +8,13 @@
 
 from .app import configure_app, create_app
 from .config import Settings
-from .lifespan import lifespan
+from .lifespan import check_conformance, check_server_health, lifespan
 
 __all__ = [
     "create_app",
     "configure_app",
     "lifespan",
+    "check_conformance",
+    "check_server_health",
     "Settings",
 ]

src/stac_auth_proxy/app.py

@@ -141,7 +141,7 @@ def create_app(settings: Optional[Settings] = None) -> FastAPI:
 
     app = FastAPI(
         openapi_url=None,  # Disable OpenAPI schema endpoint, we want to serve upstream's schema
-        lifespan=lifespan(settings),
+        lifespan=lifespan(settings=settings),
         root_path=settings.root_path,
     )
     if app.root_path:

src/stac_auth_proxy/lifespan.py

@@ -2,6 +2,8 @@
 
 from contextlib import asynccontextmanager
 import logging
+from typing import Any
+
 from fastapi import FastAPI
 
 from .config import Settings
@@ -10,22 +12,26 @@
 logger = logging.getLogger(__name__)
 
 
-def lifespan(settings: Settings | None = None):
+def lifespan(settings: Settings | None = None, **settings_kwargs: Any):
     """Create a lifespan handler that runs startup checks.
 
     Parameters
     ----------
-    settings : Settings | None
-        Configuration for health and conformance checks. If omitted, default
-        settings are loaded.
+    settings : Settings | None, optional
+        Pre-built settings instance. If omitted, a new one is constructed from
+        ``settings_kwargs``.
+    **settings_kwargs : Any
+        Keyword arguments used to configure the health and conformance checks if
+        ``settings`` is not provided.
 
     Returns
     -------
     Callable[[FastAPI], AsyncContextManager[Any]]
         A callable suitable for the ``lifespan`` parameter of ``FastAPI``.
     """
 
-    settings = settings or Settings()
+    if settings is None:
+        settings = Settings(**settings_kwargs)
 
     @asynccontextmanager
     async def _lifespan(app: FastAPI):
@@ -54,5 +60,5 @@ async def _lifespan(app: FastAPI):
     return _lifespan
 
 
-__all__ = ["lifespan"]
+__all__ = ["lifespan", "check_conformance", "check_server_health"]
 

tests/test_lifespan.py

@@ -9,8 +9,11 @@
 from starlette.middleware import Middleware
 from starlette.types import ASGIApp
 
-from stac_auth_proxy import Settings, lifespan as lifespan_handler
-from stac_auth_proxy.utils.lifespan import check_conformance, check_server_health
+from stac_auth_proxy import (
+    check_conformance,
+    check_server_health,
+    lifespan as lifespan_handler,
+)
 from stac_auth_proxy.utils.middleware import required_conformance
 
 
@@ -87,21 +90,25 @@ def __init__(self, app):
 
 def test_lifespan_reusable():
     """Ensure the public lifespan handler runs health and conformance checks."""
-    settings = Settings(
-        upstream_url="https://example.com",
-        oidc_discovery_url="https://example.com/.well-known/openid-configuration",
-    )
+    upstream_url = "https://example.com"
+    oidc_discovery_url = "https://example.com/.well-known/openid-configuration"
     with patch(
         "stac_auth_proxy.lifespan.check_server_health",
         new=AsyncMock(),
     ) as mock_health, patch(
         "stac_auth_proxy.lifespan.check_conformance",
         new=AsyncMock(),
     ) as mock_conf:
-        app = FastAPI(lifespan=lifespan_handler(settings))
+        app = FastAPI(
+            lifespan=lifespan_handler(
+                upstream_url=upstream_url,
+                oidc_discovery_url=oidc_discovery_url,
+            )
+        )
         with TestClient(app):
             pass
         assert mock_health.await_count == 2
+        expected_upstream = upstream_url.rstrip("/") + "/"
         mock_conf.assert_awaited_once_with(
-            app.user_middleware, str(settings.upstream_url)
+            app.user_middleware, expected_upstream
         )