parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

config: remove accidental scheme validation circumvention, improve errors, warn on config loading failure in main()

Browse source 
This will fail on values of the wrong type, but still warn about and allow unknown keys.
This commit is contained in:
InsanePrawn 2022-11-09 16:28:09 +01:00
parent 7d96d05165
commit 11125e525f
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/scheme.py
View file

@ -135,7 +135,7 @@ class Config(DataClass):
raise Exception(f'values contained unknown keys: {list(values.keys())}') raise Exception(f'values contained unknown keys: {list(values.keys())}')
_vals |= values _vals |= values
return Config(**_vals, validate=validate) return Config(_vals, validate=validate)
@munchclass() @munchclass()

12
config/state.py
View file

@ -84,7 +84,7 @@ def merge_configs(conf_new: Mapping[str, dict], conf_base={}, warn_missing_defau
Pass `conf_base={}` to get a sanitized version of `conf_new`. Pass `conf_base={}` to get a sanitized version of `conf_new`.
NOTE: `conf_base` is NOT checked for invalid keys. Sanitize beforehand. NOTE: `conf_base` is NOT checked for invalid keys. Sanitize beforehand.
""" """
parsed = deepcopy(conf_base) parsed = deepcopy(dict(conf_base))
for outer_name, outer_conf in deepcopy(conf_new).items(): for outer_name, outer_conf in deepcopy(conf_new).items():
# only handle known config sections # only handle known config sections
@ -113,7 +113,7 @@ def merge_configs(conf_new: Mapping[str, dict], conf_base={}, warn_missing_defau
if profile_name == 'current': if profile_name == 'current':
parsed[outer_name][profile_name] = profile_conf parsed[outer_name][profile_name] = profile_conf
else: else:
logging.warning('Skipped key "{profile_name}" in profile section: only subsections and "current" allowed') logging.warning(f'Skipped key "{profile_name}" in profile section: only subsections and "current" allowed')
continue continue
# init profile # init profile
@ -134,7 +134,7 @@ def merge_configs(conf_new: Mapping[str, dict], conf_base={}, warn_missing_defau
# handle generic inner config dict # handle generic inner config dict
for inner_name, inner_conf in outer_conf.items(): for inner_name, inner_conf in outer_conf.items():
if inner_name not in CONFIG_DEFAULTS[outer_name].keys(): if inner_name not in CONFIG_DEFAULTS[outer_name].keys():
logging.warning(f'Skipped unknown config item "{inner_name}" in "{outer_name}"') logging.warning(f'Skipped unknown config item "{inner_name}" in section "{outer_name}"')
continue continue
parsed[outer_name][inner_name] = inner_conf parsed[outer_name][inner_name] = inner_conf
@ -190,7 +190,7 @@ class ConfigStateHolder:
# runtime config not persisted anywhere # runtime config not persisted anywhere
runtime: RuntimeConfiguration runtime: RuntimeConfiguration
file_state: ConfigLoadState file_state: ConfigLoadState
_profile_cache: dict[str, Profile] _profile_cache: Optional[dict[str, Profile]]
def __init__(self, file_conf_path: Optional[str] = None, runtime_conf={}, file_conf_base: dict = {}): def __init__(self, file_conf_path: Optional[str] = None, runtime_conf={}, file_conf_base: dict = {}):
"""init a stateholder, optionally loading `file_conf_path`""" """init a stateholder, optionally loading `file_conf_path`"""
@ -204,12 +204,12 @@ class ConfigStateHolder:
if file_conf_path: if file_conf_path:
self.try_load_file(file_conf_path) self.try_load_file(file_conf_path)
def try_load_file(self, config_file=None, base=CONFIG_DEFAULTS): def try_load_file(self, config_file=None, base=CONFIG_DEFAULTS_DICT):
config_file = config_file or CONFIG_DEFAULT_PATH config_file = config_file or CONFIG_DEFAULT_PATH
self.runtime.config_file = config_file self.runtime.config_file = config_file
self._profile_cache = None self._profile_cache = None
try: try:
self.file = parse_file(config_file=config_file, base=base) self.file = Config.fromDict(parse_file(config_file=config_file, base=base), validate=True)
except Exception as ex: except Exception as ex:
self.file_state.exception = ex self.file_state.exception = ex
self.file_state.load_finished = True self.file_state.load_finished = True

2
main.py
View file

@ -30,6 +30,8 @@ def cli(verbose: bool = False, config_file: Optional[str] = None, wrapper_overri
config.runtime.no_wrap = wrapper_override is False config.runtime.no_wrap = wrapper_override is False
config.runtime.error_shell = error_shell config.runtime.error_shell = error_shell
config.try_load_file(config_file) config.try_load_file(config_file)
if config.file_state.exception:
logging.warning(f"Config file couldn't be loaded: {config.file_state.exception}")
if wrapper_override: if wrapper_override:
enforce_wrap() enforce_wrap()