Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion api/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ async def lifespan(_app: FastAPI):

forge_seed.ensure_from_env() # the Forge demo puts itself back after a restart
except Exception as exc: # noqa: BLE001 - never block startup on this
logger.warning("Could not set up the Forge demo at startup: %s", type(exc).__name__)
# A ValueError carries a fixed setup message (never a secret), so show it.
reason = str(exc) if isinstance(exc, ValueError) else type(exc).__name__
logger.warning("Could not set up the Forge demo at startup: %s", reason)
from services import scheduler

register_jobs()
Expand Down
10 changes: 7 additions & 3 deletions api/services/forge_seed.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,13 @@ def ensure_from_env() -> bool:
did = False
raw = os.getenv("FORGE_DEMO_API_KEY", "").strip()
if raw:
ensure_demo(raw)
logger.info("The Forge demo institution is ready.")
did = True
# Its own try, so a bad demo key never stops the bank below being set up.
try:
ensure_demo(raw)
logger.info("The Forge demo institution is ready.")
did = True
except ValueError as exc:
logger.warning("Skipped the Forge demo institution: %s", exc)
bank = os.getenv("FORGE_BRIDGE_INSTITUTION", "").strip()
email = os.getenv("FORGE_CONSOLE_EMAIL", "").strip()
password = os.getenv("FORGE_CONSOLE_PASSWORD", "")
Expand Down
13 changes: 13 additions & 0 deletions api/tests/test_forge_seed.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,16 @@ def test_a_random_key_is_issued_once_when_none_is_configured():
out = forge_seed.ensure_demo(None)
assert out["issued_key"] and out["issued_key"].startswith("fbl_live_")
assert forge_seed.ensure_demo(None)["issued_key"] is None


def test_a_bad_demo_key_does_not_stop_the_bank_being_set_up(monkeypatch):
from services import forge_seed

calls = []
monkeypatch.setenv("FORGE_DEMO_API_KEY", "not-a-valid-key")
monkeypatch.setenv("FORGE_BRIDGE_INSTITUTION", "xtradot")
monkeypatch.setenv("FORGE_CONSOLE_EMAIL", "team11@fable.ng")
monkeypatch.setenv("FORGE_CONSOLE_PASSWORD", "long-enough-password")
monkeypatch.setattr(forge_seed, "ensure_bank", lambda *a: calls.append(a) or {"customers": 5, "history": 0})
assert forge_seed.ensure_from_env() is True
assert calls == [("xtradot", "team11@fable.ng", "long-enough-password")]
Loading