Switch to in-memory user content storage

.github/workflows/deploy.yml

@@ -34,7 +34,6 @@ jobs:
         run: >
           sed -i
           -e 's/AWS_ACCOUNT_ID_PLACEHOLDER/${{ secrets.AWS_ACCOUNT_ID }}/g'
-          -e 's/AWS_DATABASE_URL_SECRET_NAME_PLACEHOLDER/${{ vars.AWS_DATABASE_URL_SECRET_NAME }}/g'
           -e 's/AWS_EXECUTION_ROLE_PLACEHOLDER/${{ vars.AWS_EXECUTION_ROLE }}/g'
           -e 's/AWS_REGION_PLACEHOLDER/${{ vars.AWS_REGION }}/g'
           task-definition.json

app/config.py

@@ -1,17 +1,5 @@
-from pathlib import Path
-from typing import Annotated
-
-from pydantic import (
-    AliasChoices,
-    Field,
-    PostgresDsn,
-    TypeAdapter,
-    field_validator,
-)
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
-from .util import normalize_postgres_dsn_for_atoti_jdbc
-
 
 class Config(BaseSettings):
     """Hold all the configuration properties of the app, not only the ones related to Atoti.
@@ -31,21 +19,3 @@ class Config(BaseSettings):
 
     # The $PORT environment variable is used by most PaaS to indicate the port the app server should bind to.
     port: int = 9090
-
-    user_content_storage: Annotated[
-        PostgresDsn | Path | None,
-        Field(
-            # $DATABASE_URL is used by some PaaS such to designate the URL of the app's primary database.
-            # For instance: https://devcenter.heroku.com/articles/heroku-postgresql#designating-a-primary-database.
-            validation_alias=AliasChoices("user_content_storage", "database_url")
-        ),
-    ] = Path("content")
-
-    @field_validator("user_content_storage")
-    @classmethod
-    def normalize_postgres_dsn(cls, value: object) -> object:
-        try:
-            postgres_dsn: PostgresDsn = TypeAdapter(PostgresDsn).validate_python(value)
-            return normalize_postgres_dsn_for_atoti_jdbc(postgres_dsn)
-        except ValueError:
-            return value

app/start_session.py

@@ -2,11 +2,9 @@
 from asyncio import to_thread
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
-from pathlib import Path
 
 import atoti as tt
 import httpx
-from atoti_jdbc import UserContentStorageConfig
 
 from .config import Config
 from .create_and_join_tables import create_and_join_tables
@@ -15,23 +13,6 @@
 from .opentelemetry import span
 
 
-def _get_session_config(config: Config, /) -> tt.SessionConfig:
-    user_content_storage: Path | UserContentStorageConfig | None = None
-
-    if config.user_content_storage is not None:
-        user_content_storage = (
-            config.user_content_storage
-            if isinstance(config.user_content_storage, Path)
-            else UserContentStorageConfig(url=str(config.user_content_storage))
-        )
-
-    return tt.SessionConfig(
-        logging=tt.LoggingConfig(destination=sys.stdout),
-        port=config.port,
-        user_content_storage=user_content_storage,
-    )
-
-
 @span
 def _create_data_model(session: tt.Session, /) -> None:
     create_and_join_tables(session)
@@ -45,7 +26,10 @@ async def start_session(
     http_client: httpx.AsyncClient,
 ) -> AsyncGenerator[tt.Session]:
     """Start the session, declare the data model and load the initial data."""
-    session_config = _get_session_config(config)
+    session_config = tt.SessionConfig(
+        logging=tt.LoggingConfig(destination=sys.stdout),
+        port=config.port,
+    )
     session = await to_thread(tt.Session.start, session_config)
     try:
         with tt.mapping_lookup(check=config.check_mapping_lookups):

app/util/__init__.py

@@ -1,8 +1,5 @@
 from .column import column as column
 from .fact_based_hierarchy import fact_based_hierarchy as fact_based_hierarchy
-from .normalize_postgres_dsn_for_atoti_jdbc import (
-    normalize_postgres_dsn_for_atoti_jdbc as normalize_postgres_dsn_for_atoti_jdbc,
-)
 from .read_json import read_json as read_json
 from .reverse_geocode import reverse_geocode as reverse_geocode
 from .run_periodically import run_periodically as run_periodically

pyproject.toml

@@ -17,7 +17,7 @@ version = "0.1.0"
 # - Dockerfile`'s `FROM` commands.
 requires-python = ">=3.12"
 dependencies = [
-    "atoti[jdbc,observability]",
+    "atoti[observability]",
     "httpx",
     "opentelemetry-exporter-otlp-proto-http",
     "opentelemetry-instrumentation-httpx",

task-definition.json

@@ -33,13 +33,7 @@
                     "import httpx; httpx.get('http://localhost/actuator/health/readiness').raise_for_status()"
                 ],
                 "startPeriod": 30
-            },
-            "secrets": [
-                {
-                    "name": "DATABASE_URL",
-                    "valueFrom": "arn:aws:secretsmanager:AWS_REGION_PLACEHOLDER:AWS_ACCOUNT_ID_PLACEHOLDER:secret:atoti-project-template/AWS_DATABASE_URL_SECRET_NAME_PLACEHOLDER"
-                }
-            ]
+            }
         }
     ],
     "family": "atoti-project-template",

tests/conftest.py

@@ -19,7 +19,6 @@ def project_name_fixture() -> str:
 def config_fixture() -> Config:
     return Config(
         port=0,
-        user_content_storage=None,
     )