From e0887e767c98190064813a2355a10970cd335f36 Mon Sep 17 00:00:00 2001 From: Yolande Amate Date: Sun, 2 Jul 2017 01:16:57 +0100 Subject: [PATCH] Update inject_passwords to use convert_xml() Change-Id: Id89e422b0b6d758fa9fd83805197f243e65b90e6 --- jenkins_jobs/modules/wrappers.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py index acf6c1fc3..08903492c 100644 --- a/jenkins_jobs/modules/wrappers.py +++ b/jenkins_jobs/modules/wrappers.py @@ -984,17 +984,21 @@ def inject_passwords(registry, xml_parent, data): """ 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() + mapping = [ + ('global', 'injectGlobalPasswords', False), + ('mask-password-params', 'maskPasswordParameters', False)] + convert_mapping_to_xml(eib, data, mapping, fail_required=True) + entries = XML.SubElement(eib, 'passwordEntries') passwords = data.get('job-passwords', []) if passwords: for password in passwords: entry = XML.SubElement(entries, 'EnvInjectPasswordEntry') - XML.SubElement(entry, 'name').text = password['name'] - XML.SubElement(entry, 'value').text = password['password'] + mapping = [ + ('name', 'name', None), + ('password', 'value', None)] + convert_mapping_to_xml(entry, password, + mapping, fail_required=True) def env_file(registry, xml_parent, data):