stove/rougail-user-data-yaml
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: multi layers support

Browse source
This commit is contained in:
egarette@silique.fr 2026-05-04 08:18:14 +02:00
parent ef58253dff
commit 338d1d1aae
36 changed files with 253 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/rougail/user_data_yaml/__init__.py
View file

@ -18,21 +18,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
from ruamel.yaml import YAML
from pathlib import Path
from itertools import chain
from rougail.error import ExtensionError
from tiramisu.error import ValueOptionError, PropertiesOptionError, LeadershipError
from rougail.utils import undefined
from tiramisu import MetaConfig
from .i18n import _
from .__version__ import __version__
class RougailUserDataYaml:
has_several_layers = True
def __init__(
self,
config,
*,
rougailconfig=None,
**kwargs,
) -> None:
if rougailconfig is None:
from rougail import RougailConfig
@ -46,13 +51,23 @@ class RougailUserDataYaml:
if "yaml" not in user_data:
raise ExtensionError(_("yaml is not set in step.user_data"))
self.rougailconfig = rougailconfig
self.filenames = self.rougailconfig["yaml.filename"]
self.filenames = []
for filename in self.rougailconfig["yaml.filename"]:
filename = Path(filename)
if filename.is_file():
self.filenames.append(filename)
else:
for name in sorted(chain(filename.glob('*.yml'), filename.glob('*.yaml'))):
self.filenames.append(name)
self.file_with_secrets = self.rougailconfig["yaml.file_with_secrets"]
self.config = config
self.errors = []
self.warnings = []
self.source = _('the YAML file "{0}"')
def count_layers(self):
return len(self.filenames)
def run(
self,
) -> None:
@ -61,12 +76,6 @@ class RougailUserDataYaml:
if self.file_with_secrets == "last":
last_filename_idx = len(self.filenames) - 1
for idx, filename in enumerate(self.filenames):
filename = Path(filename)
if filename.is_file():
filenames = [filename]
else:
filenames = list(filename.glob('*.yml')) + list(filename.glob('*.yaml'))
for filename in sorted(filenames):
file_values = self.open(filename)
if not file_values:
continue

17
tests/errors/results/01_disabled_family.yaml
View file

@ -1,4 +1,19 @@
{
"errors": [],
"warnings": []
"warnings": [
[
[
"family \"family_disabled\" has property disabled, so cannot access to \"variable1\", it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/01_disabled_family.yaml\"",
"family_disabled.variable1",
null
]
],
[
[
"family \"family_disabled\" has property disabled, so cannot access to \"variable2\", it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/01_disabled_family.yaml\"",
"family_disabled.variable2",
null
]
]
]
}

2
tests/errors/results/02_disabled_hidden_family.yaml
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"cannot modify the option \"variable1\" because is frozen, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/02_disabled_hidden_family.yaml\"",
"family \"family_disabled_hidden\" has property disabled and hidden, so cannot access to \"variable1\", it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/02_disabled_hidden_family.yaml\"",
"family_disabled_hidden.variable1",
null
]

24
tests/result_tutorial/050/errors_02.json
View file

@ -1,4 +1,26 @@
{
"errors": [],
"warnings": []
"warnings": [
[
[
"family \"manual\" (Manual proxy configuration) has property disabled, so cannot access to \"address\" (HTTP address), it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/050/config/02/config.yml\"",
"manual.http_proxy.address",
null
]
],
[
[
"family \"manual\" (Manual proxy configuration) has property disabled, so cannot access to \"port\" (HTTP Port), it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/050/config/02/config.yml\"",
"manual.http_proxy.port",
null
]
],
[
[
"family \"manual\" (Manual proxy configuration) has property disabled, so cannot access to \"use_for_https\" (Also use this proxy for HTTPS), it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/050/config/02/config.yml\"",
"manual.use_for_https",
null
]
]
]
}

2
tests/result_tutorial/052/errors_01.json
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"cannot modify the option \"address\" (HTTPS address) because is frozen, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/052/config/01/config.yml\"",
"family \"https_proxy\" (HTTPS Proxy) has property hidden, so cannot access to \"address\" (HTTPS address), it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/052/config/01/config.yml\"",
"manual.https_proxy.address",
null
]

2
tests/result_tutorial/070/errors_02.json
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"cannot modify the option \"address\" (HTTPS address) because is frozen, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/070/config/02/config.yml\"",
"family \"https_proxy\" (HTTPS Proxy) has property hidden, so cannot access to \"address\" (HTTPS address), it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/070/config/02/config.yml\"",
"manual.https_proxy.address",
null
]

19
tests/result_tutorial/081/01_ro.json
View file

@ -1,9 +1,10 @@
[
[
[
"mandatory variable but has no value",
"manual.socks_proxy.address",
null
]
]
]
{
"proxy_mode": "Manual proxy configuration",
"manual.http_proxy.address": "http.proxy.net",
"manual.http_proxy.port": "3128",
"manual.use_for_https": false,
"manual.https_proxy.address": "https.proxy.net",
"manual.https_proxy.port": "8080",
"manual.socks_proxy.address": "socks.proxy.net",
"manual.socks_proxy.port": "8080"
}

19
tests/result_tutorial/081/01_rw.json
View file

@ -1,9 +1,10 @@
[
[
[
"mandatory variable but has no value",
"manual.socks_proxy.address",
null
]
]
]
{
"proxy_mode": "Manual proxy configuration",
"manual.http_proxy.address": "http.proxy.net",
"manual.http_proxy.port": "3128",
"manual.use_for_https": false,
"manual.https_proxy.address": "https.proxy.net",
"manual.https_proxy.port": "8080",
"manual.socks_proxy.address": "socks.proxy.net",
"manual.socks_proxy.port": "8080"
}

6
tests/result_tutorial/082/01_ro.json
View file

@ -4,8 +4,8 @@
"manual.http_proxy.port": "3128",
"manual.use_for_https": false,
"manual.https_proxy.address": "https.proxy.net",
"manual.https_proxy.port": "3128",
"manual.socks_proxy.address": "http.proxy.net",
"manual.socks_proxy.port": "3128",
"manual.https_proxy.port": "8080",
"manual.socks_proxy.address": "socks.proxy.net",
"manual.socks_proxy.port": "8080",
"manual.socks_proxy.version": "v5"
}

6
tests/result_tutorial/082/01_rw.json
View file

@ -4,8 +4,8 @@
"manual.http_proxy.port": "3128",
"manual.use_for_https": false,
"manual.https_proxy.address": "https.proxy.net",
"manual.https_proxy.port": "3128",
"manual.socks_proxy.address": "http.proxy.net",
"manual.socks_proxy.port": "3128",
"manual.https_proxy.port": "8080",
"manual.socks_proxy.address": "socks.proxy.net",
"manual.socks_proxy.port": "8080",
"manual.socks_proxy.version": "v5"
}

11
tests/result_tutorial/084/01_ro.json Normal file
View file

@ -0,0 +1,11 @@
{
"proxy_mode": "Manual proxy configuration",
"manual.http_proxy.address": "http.proxy.net",
"manual.http_proxy.port": "3128",
"manual.use_for_https": false,
"manual.https_proxy.address": "https.proxy.net",
"manual.https_proxy.port": "3128",
"manual.socks_proxy.address": "http.proxy.net",
"manual.socks_proxy.port": "3128",
"manual.socks_proxy.version": "v5"
}

11
tests/result_tutorial/084/01_rw.json Normal file
View file

@ -0,0 +1,11 @@
{
"proxy_mode": "Manual proxy configuration",
"manual.http_proxy.address": "http.proxy.net",
"manual.http_proxy.port": "3128",
"manual.use_for_https": false,
"manual.https_proxy.address": "https.proxy.net",
"manual.https_proxy.port": "3128",
"manual.socks_proxy.address": "http.proxy.net",
"manual.socks_proxy.port": "3128",
"manual.socks_proxy.version": "v5"
}

4
tests/result_tutorial/084/errors_01.json Normal file
View file

@ -0,0 +1,4 @@
{
"errors": [],
"warnings": []
}

11
tests/result_tutorial/085/01_ro.json Normal file
View file

@ -0,0 +1,11 @@
{
"proxy_mode": "Manual proxy configuration",
"manual.http_proxy.address": "http.proxy.net",
"manual.http_proxy.port": "3128",
"manual.use_for_https": false,
"manual.https_proxy.address": "https.proxy.net",
"manual.https_proxy.port": "3128",
"manual.socks_proxy.address": "http.proxy.net",
"manual.socks_proxy.port": "3128",
"manual.socks_proxy.version": "v5"
}

11
tests/result_tutorial/085/01_rw.json Normal file
View file

@ -0,0 +1,11 @@
{
"proxy_mode": "Manual proxy configuration",
"manual.http_proxy.address": "http.proxy.net",
"manual.http_proxy.port": "3128",
"manual.use_for_https": false,
"manual.https_proxy.address": "https.proxy.net",
"manual.https_proxy.port": "3128",
"manual.socks_proxy.address": "http.proxy.net",
"manual.socks_proxy.port": "3128",
"manual.socks_proxy.version": "v5"
}

4
tests/result_tutorial/085/errors_01.json Normal file
View file

@ -0,0 +1,4 @@
{
"errors": [],
"warnings": []
}

4
tests/results/00_2default_calculated_params_permissive/errors/all.json
View file

@ -3,14 +3,14 @@
"warnings": [
[
[
"cannot modify the option \"var1\" (a first variable) because is frozen, it will be ignored when loading from the YAML file \"tests/results/00_2default_calculated_params_permissive/file/all.yml\"",
"family \"leadership\" has property hidden, so cannot access to \"var1\" (a first variable), it will be ignored when loading from the YAML file \"tests/results/00_2default_calculated_params_permissive/file/all.yml\"",
"rougail.leadership.var1",
null
]
],
[
[
"cannot modify the option \"var2\" (a first variable) at index \"0\" because is frozen, it will be ignored when loading from the YAML file \"tests/results/00_2default_calculated_params_permissive/file/all.yml\"",
"family \"leadership\" is hidden, \"var2\" (a first variable) at index \"0\", it will be ignored when loading from the YAML file \"tests/results/00_2default_calculated_params_permissive/file/all.yml\"",
"rougail.leadership.var2",
null
]

12
tests/results/04_5disabled_calculation_variable11/errors/mandatories.json
View file

@ -1,12 +0,0 @@
{
"errors": [],
"warnings": [
[
[
"family \"condition\" (a condition) has property disabled, so cannot access to \"variable\" (a variable), it will be ignored when loading from the YAML file \"tests/results/04_5disabled_calculation_variable11/file/mandatories.yml\"",
"rougail.variable",
null
]
]
]
}

10
tests/results/16_2family_redefine_calculation/errors/all.json
View file

@ -1,4 +1,12 @@
{
"errors": [],
"warnings": []
"warnings": [
[
[
"family \"family\" has property disabled, so cannot access to \"var1\", it will be ignored when loading from the YAML file \"tests/results/16_2family_redefine_calculation/file/all.yml\"",
"rougail.family.var1",
null
]
]
]
}

10
tests/results/16_2family_redefine_calculation/errors/mandatories.json
View file

@ -1,4 +1,12 @@
{
"errors": [],
"warnings": []
"warnings": [
[
[
"family \"family\" has property disabled, so cannot access to \"var1\", it will be ignored when loading from the YAML file \"tests/results/16_2family_redefine_calculation/file/mandatories.yml\"",
"rougail.family.var1",
null
]
]
]
}

10
tests/results/16_2family_redefine_disabled/errors/all.json
View file

@ -1,4 +1,12 @@
{
"errors": [],
"warnings": []
"warnings": [
[
[
"family \"family\" has property disabled, so cannot access to \"var1\", it will be ignored when loading from the YAML file \"tests/results/16_2family_redefine_disabled/file/all.yml\"",
"rougail.family.var1",
null
]
]
]
}

10
tests/results/16_2family_redefine_disabled/errors/mandatories.json
View file

@ -1,4 +1,12 @@
{
"errors": [],
"warnings": []
"warnings": [
[
[
"family \"family\" has property disabled, so cannot access to \"var1\", it will be ignored when loading from the YAML file \"tests/results/16_2family_redefine_disabled/file/mandatories.yml\"",
"rougail.family.var1",
null
]
]
]
}

2
tests/results/17_5redefine_leadership/errors/all.json
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"cannot modify the option \"leader\" (a leader) because is frozen, it will be ignored when loading from the YAML file \"tests/results/17_5redefine_leadership/file/all.yml\"",
"family \"leader\" (a leadership) has property hidden, so cannot access to \"leader\" (a leader), it will be ignored when loading from the YAML file \"tests/results/17_5redefine_leadership/file/all.yml\"",
"rougail.leader.leader",
null
]

12
tests/results/20_0family_underscore/errors/all.json
View file

@ -3,42 +3,42 @@
"warnings": [
[
[
"cannot modify the option \"my_variable\" because is frozen, it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"family \"my_family\" (This is a great family) has property disabled and hidden, so cannot access to \"my_variable\", it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"rougail.my_family.type.my_variable",
null
]
],
[
[
"cannot modify the option \"my_variable\" because is frozen, it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"family \"my_family\" (This is a great family) has property disabled and hidden, so cannot access to \"my_variable\", it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"rougail.my_family.description.my_variable",
null
]
],
[
[
"cannot modify the option \"my_variable\" because is frozen, it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"family \"my_family\" (This is a great family) has property disabled and hidden, so cannot access to \"my_variable\", it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"rougail.my_family.help.my_variable",
null
]
],
[
[
"cannot modify the option \"my_variable\" because is frozen, it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"family \"my_family\" (This is a great family) has property disabled and hidden, so cannot access to \"my_variable\", it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"rougail.my_family.mode.my_variable",
null
]
],
[
[
"cannot modify the option \"my_variable\" because is frozen, it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"family \"my_family\" (This is a great family) has property disabled and hidden, so cannot access to \"my_variable\", it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"rougail.my_family.hidden.my_variable",
null
]
],
[
[
"cannot modify the option \"my_variable\" because is frozen, it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"family \"my_family\" (This is a great family) has property disabled and hidden, so cannot access to \"my_variable\", it will be ignored when loading from the YAML file \"tests/results/20_0family_underscore/file/all.yml\"",
"rougail.my_family.disabled.my_variable",
null
]

2
tests/results/24_0family_hidden_condition_variable_sub_family/errors/all.json
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"cannot modify the option \"var1\" (a variable) because is frozen, it will be ignored when loading from the YAML file \"tests/results/24_0family_hidden_condition_variable_sub_family/file/all.yml\"",
"family \"family\" (possibly hidden family) has property hidden, so cannot access to \"var1\" (a variable), it will be ignored when loading from the YAML file \"tests/results/24_0family_hidden_condition_variable_sub_family/file/all.yml\"",
"rougail.family.subfamily.var1",
null
]

9
tests/results/24_family_disabled_var_hidden/errors/all.json
View file

@ -3,7 +3,14 @@
"warnings": [
[
[
"unable to carry out a calculation for \"var2\" (A description), cannot access to optiondescription \"family\" because has property \"disabled\" in \"/home/gnunux/git/stove/rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml\", it will be ignored when loading from the YAML file \"tests/results/24_family_disabled_var_hidden/file/all.yml\"",
"family \"family\" has property disabled, so cannot access to \"var1\" (A description), it will be ignored when loading from the YAML file \"tests/results/24_family_disabled_var_hidden/file/all.yml\"",
"rougail.family.var1",
null
]
],
[
[
"family \"family\" has property disabled, so cannot access to \"var2\" (A description), it will be ignored when loading from the YAML file \"tests/results/24_family_disabled_var_hidden/file/all.yml\"",
"rougail.family.var2",
null
]

2
tests/results/24_family_disabled_var_hidden/errors/mandatories.json
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"unable to carry out a calculation for \"var2\" (A description), cannot access to optiondescription \"family\" because has property \"disabled\" in \"/home/gnunux/git/stove/rougail-tests/structures/24_family_disabled_var_hidden/rougail/00-base.yml\", it will be ignored when loading from the YAML file \"tests/results/24_family_disabled_var_hidden/file/mandatories.yml\"",
"family \"family\" has property disabled, so cannot access to \"var2\" (A description), it will be ignored when loading from the YAML file \"tests/results/24_family_disabled_var_hidden/file/mandatories.yml\"",
"rougail.family.var2",
null
]

2
tests/results/44_0leadership_hidden/errors/all.json
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"cannot modify the option \"leader\" (a leader) because is frozen, it will be ignored when loading from the YAML file \"tests/results/44_0leadership_hidden/file/all.yml\"",
"family \"leader\" (a leadership) has property hidden, so cannot access to \"leader\" (a leader), it will be ignored when loading from the YAML file \"tests/results/44_0leadership_hidden/file/all.yml\"",
"rougail.leader.leader",
null
]

2
tests/results/44_0leadership_leader_hidden/errors/all.json
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"cannot modify the option \"leader\" (a leader) because is frozen, it will be ignored when loading from the YAML file \"tests/results/44_0leadership_leader_hidden/file/all.yml\"",
"family \"leader\" (a leadership) has property hidden, so cannot access to \"leader\" (a leader), it will be ignored when loading from the YAML file \"tests/results/44_0leadership_leader_hidden/file/all.yml\"",
"rougail.leader.leader",
null
]

2
tests/results/44_1leadership_append_hidden_follower/errors/all.json
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"cannot modify the option \"leader\" (a leader) because is frozen, it will be ignored when loading from the YAML file \"tests/results/44_1leadership_append_hidden_follower/file/all.yml\"",
"family \"leader\" (a leadership) has property hidden, so cannot access to \"leader\" (a leader), it will be ignored when loading from the YAML file \"tests/results/44_1leadership_append_hidden_follower/file/all.yml\"",
"rougail.leader.leader",
null
]

2
tests/results/60_0family_hidden/errors/all.json
View file

@ -3,7 +3,7 @@
"warnings": [
[
[
"cannot modify the option \"var\" (a variable) because is frozen, it will be ignored when loading from the YAML file \"tests/results/60_0family_hidden/file/all.yml\"",
"family \"family\" (a family) has property hidden, so cannot access to \"var\" (a variable), it will be ignored when loading from the YAML file \"tests/results/60_0family_hidden/file/all.yml\"",
"rougail.family.var",
null
]

10
tests/results/60_5family_dynamic_calc_identifier/errors/all.json
View file

@ -1,4 +1,12 @@
{
"errors": [],
"warnings": []
"warnings": [
[
[
"variable has property hidden, it will be ignored when loading from the YAML file \"tests/results/60_5family_dynamic_calc_identifier/file/all.yml\"",
"rougail.var2",
null
]
]
]
}

2
tests/results/60_5family_dynamic_calc_identifier/makedict/all.json
View file

@ -3,7 +3,7 @@
"val1",
"val2"
],
"rougail.var2": "string1",
"rougail.var2": "val1",
"rougail.dynval1.var": "string1",
"rougail.dynval2.var": "string1",
"rougail.var3": "string1"

10
tests/results/60_5family_dynamic_calc_identifier_multi/errors/all.json
View file

@ -1,4 +1,12 @@
{
"errors": [],
"warnings": []
"warnings": [
[
[
"variable has property hidden, it will be ignored when loading from the YAML file \"tests/results/60_5family_dynamic_calc_identifier_multi/file/all.yml\"",
"rougail.var2",
null
]
]
]
}

2
tests/results/60_5family_dynamic_calc_identifier_multi/makedict/all.json
View file

@ -3,7 +3,7 @@
"val1",
"val2"
],
"rougail.var2": "string1",
"rougail.var2": "val1",
"rougail.dynval1.var": [
"string1",
"string2",

4
tests/results/60_5family_dynamic_hidden_suffix/errors/all.json
View file

@ -3,14 +3,14 @@
"warnings": [
[
[
"cannot modify the option \"var\" (a variable) because is frozen, it will be ignored when loading from the YAML file \"tests/results/60_5family_dynamic_hidden_suffix/file/all.yml\"",
"family \"dynval2\" (a dynamic family) has property hidden, so cannot access to \"var\" (a variable), it will be ignored when loading from the YAML file \"tests/results/60_5family_dynamic_hidden_suffix/file/all.yml\"",
"rougail.dynval2.var",
null
]
],
[
[
"cannot modify the option \"var\" (a new variable) because is frozen, it will be ignored when loading from the YAML file \"tests/results/60_5family_dynamic_hidden_suffix/file/all.yml\"",
"family \"dynval2\" (a dynamic family) has property hidden, so cannot access to \"var\" (a new variable), it will be ignored when loading from the YAML file \"tests/results/60_5family_dynamic_hidden_suffix/file/all.yml\"",
"rougail.dynval2.family.var",
null
]