From 6bf583baf00836a0a6d087aff4683c062f3db161 Mon Sep 17 00:00:00 2001 From: iromli Date: Mon, 6 Jan 2025 23:30:18 +0700 Subject: [PATCH] feat(cloud-native): add support for configuration key file Signed-off-by: iromli --- jans-pycloudlib/jans/pycloudlib/config/file_config.py | 3 ++- jans-pycloudlib/jans/pycloudlib/secret/file_secret.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jans-pycloudlib/jans/pycloudlib/config/file_config.py b/jans-pycloudlib/jans/pycloudlib/config/file_config.py index 9d9603eda40..e4718f0d760 100644 --- a/jans-pycloudlib/jans/pycloudlib/config/file_config.py +++ b/jans-pycloudlib/jans/pycloudlib/config/file_config.py @@ -12,8 +12,9 @@ class FileConfig(BaseConfig): def __init__(self) -> None: filepath = os.environ.get("CN_CONFIGURATOR_CONFIGURATION_FILE", "/etc/jans/conf/configuration.json") + key_file = os.environ.get("CN_CONFIGURATOR_CONFIGURATION_KEY_FILE", "/etc/jans/conf/configuration.key") - out, err, code = load_schema_from_file(filepath, exclude_secret=True) + out, err, code = load_schema_from_file(filepath, exclude_secret=True, key_file=key_file) if code != 0: logger.warning(f"Unable to load configmaps from file {filepath}; error={err}; local configmaps will be excluded") diff --git a/jans-pycloudlib/jans/pycloudlib/secret/file_secret.py b/jans-pycloudlib/jans/pycloudlib/secret/file_secret.py index 2d284386699..75022cab539 100644 --- a/jans-pycloudlib/jans/pycloudlib/secret/file_secret.py +++ b/jans-pycloudlib/jans/pycloudlib/secret/file_secret.py @@ -12,8 +12,9 @@ class FileSecret(BaseSecret): def __init__(self) -> None: filepath = os.environ.get("CN_CONFIGURATOR_CONFIGURATION_FILE", "/etc/jans/conf/configuration.json") + key_file = os.environ.get("CN_CONFIGURATOR_CONFIGURATION_KEY_FILE", "/etc/jans/conf/configuration.key") - out, err, code = load_schema_from_file(filepath, exclude_configmap=True) + out, err, code = load_schema_from_file(filepath, exclude_configmap=True, key_file=key_file) if code != 0: logger.warning(f"Unable to load secrets from file {filepath}; error={err}; local secrets will be excluded")