diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py index 10bb0a3e4..efd0cc2fe 100644 --- a/jenkins_jobs/modules/wrappers.py +++ b/jenkins_jobs/modules/wrappers.py @@ -600,23 +600,22 @@ def inject_passwords(parser, xml_parent, data): `_ :arg bool global: inject global passwords to the job + :arg bool mask-password-params: mask passsword parameters :arg list job-passwords: key value pair of job passwords :Parameter: * **name** (`str`) Name of password * **password** (`str`) Encrypted password - Example:: + Example: + + .. literalinclude:: /../../tests/wrappers/fixtures/passwords001.yaml - wrappers: - - inject-passwords: - global: true - job-passwords: - - name: ADMIN - password: 0v8ZCNaHwq1hcx+sHwRLdg9424uBh4Pin0zO4sBIb+U= """ eib = XML.SubElement(xml_parent, 'EnvInjectPasswordWrapper') XML.SubElement(eib, 'injectGlobalPasswords').text = \ str(data.get('global', False)).lower() + XML.SubElement(eib, 'maskPasswordParameters').text = \ + str(data.get('mask-password-params', False)).lower() entries = XML.SubElement(eib, 'passwordEntries') passwords = data.get('job-passwords', []) if passwords: diff --git a/tests/wrappers/fixtures/passwords001.xml b/tests/wrappers/fixtures/passwords001.xml new file mode 100644 index 000000000..da147479e --- /dev/null +++ b/tests/wrappers/fixtures/passwords001.xml @@ -0,0 +1,15 @@ + + + + + true + true + + + ADMIN + 0v8ZCNaHwq1hcx+sHwRLdg9424uBh4Pin0zO4sBIb+U= + + + + + diff --git a/tests/wrappers/fixtures/passwords001.yaml b/tests/wrappers/fixtures/passwords001.yaml new file mode 100644 index 000000000..df969d0ee --- /dev/null +++ b/tests/wrappers/fixtures/passwords001.yaml @@ -0,0 +1,8 @@ +wrappers: + - inject-passwords: + global: true + mask-password-params: true + job-passwords: + - name: ADMIN + password: 0v8ZCNaHwq1hcx+sHwRLdg9424uBh4Pin0zO4sBIb+U= +