jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "vault-secrets: Utilize convert_mapping_to_xml"

This commit is contained in:
Zuul 2018-09-04 19:51:05 +00:00 committed by Gerrit Code Review
parent 75854f6a7e 32a5abfe1d
commit 01ec6d761e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jenkins_jobs/modules/wrappers.py
View File

@ -1099,26 +1099,29 @@ def vault_secrets(registry, xml_parent, data):
helpers.convert_mapping_to_xml(
configuration, data, conf_mapping, fail_required=True)
secret_obj_mapping = [
('secret-path', 'path', ''),
]
secret_value_mapping = [
('env-var', 'envVar', ''),
('vault-key', 'vaultKey', ''),
]
secretsobj = XML.SubElement(vault, 'vaultSecrets')
secrets = data.get('secrets', [])
for secret in secrets:
secretobj = XML.SubElement(
secretsobj, 'com.datapipe.jenkins.vault.model.VaultSecret')
XML.SubElement(
secretobj, 'path').text = secret.get('secret-path', '')
helpers.convert_mapping_to_xml(
secretobj, secret, secret_obj_mapping, fail_required=False)
secretvaluesobj = XML.SubElement(secretobj, 'secretValues')
for secretvalue in secret['secret-values']:
secretvalueobj = XML.SubElement(
secretvaluesobj,
'com.datapipe.jenkins.vault.model.VaultSecretValue')
XML.SubElement(
secretvalueobj,
'envVar').text = \
secretvalue.get('env-var', '')
XML.SubElement(
secretvalueobj,
'vaultKey').text = \
secretvalue.get('vault-key', '')
helpers.convert_mapping_to_xml(
secretvalueobj, secretvalue,
secret_value_mapping, fail_required=False)
XML.SubElement(vault, 'valuesToMask')
XML.SubElement(vault, 'vaultAccessor')