fix: Devin Review on #194 — 2 BUG-class findings

1. .env_overlay write paths now match read path under STATE_DIR.
   app/main.py:343 reads via _state_dir() (post-PR #194), but two
   write sites still hardcoded ${DATA_DIR}/state/.env_overlay:
     - app/api/admin.py:2687 — configure endpoint secrets persistence
     - app/api/marketplaces.py:152 — marketplace PAT persistence
   Under flat-mount layout (STATE_DIR=/data-state) the admin UI wrote
   secrets to /data/state/.env_overlay while the app read from
   /data-state/.env_overlay, silently dropping the value on next
   restart. Both write sites now go through _state_dir().

2. host-mount.yml: caddy inherits data:/srv:ro from base, but with
   no service populating the data: named volume (other services
   switched to direct /data binds), the inherited mount points at an
   empty Docker volume — try_files finds nothing, every parquet
   download falls through to uvicorn, defeating the v0.36.0
   file_server bypass under the host-mount layout. Added a caddy
   override that restates all mounts including a direct /data:/srv:ro
   bind. Mirrors the comment + treatment already in flat-mount.yml.
This commit is contained in:
ZdenekSrotyr 2026-05-05 19:47:12 +02:00
parent a9ae5f9c35
commit b6543c9c55
3 changed files with 37 additions and 5 deletions

View file

@ -2683,8 +2683,13 @@ async def configure_instance(
secrets_to_persist["KEBOOLA_STACK_URL"] = request.keboola_url secrets_to_persist["KEBOOLA_STACK_URL"] = request.keboola_url
if secrets_to_persist: if secrets_to_persist:
data_dir = Path(os.environ.get("DATA_DIR", "./data")) # Resolve via _state_dir() so the path matches app/main.py's
overlay_path = data_dir / "state" / ".env_overlay" # startup-time read of the same overlay. Without this, an operator
# on the flat-mount layout (STATE_DIR=/data-state) would write
# secrets to /data/state/.env_overlay here while the app reads
# from /data-state/.env_overlay — silent loss on next restart.
from app.secrets import _state_dir
overlay_path = _state_dir() / ".env_overlay"
overlay_path.parent.mkdir(parents=True, exist_ok=True) overlay_path.parent.mkdir(parents=True, exist_ok=True)
# Merge with existing overlay # Merge with existing overlay

View file

@ -147,9 +147,17 @@ def _token_env_name(slug: str) -> str:
def _persist_token(env_name: str, value: str) -> None: def _persist_token(env_name: str, value: str) -> None:
"""Write (or update) a single key in data/state/.env_overlay and os.environ.""" """Write (or update) a single key in ``${STATE_DIR}/.env_overlay`` and ``os.environ``.
data_dir = Path(os.environ.get("DATA_DIR", "./data"))
overlay_path = data_dir / "state" / ".env_overlay" Path resolution matches ``app/main.py``'s startup-time read; without
this alignment, marketplace PATs persisted under the flat-mount
layout (``STATE_DIR=/data-state``) would land at
``/data/state/.env_overlay`` while the app reads from
``/data-state/.env_overlay``, silently dropping the token on the
next restart.
"""
from app.secrets import _state_dir
overlay_path = _state_dir() / ".env_overlay"
overlay_path.parent.mkdir(parents=True, exist_ok=True) overlay_path.parent.mkdir(parents=True, exist_ok=True)
existing: dict[str, str] = {} existing: dict[str, str] = {}

View file

@ -75,3 +75,22 @@ services:
ws-gateway: ws-gateway:
volumes: !override volumes: !override
- /data:/data - /data:/data
caddy:
# Caddy was originally inheriting `data:/srv:ro` from the base
# service. Once the other services switch to direct binds and
# nothing populates the `data:` named volume, that inherited
# mount points at an empty Docker-managed volume — and the
# @download `try_files /bigquery/data/<id>.parquet …` block
# in Caddyfile finds nothing, so every parquet download falls
# through to the app's uvicorn worker, defeating the v0.36.0
# file_server bypass.
#
# Restate every mount the base caddy service depends on; mirror
# the same caveat that lives in flat-mount.yml.
volumes: !override
- ./Caddyfile:/etc/caddy/Caddyfile:ro
- /data/state/certs:/certs:ro
- caddy_data:/data
- caddy_config:/config
- /data:/srv:ro