Skip to content

fix(config): forward SMTP + SendGrid env to backend (#771, scoped) #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vybe merged 2 commits into from
May 18, 2026
Merged

fix(config): forward SMTP + SendGrid env to backend (#771, scoped) #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6dfe1a
fix(config): forward SMTP + SendGrid env to backend container (#771)
dolho May 18, 2026
560d3c6
test(slots): adopt sanctioned _STUBBED_MODULE_NAMES pattern (#871 lin…
dolho May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions docker-compose.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ services:
- EMAIL_PROVIDER=${EMAIL_PROVIDER:-resend}
- RESEND_API_KEY=${RESEND_API_KEY:-}
- SMTP_FROM=${SMTP_FROM:-noreply@trinity.example.com}
# SMTP transport (EMAIL_PROVIDER=smtp) — read by src/backend/config.py (#771)
- SMTP_HOST=${SMTP_HOST:-}
- SMTP_PORT=${SMTP_PORT:-587}
- SMTP_USER=${SMTP_USER:-}
- SMTP_PASSWORD=${SMTP_PASSWORD:-}
# SendGrid transport (EMAIL_PROVIDER=sendgrid) — read by src/backend/config.py (#771)
- SENDGRID_API_KEY=${SENDGRID_API_KEY:-}
- GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID}
- GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET}
- NOTION_CLIENT_ID=${NOTION_CLIENT_ID}
Expand Down
7 changes: 7 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ services:
- EMAIL_PROVIDER=${EMAIL_PROVIDER:-resend}
- RESEND_API_KEY=${RESEND_API_KEY:-}
- SMTP_FROM=${SMTP_FROM:-noreply@trinity.example.com}
# SMTP transport (EMAIL_PROVIDER=smtp) — read by src/backend/config.py (#771)
- SMTP_HOST=${SMTP_HOST:-}
- SMTP_PORT=${SMTP_PORT:-587}
- SMTP_USER=${SMTP_USER:-}
- SMTP_PASSWORD=${SMTP_PASSWORD:-}
# SendGrid transport (EMAIL_PROVIDER=sendgrid) — read by src/backend/config.py (#771)
- SENDGRID_API_KEY=${SENDGRID_API_KEY:-}
# Log Retention & Archival Configuration
- LOG_RETENTION_DAYS=${LOG_RETENTION_DAYS:-90}
- LOG_ARCHIVE_ENABLED=${LOG_ARCHIVE_ENABLED:-true}
Expand Down
23 changes: 21 additions & 2 deletions tests/unit/test_slot_per_slot_ttl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,29 @@
sys.path.insert(0, str(_BACKEND))


# Modules this test stubs into sys.modules (directly or via the
# importlib-loaded slot_service_direct / cleanup_service_direct helpers)
# — restored after each test so they don't leak into other test files in
# the same pytest session. Declaring this at module level (paired with
# the `_restore_sys_modules` fixture below) is the sanctioned
# snapshot/restore pattern recognised by tests/lint_sys_modules.py
# (precedent: tests/unit/test_telegram_webhook_backfill.py).
_STUBBED_MODULE_NAMES = [
"config",
"redis",
"utils.helpers",
"utils.credential_sanitizer",
"database",
"models",
"services.capacity_manager",
"slot_service_direct",
"cleanup_service_direct",
]


@pytest.fixture(autouse=True)
def _restore_sys_modules():
names = ["config", "slot_service_direct", "utils.helpers", "redis"]
saved = {n: sys.modules.get(n) for n in names}
saved = {n: sys.modules.get(n) for n in _STUBBED_MODULE_NAMES}
try:
yield
finally:
Expand Down
Loading