From eb0f5901abacc04d518720c605a38b9d3e2598c8 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 11 Feb 2026 21:31:55 +0100 Subject: [PATCH] fix: user-data-ansible can set a personalise source --- README.fr.md | 23 ++++++++++ README.md | 23 +++++++++- .../LC_MESSAGES/rougail_user_data_ansible.po | 40 ++++++++++++------ locale/rougail_user_data_ansible.pot | 25 ++++++++--- src/rougail/user_data_ansible/__init__.py | 3 +- src/rougail/user_data_ansible/config.py | 34 +++++++-------- src/rougail/user_data_ansible/i18n.py | 2 +- .../LC_MESSAGES/rougail_user_data_ansible.mo | Bin 679 -> 1012 bytes 8 files changed, 107 insertions(+), 43 deletions(-) create mode 100644 README.fr.md diff --git a/README.fr.md b/README.fr.md new file mode 100644 index 0000000..03a93d6 --- /dev/null +++ b/README.fr.md @@ -0,0 +1,23 @@ +--- +gitea: none +include_toc: true +--- +[🇬🇧 (EN)](README.md) - [🇫🇷 (FR)](README.fr.md) + +=============== +{} +## Charge les données utilisateur depuis un fichier compatible avec Ansible + +> [!NOTE] +> +> **Chemin** : ansible\ +> *`désactivé`*\ +> **Désactivé** : si ansible n'est pas définit dans "[Sélection pour données utilisateur](#step.user_data)" + +| Variable | Description | Valeur par défaut | Type | Contrôle des accès | Validateur | +|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------|---------------------|--------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------| +| **ansible.filename**
**Ligne de commande** :
--ansible.filename
**Variable d'environnement** : ANSIBLE.FILENAME | Nom du fichier d'inventaire Ansible. | | [`UNIX filename`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `obligatoire` | *`désactivé`*
**Désactivé** : si ansible n'est pas définit dans "[Sélection pour données utilisateur](#step.user_data)" | `unique`
• le nom de fichier peut ĂŞtre une chemin relatif
• le fichier doit exister
• type de fichier autorisĂ©: "file". | +| **ansible.secret**
**Ligne de commande** :
--ansible.secret
**Variable d'environnement** : ANSIBLE.SECRET | Secret pour déchiffrer le fichier. | | [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `obligatoire` | *`désactivé`*
**Désactivé** : si ansible n'est pas définit dans "[Sélection pour données utilisateur](#step.user_data)" | | +| **ansible.file_with_secrets**
**Ligne de commande** :
--ansible.file_with_secrets
**Variable d'environnement** : ANSIBLE.FILE_WITH_SECRETS | Les fichiers Ansible qui peuvent contenir des secrets. | all | [`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `obligatoire` | *`désactivé`*
**Désactivé** : si ansible n'est pas définit dans "[Sélection pour données utilisateur](#step.user_data)" | **Choix** :
• all
• first
• last
• none | + + diff --git a/README.md b/README.md index 49f2c4c..34914e3 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,23 @@ -# rougail-user-data-ansible +--- +gitea: none +include_toc: true +--- +[🇬🇧 (EN)](README.md) - [🇫🇷 (FR)](README.fr.md) + +=============== +{} +## Load user data from Ansible compatible file + +> [!NOTE] +> +> **Path**: ansible\ +> *`disabled`*\ +> **Disabled**: if ansible is not set in "[Select for user datas](#step.user_data)" + +| Variable | Description | Default value | Type | Access control | Validator | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------|-----------------|------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------| +| **ansible.filename**
**Command line**:
--ansible.filename
**Environment variable**: ANSIBLE.FILENAME | Ansible filename inventory. | | [`UNIX filename`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `mandatory` | *`disabled`*
**Disabled**: if ansible is not set in "[Select for user datas](#step.user_data)" | `unique`
• this filename could be a relative path
• this file must exist
• file type allowed: "file". | +| **ansible.secret**
**Command line**:
--ansible.secret
**Environment variable**: ANSIBLE.SECRET | Secret to decrypt file. | | [`secret`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | *`disabled`*
**Disabled**: if ansible is not set in "[Select for user datas](#step.user_data)" | | +| **ansible.file_with_secrets**
**Command line**:
--ansible.file_with_secrets
**Environment variable**: ANSIBLE.FILE_WITH_SECRETS | Ansible files that may contain secrets. | all | [`choice`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | *`disabled`*
**Disabled**: if ansible is not set in "[Select for user datas](#step.user_data)" | **Choices**:
• all
• first
• last
• none | + diff --git a/locale/fr/LC_MESSAGES/rougail_user_data_ansible.po b/locale/fr/LC_MESSAGES/rougail_user_data_ansible.po index 7d9ed13..3161727 100644 --- a/locale/fr/LC_MESSAGES/rougail_user_data_ansible.po +++ b/locale/fr/LC_MESSAGES/rougail_user_data_ansible.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2025-02-10 09:15+0100\n" -"PO-Revision-Date: 2025-02-10 09:15+0100\n" +"POT-Creation-Date: 2026-02-11 21:30+0100\n" +"PO-Revision-Date: 2026-02-11 21:31+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" @@ -14,26 +14,38 @@ msgstr "" "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" +"X-Generator: Poedit 3.8\n" -#: src/rougail/user_data_ansible/__init__.py:47 +#: src/rougail/user_data_ansible/__init__.py:48 msgid "ansible is not set in step.user_data" msgstr "ansible n'est pas dĂ©finit dans step.user_data" -#: src/rougail/user_data_ansible/config.py:30 -msgid "Configuration of user data Ansible" -msgstr "Configuration des donnĂ©es utilisateurs Ansible" +#: src/rougail/user_data_ansible/__init__.py:56 +msgid "the Ansible file \"{0}\"" +msgstr "le ficher Ansible \"{0}\"" -#: src/rougail/user_data_ansible/config.py:39 +#: src/rougail/user_data_ansible/config.py:30 +msgid "Load user data from Ansible compatible file" +msgstr "Charge les donnĂ©es utilisateur depuis un fichier compatible avec Ansible" + +#: src/rougail/user_data_ansible/config.py:35 +#: src/rougail/user_data_ansible/config.py:50 +#: src/rougail/user_data_ansible/config.py:59 +#: src/rougail/user_data_ansible/config.py:73 +msgid "if ansible is not set in \"step.user_data\"" +msgstr "si ansible n'est pas dĂ©finit dans \"step.user_data\"" + +#: src/rougail/user_data_ansible/config.py:38 msgid "Ansible filename inventory" msgstr "Nom du fichier d'inventaire Ansible" -#: src/rougail/user_data_ansible/config.py:55 +#: src/rougail/user_data_ansible/config.py:53 msgid "Secret to decrypt file" msgstr "Secret pour dĂ©chiffrer le fichier" -#: src/rougail/user_data_ansible/config.py:65 -#, fuzzy -#| msgid "Ansible file that may contain passwords" -msgid "Ansible file that may contain secrets" -msgstr "Fichier Ansible qui peuvent contenir des secrets" +#: src/rougail/user_data_ansible/config.py:62 +msgid "Ansible files that may contain secrets" +msgstr "Les fichiers Ansible qui peuvent contenir des secrets" + +#~ msgid "Configuration of user data Ansible" +#~ msgstr "Configuration des donnĂ©es utilisateurs Ansible" diff --git a/locale/rougail_user_data_ansible.pot b/locale/rougail_user_data_ansible.pot index 004637f..492fd71 100644 --- a/locale/rougail_user_data_ansible.pot +++ b/locale/rougail_user_data_ansible.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-10-10 08:05+0200\n" +"POT-Creation-Date: 2026-02-11 21:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,19 +19,30 @@ msgstr "" msgid "ansible is not set in step.user_data" msgstr "" -#: src/rougail/user_data_ansible/config.py:30 -msgid "Configuration of user data Ansible" +#: src/rougail/user_data_ansible/__init__.py:56 +msgid "the Ansible file \"{0}\"" msgstr "" -#: src/rougail/user_data_ansible/config.py:39 +#: src/rougail/user_data_ansible/config.py:30 +msgid "Load user data from Ansible compatible file" +msgstr "" + +#: src/rougail/user_data_ansible/config.py:35 +#: src/rougail/user_data_ansible/config.py:50 +#: src/rougail/user_data_ansible/config.py:59 +#: src/rougail/user_data_ansible/config.py:73 +msgid "if ansible is not set in \"step.user_data\"" +msgstr "" + +#: src/rougail/user_data_ansible/config.py:38 msgid "Ansible filename inventory" msgstr "" -#: src/rougail/user_data_ansible/config.py:55 +#: src/rougail/user_data_ansible/config.py:53 msgid "Secret to decrypt file" msgstr "" -#: src/rougail/user_data_ansible/config.py:65 -msgid "Ansible file that may contain secrets" +#: src/rougail/user_data_ansible/config.py:62 +msgid "Ansible files that may contain secrets" msgstr "" diff --git a/src/rougail/user_data_ansible/__init__.py b/src/rougail/user_data_ansible/__init__.py index 3ba05a4..84e3ba4 100644 --- a/src/rougail/user_data_ansible/__init__.py +++ b/src/rougail/user_data_ansible/__init__.py @@ -1,6 +1,6 @@ """ Silique (https://www.silique.fr) -Copyright (C) 2024-2025 +Copyright (C) 2024-2026 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 @@ -53,6 +53,7 @@ class RougailUserDataAnsible(RougailUserDataYaml): self.config = config self.errors = [] self.warnings = [] + self.source = _('the Ansible file "{0}"') def open(self, filename: str) -> dict: """Open file diff --git a/src/rougail/user_data_ansible/config.py b/src/rougail/user_data_ansible/config.py index de23990..ca91130 100644 --- a/src/rougail/user_data_ansible/config.py +++ b/src/rougail/user_data_ansible/config.py @@ -1,6 +1,6 @@ """ Silique (https://www.silique.fr) -Copyright (C) 2024-2025 +Copyright (C) 2024-2026 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 @@ -27,13 +27,12 @@ def get_rougail_config( # or create a new only only for user data options = f""" ansible: - description: {_("Configuration of user data Ansible")} + description: {_("Load user data from Ansible compatible file")} disabled: - type: jinja jinja: | - {{% if step.user_data is propertyerror or 'ansible' not in step.user_data %}} - disabled - {{% endif %}} + {{{{ _.step.user_data is propertyerror or 'ansible' not in _.step.user_data }}}} + return_type: boolean + description: {_('if ansible is not set in "step.user_data"')} filename: description: {_("Ansible filename inventory")} @@ -45,24 +44,22 @@ ansible: types: - file disabled: - type: jinja jinja: | - {{% if step.user_data is propertyerror or 'ansible' not in step.user_data %}} - disabled - {{% endif %}} + {{{{ _.step.user_data is propertyerror or 'ansible' not in _.step.user_data }}}} + return_type: boolean + description: {_('if ansible is not set in "step.user_data"')} secret: description: {_("Secret to decrypt file")} type: secret disabled: - type: jinja jinja: | - {{% if step.user_data is propertyerror or 'ansible' not in step.user_data %}} - disabled - {{% endif %}} + {{{{ _.step.user_data is propertyerror or 'ansible' not in _.step.user_data }}}} + return_type: boolean + description: {_('if ansible is not set in "step.user_data"')} file_with_secrets: - description: {_("Ansible file that may contain secrets")} + description: {_("Ansible files that may contain secrets")} default: all choices: - all @@ -70,11 +67,10 @@ ansible: - last - none disabled: - type: jinja jinja: | - {{% if step.user_data is propertyerror or 'ansible' not in step.user_data %}} - disabled - {{% endif %}} + {{{{ _.step.user_data is propertyerror or 'ansible' not in _.step.user_data }}}} + return_type: boolean + description: {_('if ansible is not set in "step.user_data"')} """ return { "name": "ansible", diff --git a/src/rougail/user_data_ansible/i18n.py b/src/rougail/user_data_ansible/i18n.py index c0b944d..fcdc9bd 100644 --- a/src/rougail/user_data_ansible/i18n.py +++ b/src/rougail/user_data_ansible/i18n.py @@ -1,6 +1,6 @@ """Internationalisation utilities Silique (https://www.silique.fr) -Copyright (C) 2024-2025 +Copyright (C) 2024-2026 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 diff --git a/src/rougail/user_data_ansible/locale/fr/LC_MESSAGES/rougail_user_data_ansible.mo b/src/rougail/user_data_ansible/locale/fr/LC_MESSAGES/rougail_user_data_ansible.mo index 99b33b51388f2a6c716e7825326b794ef8cdfe33..e1465de983950b853d2b4197ddf2eaa56fa26be0 100644 GIT binary patch delta 547 zcmZXQ%SyvQ6ox0gSfRRcQ9%TUD3wxLdch0bhzNpEL{MA_GNuzV&?Yf6DHf5ge1H<% z=~~^2Z(tYt0YF#nlz&O`b;(;v;HZV6%H%kZGwiIV=PEFC~k}8WS+F?CvIJRQKrji>TSCTXx z)}p@T9&ItjsOdQ!8e0vg<1!Uh84S0Q!lZ*yZdI3xyXDYy8k%&XEIu)X|55#_a;*mm ztvI`0s?x;^=i=2hT3NEtL6JmG-V3I65Nv$?}aa@%l$65)woe^3-pDTako1b z^UgU9Cu%vi{rZH1uS8o&rnn!zb$x-99oI&g$qcN^jrgnJC~=sSf(DlfTKG55cx{G- LrNpZk4@CX|#J7qY delta 251 zcmeyuzMQrGo)F7a1|VPsVi_QI0b+I_&H-W&=m26VAnpWWB_Lh`#9}~v9Eeqb_#P1d z1!87K1_osy&B(;Spbw-~fiy^cD3I0z(iK1&s00p}fh?e%Yz!OKDTyVC3XXZjnMspP80{x-VbtO^)ip5EH8fB#u(UEXo&1{d r2&3ub4NPk4s0O5@7AvIW=j9z<31pO(WaeZRCzhm^78OtSWsU{_if1zN