From 240ea9037c75e5d90b88a881db180b1a8f2e34e0 Mon Sep 17 00:00:00 2001 From: kfiramar <83420275+kfiramar@users.noreply.github.com> Date: Sun, 12 Jul 2026 19:00:36 +0300 Subject: [PATCH] fix(preview): preserve service environment overlays --- .../runtime/engine_runtime_dependency_env.py | 11 ++++++++++- .../runtime/test_engine_runtime_env_templates.py | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/python/envctl_engine/runtime/engine_runtime_dependency_env.py b/python/envctl_engine/runtime/engine_runtime_dependency_env.py index c783a440..dccbcb6f 100644 --- a/python/envctl_engine/runtime/engine_runtime_dependency_env.py +++ b/python/envctl_engine/runtime/engine_runtime_dependency_env.py @@ -17,6 +17,9 @@ "ENVCTL_BACKEND_ENV__", "ENVCTL_FRONTEND_ENV__", ) +_SERVICE_ENV_OVERLAY_NAME_RE = re.compile( + r"^ENVCTL_[A-Za-z][A-Za-z0-9_]*_ENV__[A-Za-z_][A-Za-z0-9_]*$" +) def service_env_overlays( @@ -62,7 +65,13 @@ def service_env_overlays( def _process_service_overlay_source() -> dict[str, str]: return { - key: value for key, value in os.environ.items() if value and key.startswith(_SERVICE_OVERLAY_SOURCE_PREFIXES) + key: value + for key, value in os.environ.items() + if value + and ( + key.startswith(_SERVICE_OVERLAY_SOURCE_PREFIXES) + or _SERVICE_ENV_OVERLAY_NAME_RE.fullmatch(key) + ) } diff --git a/tests/python/runtime/test_engine_runtime_env_templates.py b/tests/python/runtime/test_engine_runtime_env_templates.py index 7e0b43e3..eb1fb0c3 100644 --- a/tests/python/runtime/test_engine_runtime_env_templates.py +++ b/tests/python/runtime/test_engine_runtime_env_templates.py @@ -401,14 +401,19 @@ def test_service_env_overlays_fall_back_to_filtered_process_env(self) -> None: { "ENVCTL_FRONTEND_ENV__VITE_PADDLE_CLIENT_TOKEN": "client-token", "ENVCTL_FRONTEND_ENV__VITE_PADDLE_ENVIRONMENT": "sandbox", + "ENVCTL_VOICE_RUNTIME_ENV__DEEPGRAM_API_KEY": "deepgram-key", + "ENVCTL_VOICE_RUNTIME_ENV__CARTESIA_API_KEY": "cartesia-key", "UNRELATED_SECRET": "must-not-project", }, ): overlays = service_env_overlays(runtime, service_name="frontend", base_env={}) + voice_overlays = service_env_overlays(runtime, service_name="voice-runtime", base_env={}) self.assertEqual(overlays["VITE_PADDLE_CLIENT_TOKEN"], "client-token") self.assertEqual(overlays["VITE_PADDLE_ENVIRONMENT"], "sandbox") self.assertNotIn("UNRELATED_SECRET", overlays) + self.assertEqual(voice_overlays["DEEPGRAM_API_KEY"], "deepgram-key") + self.assertEqual(voice_overlays["CARTESIA_API_KEY"], "cartesia-key") def test_frontend_launch_env_rejects_supabase_service_role_source_template(self) -> None: runtime = SimpleNamespace(