Compare commits
No commits in common. "0.2.0a13" and "main" have entirely different histories.
1366 changed files with 3880 additions and 11594 deletions
98
CHANGELOG.md
98
CHANGELOG.md
|
|
@ -1,101 +1,3 @@
|
|||
## 0.2.0a13 (2025-09-29)
|
||||
|
||||
### Feat
|
||||
|
||||
- default value for a calculated variable with an unknown optional variable
|
||||
- update tests for integer type
|
||||
|
||||
## 0.2.0a12 (2025-09-22)
|
||||
|
||||
### Fix
|
||||
|
||||
- dependency
|
||||
|
||||
## 0.2.0a11 (2025-05-26)
|
||||
|
||||
### Fix
|
||||
|
||||
- do not load yaml has YAML object
|
||||
|
||||
## 0.2.0a10 (2025-05-14)
|
||||
|
||||
### Feat
|
||||
|
||||
- yaml.filename could be the name of a directory
|
||||
|
||||
## 0.2.0a9 (2025-05-12)
|
||||
|
||||
### Fix
|
||||
|
||||
- black
|
||||
- update translation
|
||||
- load file with order
|
||||
|
||||
## 0.2.0a8 (2025-05-02)
|
||||
|
||||
### Fix
|
||||
|
||||
- do not force use_data usage
|
||||
|
||||
## 0.2.0a7 (2025-04-30)
|
||||
|
||||
### Fix
|
||||
|
||||
- update tests
|
||||
|
||||
## 0.2.0a6 (2025-04-09)
|
||||
|
||||
### Fix
|
||||
|
||||
- version
|
||||
|
||||
## 0.2.0a5 (2025-04-09)
|
||||
|
||||
### Fix
|
||||
|
||||
- better error message
|
||||
|
||||
## 0.2.0a4 (2025-04-01)
|
||||
|
||||
### Fix
|
||||
|
||||
- update tests
|
||||
|
||||
## 0.2.0a3 (2025-03-30)
|
||||
|
||||
### Fix
|
||||
|
||||
- i18n
|
||||
|
||||
## 0.2.0a2 (2025-03-30)
|
||||
|
||||
### Fix
|
||||
|
||||
- update tests
|
||||
- update tests, some errors are now in warnings level
|
||||
|
||||
## 0.2.0a1 (2025-02-10)
|
||||
|
||||
### Feat
|
||||
|
||||
- add new parameter yaml.file_with_secrets
|
||||
|
||||
### Fix
|
||||
|
||||
- update tests
|
||||
|
||||
## 0.2.0a0 (2024-12-11)
|
||||
|
||||
### Feat
|
||||
|
||||
- rename file to yaml
|
||||
|
||||
### Fix
|
||||
|
||||
- prepare ansible user data
|
||||
|
||||
## 0.1.0 (2024-11-06)
|
||||
|
||||
## 0.1.0rc1 (2024-11-06)
|
||||
|
||||
### Fix
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
# rougail-user-data-file
|
||||
# rougail-user-data
|
||||
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR ORGANIZATION
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: 2025-05-14 08:28+0200\n"
|
||||
"PO-Revision-Date: 2025-05-14 08:29+0200\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: fr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Generated-By: pygettext.py 1.5\n"
|
||||
"X-Generator: Poedit 3.5\n"
|
||||
|
||||
#: src/rougail/user_data_yaml/__init__.py:46
|
||||
msgid "yaml is not set in step.user_data"
|
||||
msgstr "\"yaml\" n'est pas défini dans step.user_data"
|
||||
|
||||
#: src/rougail/user_data_yaml/__init__.py:72
|
||||
msgid "cannot load \"{0}\", the root value is not a dict but \"{1}\""
|
||||
msgstr ""
|
||||
"ne peut charger \"{0}\", la valeur racine n'est pas une dictionnaire mais "
|
||||
"\"{1}\""
|
||||
|
||||
#: src/rougail/user_data_yaml/__init__.py:95
|
||||
msgid "the YAML file \"{0}\""
|
||||
msgstr "le fichier YAML \"{0}\""
|
||||
|
||||
#: src/rougail/user_data_yaml/__init__.py:127
|
||||
msgid "\"{0}\" in {1} has an unknown value"
|
||||
msgstr "\"{0}\" dans {1} a une valeur inconnue"
|
||||
|
||||
#: src/rougail/user_data_yaml/config.py:30
|
||||
msgid "Configuration rougail-user-data-yaml"
|
||||
msgstr "Configuration de rougail-user-data-yaml"
|
||||
|
||||
#: src/rougail/user_data_yaml/config.py:39
|
||||
msgid "File or directory name where user datas are stored"
|
||||
msgstr ""
|
||||
"Nom du fichier ou répertoire où sont enregistré les données utilisateur"
|
||||
|
||||
#: src/rougail/user_data_yaml/config.py:48
|
||||
msgid "File that may contain secrets"
|
||||
msgstr "Le fichier peut contenir des secrets"
|
||||
|
||||
#~ msgid "Filename"
|
||||
#~ msgstr "Nom du fichier"
|
||||
BIN
locale/fr/LC_MESSAGES/user_data_file.mo
Normal file
BIN
locale/fr/LC_MESSAGES/user_data_file.mo
Normal file
Binary file not shown.
35
locale/fr/LC_MESSAGES/user_data_file.po
Normal file
35
locale/fr/LC_MESSAGES/user_data_file.po
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR ORGANIZATION
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: 2024-11-01 12:12+0100\n"
|
||||
"PO-Revision-Date: 2024-11-01 12:13+0100\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: fr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Generated-By: pygettext.py 1.5\n"
|
||||
"X-Generator: Poedit 3.5\n"
|
||||
|
||||
#: src/rougail/user_data_file/__init__.py:40
|
||||
msgid "file is not set in step.user_data"
|
||||
msgstr "\"file\" n'est pas défini dans step.user_data"
|
||||
|
||||
#: src/rougail/user_data_file/__init__.py:58
|
||||
msgid "cannot load \"{0}\", the root value is not a dict but \"{1}\""
|
||||
msgstr ""
|
||||
"ne peut charger \"{0}\", la valeur racine n'est pas une dictionnaire mais "
|
||||
"\"{1}\""
|
||||
|
||||
#: src/rougail/user_data_file/__init__.py:66
|
||||
msgid "file ({0})"
|
||||
msgstr "fichier ({0})"
|
||||
|
||||
#: src/rougail/user_data_file/__init__.py:88
|
||||
msgid "\"{0}\" in {1} has an unknown value"
|
||||
msgstr "\"{0}\" dans {1} a une valeur inconnue"
|
||||
33
locale/rougail_user_data_file.pot
Normal file
33
locale/rougail_user_data_file.pot
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR ORGANIZATION
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2024-11-01 12:13+0100\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Generated-By: pygettext.py 1.5\n"
|
||||
|
||||
|
||||
#: src/rougail/user_data_file/__init__.py:40
|
||||
msgid "file is not set in step.user_data"
|
||||
msgstr ""
|
||||
|
||||
#: src/rougail/user_data_file/__init__.py:58
|
||||
msgid "cannot load \"{0}\", the root value is not a dict but \"{1}\""
|
||||
msgstr ""
|
||||
|
||||
#: src/rougail/user_data_file/__init__.py:66
|
||||
msgid "file ({0})"
|
||||
msgstr ""
|
||||
|
||||
#: src/rougail/user_data_file/__init__.py:88
|
||||
msgid "\"{0}\" in {1} has an unknown value"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR ORGANIZATION
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2025-05-14 08:29+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Generated-By: pygettext.py 1.5\n"
|
||||
|
||||
|
||||
#: src/rougail/user_data_yaml/__init__.py:46
|
||||
msgid "yaml is not set in step.user_data"
|
||||
msgstr ""
|
||||
|
||||
#: src/rougail/user_data_yaml/__init__.py:72
|
||||
msgid "cannot load \"{0}\", the root value is not a dict but \"{1}\""
|
||||
msgstr ""
|
||||
|
||||
#: src/rougail/user_data_yaml/__init__.py:95
|
||||
msgid "the YAML file \"{0}\""
|
||||
msgstr ""
|
||||
|
||||
#: src/rougail/user_data_yaml/__init__.py:127
|
||||
msgid "\"{0}\" in {1} has an unknown value"
|
||||
msgstr ""
|
||||
|
||||
#: src/rougail/user_data_yaml/config.py:30
|
||||
msgid "Configuration rougail-user-data-yaml"
|
||||
msgstr ""
|
||||
|
||||
#: src/rougail/user_data_yaml/config.py:39
|
||||
msgid "File or directory name where user datas are stored"
|
||||
msgstr ""
|
||||
|
||||
#: src/rougail/user_data_yaml/config.py:48
|
||||
msgid "File that may contain secrets"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3,11 +3,11 @@ build-backend = "flit_core.buildapi"
|
|||
requires = ["flit_core >=3.8.0,<4"]
|
||||
|
||||
[project]
|
||||
name = "rougail.user_data_yaml"
|
||||
version = "0.2.0a13"
|
||||
name = "rougail.user_data_file"
|
||||
version = "0.1.0"
|
||||
authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
|
||||
readme = "README.md"
|
||||
description = "Rougail user_data yaml"
|
||||
description = "Rougail user_data file"
|
||||
requires-python = ">=3.8"
|
||||
license = {file = "LICENSE"}
|
||||
classifiers = [
|
||||
|
|
@ -18,8 +18,6 @@ classifiers = [
|
|||
"Programming Language :: Python :: 3.10",
|
||||
"Programming Language :: Python :: 3.11",
|
||||
"Programming Language :: Python :: 3.12",
|
||||
"Programming Language :: Python :: 3.13",
|
||||
"Programming Language :: Python :: 3.14",
|
||||
"Programming Language :: Python :: 3",
|
||||
"Operating System :: OS Independent",
|
||||
"Natural Language :: English",
|
||||
|
|
@ -27,21 +25,16 @@ classifiers = [
|
|||
|
||||
]
|
||||
dependencies = [
|
||||
"rougail-base >= 1.1,<2",
|
||||
"ruamel.yaml ~= 0.18.6",
|
||||
"rougail >= 1.1,<2",
|
||||
]
|
||||
|
||||
[project.urls]
|
||||
Home = "https://forge.cloud.silique.fr/stove/rougail-user-data-yaml"
|
||||
Home = "https://forge.cloud.silique.fr/stove/rougail-user-data-file"
|
||||
|
||||
[tool.commitizen]
|
||||
name = "cz_conventional_commits"
|
||||
tag_format = "$version"
|
||||
version_scheme = "pep440"
|
||||
version_provider = "pep621"
|
||||
version_files = [
|
||||
"src/rougail/user_data_yaml/__version__.py",
|
||||
"pyproject.toml:version"
|
||||
]
|
||||
update_changelog_on_bump = true
|
||||
#update_changelog_on_bump = true
|
||||
changelog_merge_prerelease = true
|
||||
|
|
|
|||
119
src/rougail/user_data_file/__init__.py
Normal file
119
src/rougail/user_data_file/__init__.py
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
"""
|
||||
Silique (https://www.silique.fr)
|
||||
Copyright (C) 2024
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by the
|
||||
Free Software Foundation, either version 3 of the License, or (at your
|
||||
option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
|
||||
details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
"""
|
||||
|
||||
from rougail import RougailConfig
|
||||
from ruamel.yaml import YAML
|
||||
from tiramisu.error import ValueOptionError, PropertiesOptionError, LeadershipError
|
||||
|
||||
from .i18n import _
|
||||
|
||||
|
||||
class RougailUserDataFile:
|
||||
def __init__(
|
||||
self,
|
||||
config,
|
||||
*,
|
||||
rougailconfig=None,
|
||||
) -> None:
|
||||
if rougailconfig is None:
|
||||
rougailconfig = RougailConfig
|
||||
user_data = rougailconfig["step.user_data"]
|
||||
if "file" not in user_data:
|
||||
user_data.append("file")
|
||||
rougailconfig["step.user_data"] = user_data
|
||||
user_data = rougailconfig["step.user_data"]
|
||||
if "file" not in user_data:
|
||||
raise Exception(_("file is not set in step.user_data"))
|
||||
self.rougailconfig = rougailconfig
|
||||
self.filenames = self.rougailconfig["file.filename"]
|
||||
self.yaml = YAML()
|
||||
self.config = config
|
||||
self.errors = []
|
||||
self.warnings = []
|
||||
|
||||
def run(
|
||||
self,
|
||||
) -> None:
|
||||
user_datas = []
|
||||
for filename in self.filenames:
|
||||
with open(filename) as fh_config:
|
||||
file_values = self.yaml.load(fh_config)
|
||||
if not file_values:
|
||||
continue
|
||||
if not isinstance(file_values, dict):
|
||||
self.errors.append(
|
||||
_(
|
||||
'cannot load "{0}", the root value is not a dict but "{1}"'
|
||||
).format(filename, file_values)
|
||||
)
|
||||
continue
|
||||
values = {}
|
||||
self.parse(
|
||||
values,
|
||||
"",
|
||||
file_values,
|
||||
filename,
|
||||
)
|
||||
user_datas.append(
|
||||
{
|
||||
"source": _("file ({0})").format(filename),
|
||||
"errors": self.errors,
|
||||
"warnings": self.warnings,
|
||||
"values": values,
|
||||
}
|
||||
)
|
||||
return user_datas
|
||||
|
||||
def parse(
|
||||
self,
|
||||
values: dict,
|
||||
parent_path: str,
|
||||
file_values: dict,
|
||||
filename: str,
|
||||
):
|
||||
for key, value in file_values.items():
|
||||
path = parent_path + key
|
||||
if isinstance(value, dict):
|
||||
self.parse(values, path + ".", value, filename)
|
||||
elif isinstance(value, list) and value and isinstance(value[0], dict):
|
||||
# it's a leadership
|
||||
keys = set()
|
||||
for val in value:
|
||||
if not isinstance(val, dict):
|
||||
self.errors.append(
|
||||
_('"{0}" in {1} has an unknown value').format(
|
||||
path, filename
|
||||
)
|
||||
)
|
||||
break
|
||||
keys |= set(val)
|
||||
else:
|
||||
for val in value:
|
||||
for key in keys:
|
||||
values.setdefault(path + "." + key, []).append(
|
||||
val.get(key, None)
|
||||
)
|
||||
|
||||
else:
|
||||
values[path] = value
|
||||
|
||||
|
||||
RougailUserData = RougailUserDataFile
|
||||
|
||||
|
||||
__all__ = ("RougailUserDataFile",)
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
"""
|
||||
Config yaml for Rougail-user-data
|
||||
Config file for Rougail-user-data
|
||||
|
||||
Silique (https://www.silique.fr)
|
||||
Copyright (C) 2024-2025
|
||||
Copyright (C) 2024
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by the
|
||||
|
|
@ -18,43 +18,33 @@ You should have received a copy of the GNU Lesser General Public License
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
"""
|
||||
|
||||
from .i18n import _
|
||||
|
||||
|
||||
def get_rougail_config(
|
||||
*,
|
||||
backward_compatibility=True,
|
||||
) -> dict:
|
||||
options = f"""
|
||||
yaml:
|
||||
description: {_("Configuration rougail-user-data-yaml")}
|
||||
options = """
|
||||
file:
|
||||
description: Configuration rougail-user-data-file
|
||||
disabled:
|
||||
type: jinja
|
||||
jinja: |
|
||||
{{% if step.user_data is propertyerror or 'yaml' not in step.user_data %}}
|
||||
{% if 'file' not in step.user_data %}
|
||||
disabled
|
||||
{{% endif %}}
|
||||
|
||||
{% endif %}
|
||||
filename:
|
||||
description: {_("File or directory name where user datas are stored")}
|
||||
description: Filename with user data
|
||||
alternative_name: ff
|
||||
type: unix_filename
|
||||
multi: true
|
||||
params:
|
||||
allow_relative: True
|
||||
test_existence: True
|
||||
|
||||
file_with_secrets:
|
||||
description: {_("File that may contain secrets")}
|
||||
default: all
|
||||
choices:
|
||||
- all
|
||||
- first
|
||||
- last
|
||||
- none
|
||||
types:
|
||||
- file
|
||||
"""
|
||||
return {
|
||||
"name": "yaml",
|
||||
"name": "file",
|
||||
"process": "user data",
|
||||
"options": options,
|
||||
"level": 50,
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
"""Internationalisation utilities
|
||||
Silique (https://www.silique.fr)
|
||||
Copyright (C) 2024-2025
|
||||
Copyright (C) 2024
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by the
|
||||
|
|
@ -20,7 +20,7 @@ from gettext import translation
|
|||
from pathlib import Path
|
||||
|
||||
t = translation(
|
||||
"rougail_user_data_yaml", str(Path(__file__).parent / "locale"), fallback=True
|
||||
"rougail_user_data_file", str(Path(__file__).parent / "locale"), fallback=True
|
||||
)
|
||||
|
||||
_ = t.gettext
|
||||
Binary file not shown.
|
|
@ -1,149 +0,0 @@
|
|||
"""
|
||||
Silique (https://www.silique.fr)
|
||||
Copyright (C) 2024-2025
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by the
|
||||
Free Software Foundation, either version 3 of the License, or (at your
|
||||
option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
|
||||
details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
"""
|
||||
|
||||
from ruamel.yaml import YAML
|
||||
from pathlib import Path
|
||||
|
||||
from rougail.error import ExtentionError
|
||||
from tiramisu.error import ValueOptionError, PropertiesOptionError, LeadershipError
|
||||
|
||||
from .i18n import _
|
||||
from .__version__ import __version__
|
||||
|
||||
|
||||
class RougailUserDataYaml:
|
||||
def __init__(
|
||||
self,
|
||||
config,
|
||||
*,
|
||||
rougailconfig=None,
|
||||
) -> None:
|
||||
if rougailconfig is None:
|
||||
from rougail import RougailConfig
|
||||
|
||||
rougailconfig = RougailConfig
|
||||
user_data = rougailconfig["step.user_data"]
|
||||
if "yaml" not in user_data:
|
||||
user_data.append("yaml")
|
||||
rougailconfig["step.user_data"] = user_data
|
||||
user_data = rougailconfig["step.user_data"]
|
||||
if "yaml" not in user_data:
|
||||
raise ExtentionError(_("yaml is not set in step.user_data"))
|
||||
self.rougailconfig = rougailconfig
|
||||
self.filenames = self.rougailconfig["yaml.filename"]
|
||||
self.file_with_secrets = self.rougailconfig["yaml.file_with_secrets"]
|
||||
self.config = config
|
||||
self.errors = []
|
||||
self.warnings = []
|
||||
|
||||
def run(
|
||||
self,
|
||||
) -> None:
|
||||
self.yaml = YAML(typ='safe', pure=True)
|
||||
user_datas = []
|
||||
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
|
||||
values = {}
|
||||
if not isinstance(file_values, dict):
|
||||
self.errors.append(
|
||||
_(
|
||||
'cannot load "{0}", the root value is not a dict but "{1}"'
|
||||
).format(filename, file_values)
|
||||
)
|
||||
else:
|
||||
self.parse(
|
||||
values,
|
||||
"",
|
||||
file_values,
|
||||
filename,
|
||||
)
|
||||
if self.file_with_secrets == "none":
|
||||
allow_secrets_variables = False
|
||||
elif self.file_with_secrets == "first":
|
||||
allow_secrets_variables = idx == 0
|
||||
elif self.file_with_secrets == "last":
|
||||
if not idx:
|
||||
last_filenames = len(self.filenames) - 1
|
||||
allow_secrets_variables = idx == last_filenames
|
||||
else:
|
||||
allow_secrets_variables = True
|
||||
user_datas.append(
|
||||
{
|
||||
"source": _('the YAML file "{0}"').format(filename),
|
||||
"errors": self.errors,
|
||||
"warnings": self.warnings,
|
||||
"values": values,
|
||||
"options": {
|
||||
"allow_secrets_variables": allow_secrets_variables,
|
||||
},
|
||||
}
|
||||
)
|
||||
return user_datas
|
||||
|
||||
def open(self, filename: str) -> dict:
|
||||
with filename.open() as fh_config:
|
||||
return self.yaml.load(fh_config)
|
||||
|
||||
def parse(
|
||||
self,
|
||||
values: dict,
|
||||
parent_path: str,
|
||||
file_values: dict,
|
||||
filename: str,
|
||||
):
|
||||
for key, value in file_values.items():
|
||||
path = parent_path + key
|
||||
if isinstance(value, dict):
|
||||
self.parse(values, path + ".", value, filename)
|
||||
elif isinstance(value, list) and value and isinstance(value[0], dict):
|
||||
# it's a leadership
|
||||
keys = []
|
||||
for val in value:
|
||||
if not isinstance(val, dict):
|
||||
self.errors.append(
|
||||
_('"{0}" in {1} has an unknown value').format(
|
||||
path, filename
|
||||
)
|
||||
)
|
||||
break
|
||||
for v in val:
|
||||
if v not in keys:
|
||||
keys.append(v)
|
||||
else:
|
||||
for val in value:
|
||||
for key in keys:
|
||||
values.setdefault(path + "." + key, []).append(
|
||||
val.get(key, None)
|
||||
)
|
||||
|
||||
else:
|
||||
values[path] = value
|
||||
|
||||
|
||||
RougailUserData = RougailUserDataYaml
|
||||
|
||||
|
||||
__all__ = ("RougailUserDataYaml",)
|
||||
|
|
@ -1 +0,0 @@
|
|||
__version__ = "0.2.0a13"
|
||||
Binary file not shown.
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variable1": "value1",
|
||||
"variable2": "value2",
|
||||
"variable3": null
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
---
|
||||
version: 1.1
|
||||
|
||||
variable1:
|
||||
mandatory: false
|
||||
|
||||
variable2:
|
||||
mandatory: false
|
||||
|
||||
variable3:
|
||||
mandatory: false
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
---
|
||||
variable3: value3
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
---
|
||||
variable2: value2
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
---
|
||||
variable1: value1
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"dynVal1": {
|
||||
"var": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
---
|
||||
version: '1.1'
|
||||
|
||||
var: [] # A suffix variable
|
||||
|
||||
"dyn{{ identifier }}":
|
||||
description: A dynamic family
|
||||
dynamic:
|
||||
variable: _.var
|
||||
var: # A dynamic variable
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"dynVal1": {
|
||||
"var": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
version: '1.1'
|
||||
|
||||
var: #A suffix variable
|
||||
mandatory: false
|
||||
default: []
|
||||
|
||||
"dyn{{ identifier }}":
|
||||
description: A dynamic family
|
||||
dynamic:
|
||||
variable: _.var
|
||||
var: # A dynamic variable
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"variable or family \"unknown\" does not exist, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/00_unknown_variable.yaml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"family \"family_disabled\" is disabled, \"family_disabled.variable1\" 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 \"family_disabled\" is disabled, \"family_disabled.variable2\" will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/01_disabled_family.yaml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"variable \"variable_disabled\" is disabled, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/01_disabled_variable.yaml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"the value \"test\" is invalid for \"variable_int\", which is not an integer, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/01_wrong_type.yaml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"family \"family_disabled_hidden\" is disabled and hidden, \"family_disabled_hidden.variable1\" 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\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"the value \"**********\" is invalid for \"secret\", at least 10 characters are required, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/04_value_secret.yaml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"cannot set the value \"test\" to the family \"family\", it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/05_value_family.yaml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"variable or family \"dyn_unknown\" does not exist, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/06_dynamic_unknown.yaml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"variable \"leadership.follower_disabled\" at index \"0\" is disabled, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/07_leadership_disabled.yaml\"",
|
||||
"variable \"leadership.follower_disabled\" at index \"1\" is disabled, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/07_leadership_disabled.yaml\"",
|
||||
"variable \"leadership.follower_disabled\" at index \"2\" is disabled, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/07_leadership_disabled.yaml\"",
|
||||
"variable \"leadership.follower_disabled_at_index\" at index \"1\" is disabled, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/07_leadership_disabled.yaml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"variable or family \"leadership.unknwon\" does not exist, it will be ignored when loading from the YAML file \"/home/gnunux/git/stove/rougail-user-data-yaml/tests/errors/yaml/07_leadership_unknown.yaml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
%YAML 1.2
|
||||
---
|
||||
version: 1.1
|
||||
|
||||
variable:
|
||||
|
||||
secret:
|
||||
type: secret
|
||||
params:
|
||||
min_len: 10
|
||||
|
||||
variable_disabled:
|
||||
disabled: true
|
||||
|
||||
variable_disabled_hidden:
|
||||
disabled: true
|
||||
hidden: true
|
||||
|
||||
variable_int:
|
||||
type: number
|
||||
|
||||
family:
|
||||
|
||||
variable:
|
||||
|
||||
family_disabled:
|
||||
disabled: true
|
||||
|
||||
variable1:
|
||||
|
||||
variable2:
|
||||
|
||||
family_disabled_hidden:
|
||||
disabled: true
|
||||
hidden: true
|
||||
|
||||
variable1:
|
||||
|
||||
variable2:
|
||||
|
||||
dyn_{{ identifier }}:
|
||||
dynamic:
|
||||
- var1
|
||||
- var2
|
||||
|
||||
variable:
|
||||
|
||||
leadership:
|
||||
type: leadership
|
||||
|
||||
leader:
|
||||
|
||||
follower:
|
||||
|
||||
follower_disabled:
|
||||
disabled: true
|
||||
|
||||
follower_disabled_at_index:
|
||||
disabled:
|
||||
jinja: >-
|
||||
{% if index == 1 %}
|
||||
true
|
||||
{% else %}
|
||||
{% endif %}
|
||||
params:
|
||||
index:
|
||||
type: index
|
||||
...
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
---
|
||||
unknown: 1
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
family_disabled:
|
||||
variable1: test
|
||||
variable2: test
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
---
|
||||
variable_disabled: test
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
---
|
||||
variable_int: test
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
---
|
||||
family_disabled_hidden:
|
||||
variable1: test
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
---
|
||||
secret: a
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
---
|
||||
family: test
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
---
|
||||
dyn_unknown:
|
||||
variable: test
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
---
|
||||
leadership:
|
||||
- leader: test1
|
||||
follower: test1
|
||||
follower_disabled: test1
|
||||
follower_disabled_at_index: test1
|
||||
- leader: test2
|
||||
follower: test2
|
||||
follower_disabled: test2
|
||||
follower_disabled_at_index: test2
|
||||
- leader: test3
|
||||
follower: test3
|
||||
follower_disabled: test3
|
||||
follower_disabled_at_index: test3
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
leadership:
|
||||
- leader: test
|
||||
unknwon: test
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
---
|
||||
leadership:
|
||||
- leader: test
|
||||
follower: test1
|
||||
- follower: test1
|
||||
|
|
@ -1 +1 @@
|
|||
{}
|
||||
{}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{}
|
||||
{}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{}
|
||||
{}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1,5 +1,2 @@
|
|||
{
|
||||
"rougail": {
|
||||
"version": "string1"
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
version: string1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,2 @@
|
|||
{
|
||||
"rougail": {
|
||||
"version": "string1"
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
version: string1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,2 @@
|
|||
{
|
||||
"rougail": {
|
||||
"version": "string1"
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
version: string1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,2 @@
|
|||
{
|
||||
"rougail": {
|
||||
"empty": "string1"
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
empty: string1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,2 @@
|
|||
{
|
||||
"rougail": {
|
||||
"empty": "string1"
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
empty: string1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,2 @@
|
|||
{
|
||||
"rougail": {
|
||||
"empty": "string1"
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
empty: string1
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": "string1",
|
||||
"var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
var1: string1
|
||||
var2:
|
||||
- string1
|
||||
- string2
|
||||
- string3
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": "string1",
|
||||
"var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
var1: string1
|
||||
var2:
|
||||
- string1
|
||||
- string2
|
||||
- string3
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{}
|
||||
{}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
],
|
||||
"var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
var1:
|
||||
- string1
|
||||
- string2
|
||||
- string3
|
||||
var2:
|
||||
- string1
|
||||
- string2
|
||||
- string3
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
],
|
||||
"var2": [
|
||||
"string1",
|
||||
"string2",
|
||||
"string3"
|
||||
]
|
||||
}
|
||||
}
|
||||
rougail:
|
||||
var1:
|
||||
- string1
|
||||
- string2
|
||||
- string3
|
||||
var2:
|
||||
- string1
|
||||
- string2
|
||||
- string3
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{}
|
||||
{}
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": [
|
||||
"family \"rougail.leadership\" is hidden, \"rougail.leadership.var1\" (a first variable) will be ignored when loading from the YAML file \"tests/results/00_2default_calculated_params_permissive/file/all.yml\"",
|
||||
"family \"rougail.leadership\" is hidden, \"rougail.leadership.var2\" (a first variable) at index \"0\" will be ignored when loading from the YAML file \"tests/results/00_2default_calculated_params_permissive/file/all.yml\"",
|
||||
"index \"1\" is greater than the leadership length \"1\" for option \"rougail.leadership.var2\" (a first variable) in the YAML file \"tests/results/00_2default_calculated_params_permissive/file/all.yml\"",
|
||||
"index \"2\" is greater than the leadership length \"1\" for option \"rougail.leadership.var2\" (a first variable) in the YAML file \"tests/results/00_2default_calculated_params_permissive/file/all.yml\""
|
||||
]
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"leadership": [
|
||||
{
|
||||
"var1": "string1",
|
||||
"var2": "string1"
|
||||
},
|
||||
{
|
||||
"var1": "string2"
|
||||
},
|
||||
{
|
||||
"var1": "string3"
|
||||
}
|
||||
],
|
||||
"var2": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"leadership": [
|
||||
{
|
||||
"var1": "string1",
|
||||
"var2": "string1"
|
||||
},
|
||||
{
|
||||
"var1": "string2"
|
||||
},
|
||||
{
|
||||
"var1": "string3"
|
||||
}
|
||||
],
|
||||
"var2": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
"rougail.leadership.var1": [
|
||||
{
|
||||
"rougail.leadership.var1": "a_value",
|
||||
"rougail.leadership.var2": "a_value"
|
||||
}
|
||||
],
|
||||
"rougail.var2": "string1"
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
"rougail.leadership.var1": [
|
||||
{
|
||||
"rougail.leadership.var1": "a_value",
|
||||
"rougail.leadership.var2": "a_value"
|
||||
}
|
||||
],
|
||||
"rougail.var2": "a_value"
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": [
|
||||
"domain1.lan",
|
||||
"domain2.lan"
|
||||
],
|
||||
"var2": [
|
||||
"domain1.lan",
|
||||
"domain2.lan"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": [
|
||||
"domain1.lan",
|
||||
"domain2.lan"
|
||||
],
|
||||
"var2": [
|
||||
"domain1.lan",
|
||||
"domain2.lan"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": [
|
||||
"domain1.lan",
|
||||
"domain2.lan"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"rougail.var1": [
|
||||
"domain1.lan",
|
||||
"domain2.lan"
|
||||
],
|
||||
"rougail.var2": [
|
||||
"domain1.lan",
|
||||
"domain2.lan"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"rougail.var1": [
|
||||
"domain1.lan",
|
||||
"domain2.lan"
|
||||
],
|
||||
"rougail.var2": [
|
||||
"domain1.lan",
|
||||
"domain2.lan"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": "string1",
|
||||
"var2": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": "string1",
|
||||
"var2": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"rougail.var1": "string1",
|
||||
"rougail.var2": "string1"
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"rougail.var1": "string1",
|
||||
"rougail.var2": "string1"
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": "string1",
|
||||
"var2": "string1",
|
||||
"var3": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": "string1",
|
||||
"var2": "string1",
|
||||
"var3": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"rougail": {
|
||||
"var1": "string1",
|
||||
"var3": "string1"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"rougail.var1": "string1",
|
||||
"rougail.var2": "string1",
|
||||
"rougail.var3": "string1"
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"rougail.var1": "string1",
|
||||
"rougail.var2": "string1",
|
||||
"rougail.var3": "string1"
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue