monoadmin/the-other-dude
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ci): use DATABASE_URL env var for alembic migrations in tests

Browse Source 
- alembic/env.py: strengthen the URL override to fall back to
  TEST_DATABASE_URL when DATABASE_URL is absent, so alembic never
  falls back to the hardcoded 'tod' URL in alembic.ini regardless
  of which env var a test runner sets.

- tests/integration/conftest.py: add explanatory comments on why
  DATABASE_URL is forced into the subprocess env, and use
  env.setdefault() to supply CREDENTIAL_ENCRYPTION_KEY if the
  calling environment omits it — migration 029 (VPN tenant
  isolation) requires it to encrypt the WireGuard server private key.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jason Staack
2026-03-14 22:30:26 -05:00
parent e19745c1ba
commit 8cf5f12ffe
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/alembic/env.py
View File

@@ -20,9 +20,12 @@ import app.models.config_backup # noqa: F401
# access to the values within the .ini file in use. # access to the values within the .ini file in use.
config = context.config config = context.config
# Override sqlalchemy.url from DATABASE_URL env var if set (for Docker) # Override sqlalchemy.url from environment variable so alembic never uses the
if os.environ.get("DATABASE_URL"): # hardcoded URL in alembic.ini. DATABASE_URL takes precedence; TEST_DATABASE_URL
config.set_main_option("sqlalchemy.url", os.environ["DATABASE_URL"]) # is a fallback for test runners that set only that variable.
_db_url = os.environ.get("DATABASE_URL") or os.environ.get("TEST_DATABASE_URL")
if _db_url:
config.set_main_option("sqlalchemy.url", _db_url)
# Interpret the config file for Python logging. # Interpret the config file for Python logging.
if config.config_file_name is not None: if config.config_file_name is not None:

9
backend/tests/integration/conftest.py
View File

@@ -65,7 +65,16 @@ def _ensure_database_setup():
backend_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) backend_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
env = os.environ.copy() env = os.environ.copy()
# Ensure DATABASE_URL points at the test database, not the dev/prod URL
# hardcoded in alembic.ini. alembic/env.py reads this variable and overrides
# sqlalchemy.url before opening any connection.
env["DATABASE_URL"] = TEST_DATABASE_URL env["DATABASE_URL"] = TEST_DATABASE_URL
# Migration 029 (VPN tenant isolation) encrypts a WireGuard server private key
# and requires CREDENTIAL_ENCRYPTION_KEY. Provide the dev default if the
# environment does not already supply it (CI always sets this explicitly).
env.setdefault(
"CREDENTIAL_ENCRYPTION_KEY", "LLLjnfBZTSycvL2U07HDSxUeTtLxb9cZzryQl0R9E4w="
)
# Run Alembic migrations via subprocess (handles DB creation and schema) # Run Alembic migrations via subprocess (handles DB creation and schema)
result = subprocess.run( result = subprocess.run(