fix: more than two layers
This commit is contained in:
parent
963e82b434
commit
d156d7afc5
3 changed files with 12 additions and 8 deletions
|
|
@ -213,7 +213,7 @@ def load_user_data(rougailconfig):
|
|||
subconfig.information.set("description_type", rougailconfig["cli.description_type"])
|
||||
metaconfig = subconfig
|
||||
if last_layers:
|
||||
for layer in layers[:-1]:
|
||||
for layer in reversed(layers[:-1]):
|
||||
layer_name = "_".join(layer)
|
||||
metaconfig = MetaConfig([metaconfig], name=layer_name)
|
||||
metaconfig.owner.set(metaconfig.path())
|
||||
|
|
@ -225,10 +225,8 @@ def load_user_data(rougailconfig):
|
|||
for idx, layer in enumerate(layers):
|
||||
if idx:
|
||||
subconfig = subconfig.config("_".join(layer))
|
||||
layer_name = subconfig.path()
|
||||
subconfig.owner.set(subconfig.path())
|
||||
else:
|
||||
layer_name = None
|
||||
layer_name = subconfig.path()
|
||||
# data user
|
||||
user_data = []
|
||||
if has_layers:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,13 @@
|
|||
╭────────────── Caption ───────────────╮
|
||||
│ Variable [32mModified value[0m │
|
||||
│ Variable [38;5;220mDefault value[0m │
|
||||
│ (⏳ Original default value) │
|
||||
╰──────────────────────────────────────╯
|
||||
╭─────────── Layers ────────────╮
|
||||
│ environment variable │
|
||||
│ the YAML file "yaml/file.yml" │
|
||||
│ Bitwarden │
|
||||
╰───────────────────────────────╯
|
||||
Variables:
|
||||
[94m┗━━ [0m📓 a description: [32ma yaml value[0m ◀ loaded from the YAML file "yaml/file.yml"
|
||||
[94m [0m(⏳ my env value ◀ loaded from environment variable ⏳ my_value)
|
||||
[94m┗━━ [0m📓 a description: [38;5;220ma yaml value[0m (⏳ a yaml value ◀ loaded from the YAML file
|
||||
[94m [0m"yaml/file.yml" ⏳ my env value ◀ loaded from environment variable ⏳
|
||||
[94m [0mmy_value)
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ def test_cli_user_datas_user_datas_layers():
|
|||
save = os.environ.copy()
|
||||
os.environ["ROUGAIL_MY_VARIABLE"] = "my env value"
|
||||
with chdir(test_dir / 'cli'):
|
||||
ret = main(['--main_structural_directories', 'structures', '--cli.layers', '--step.user_data', 'environment', 'yaml', '--yaml.filename', 'yaml/file.yml'], do_not_print=True)
|
||||
ret = main(['--main_structural_directories', 'structures', '--cli.layers', '--step.user_data', 'environment', 'yaml', 'bitwarden', '--yaml.filename', 'yaml/file.yml', '--bitwarden.mock_enable'], do_not_print=True)
|
||||
filename = Path('result_user_datas_layers.txt')
|
||||
if not filename.is_file():
|
||||
with filename.open('w') as fh:
|
||||
|
|
|
|||
Loading…
Reference in a new issue