administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-10-20 13:42:47 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

resolve placeholders with dev's env module

Browse Source
This commit is contained in:
Josh Hawkins
2026-10-18 14:46:32 -05:00
parent 1b1ee3d7c9
commit e7496367e9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frigate/api/app.py
+2 -2
View File
@@ -45,7 +45,6 @@ from frigate.config.camera.updater import (
CameraConfigUpdateEnum, CameraConfigUpdateEnum,
CameraConfigUpdateTopic, CameraConfigUpdateTopic,
) )
from frigate.config.env import substitute_frigate_vars
from frigate.const import REDACTED_CREDENTIAL_SENTINEL from frigate.const import REDACTED_CREDENTIAL_SENTINEL
from frigate.ffmpeg_presets import FFMPEG_HWACCEL_VAAPI, _gpu_selector from frigate.ffmpeg_presets import FFMPEG_HWACCEL_VAAPI, _gpu_selector
from frigate.genai import PROVIDERS, load_providers from frigate.genai import PROVIDERS, load_providers
@@ -73,6 +72,7 @@ from frigate.util.config import (
find_config_file, find_config_file,
redact_credential, redact_credential,
) )
from frigate.util.env import substitute_frigate_vars
from frigate.util.live_streams import ( from frigate.util.live_streams import (
generated_transcode_streams, generated_transcode_streams,
sync_transcode_streams, sync_transcode_streams,
@@ -846,7 +846,7 @@ def _resolve_frigate_vars(value: str) -> str:
"""Resolve {FRIGATE_*} placeholders the way /config shows them.""" """Resolve {FRIGATE_*} placeholders the way /config shows them."""
try: try:
return substitute_frigate_vars(value) return substitute_frigate_vars(value)
except (KeyError, ValueError): except ValueError:
return value return value
frigate/test/http_api/test_http_config_set.py
+3 -1
View File
@@ -584,8 +584,10 @@ class TestConfigSetWildcardPropagation(BaseTestHttp):
{"path": path, "roles": [role]} for path, role in paths {"path": path, "roles": [role]} for path, role in paths
] ]
# config parsing rebuilds FRIGATE_ENV_VARS from its sources
@patch.dict("frigate.util.env._CONTAINER_ENV", {"FRIGATE_RTSP_PASSWORD": "s3cret"})
@patch.dict( @patch.dict(
"frigate.config.env.FRIGATE_ENV_VARS", {"FRIGATE_RTSP_PASSWORD": "s3cret"} "frigate.util.env.FRIGATE_ENV_VARS", {"FRIGATE_RTSP_PASSWORD": "s3cret"}
) )
@patch("frigate.api.app.find_config_file") @patch("frigate.api.app.find_config_file")
def test_masked_path_keeps_env_placeholder(self, mock_find_config): def test_masked_path_keeps_env_placeholder(self, mock_find_config):