commit 7b805f9c0cb8c2faacc62f15b20e1d96a60d40ed
Author: Sagar Khushalani <sagar.khushalani@garmin.com>
Date:   Mon Oct 12 09:38:32 2020 -0500

    Add missing vault-secrets options
    
    This patch adds the following options that are missing from JJB
    but available in the UI:
    
    - fail if path not found
    - skip ssl verification
    - k/v engine version
    
    Change-Id: Id8e14d63c668a1ef826ae88ae3ce0360609bde99

diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py
index 9a2a01c..6a73d95 100644
--- a/jenkins_jobs/modules/wrappers.py
+++ b/jenkins_jobs/modules/wrappers.py
@@ -1289,11 +1289,16 @@ def vault_secrets(registry, xml_parent, data):
 
     :arg str vault-url: Vault URL
     :arg str credentials-id: Vault Credential
+    :arg str engine-version: Vault K/V Engine version
+    :arg bool fail-if-not-found: Fail if the secret path is not found
+    :arg bool skip-ssl-verification: Skip verification of SSL certs
     :arg list secrets: List of secrets
 
       :secrets:
         * **secret-path** (`str`) --
           The path of the secret in the vault server
+        * **engine-version** (`str`) --
+          Vault K/V Engine version
 
         :secret-values:
           * **secret-values** (`list`) -- List of key / value pairs
@@ -1321,12 +1326,18 @@ def vault_secrets(registry, xml_parent, data):
     conf_mapping = [
         ("vault-url", "vaultUrl", ""),
         ("credentials-id", "vaultCredentialId", ""),
+        ("engine-version", "engineVersion", "1"),
+        ("fail-if-not-found", "failIfNotFound", "true"),
+        ("skip-ssl-verification", "skipSslVerification", "false"),
     ]
     helpers.convert_mapping_to_xml(
         configuration, data, conf_mapping, fail_required=True
     )
 
-    secret_obj_mapping = [("secret-path", "path", "")]
+    secret_obj_mapping = [
+        ("secret-path", "path", ""),
+        ("engine-version", "engineVersion", "1"),
+    ]
     secret_value_mapping = [("env-var", "envVar", ""), ("vault-key", "vaultKey", "")]
     secretsobj = XML.SubElement(vault, "vaultSecrets")
     secrets = data.get("secrets", [])
diff --git a/tests/wrappers/fixtures/vault-full.xml b/tests/wrappers/fixtures/vault-full.xml
index cc17b80..9829d68 100644
--- a/tests/wrappers/fixtures/vault-full.xml
+++ b/tests/wrappers/fixtures/vault-full.xml
@@ -5,10 +5,14 @@
       <configuration>
         <vaultUrl>http://127.0.0.1:8200</vaultUrl>
         <vaultCredentialId>myCredentials</vaultCredentialId>
+        <engineVersion>2</engineVersion>
+        <failIfNotFound>false</failIfNotFound>
+        <skipSslVerification>true</skipSslVerification>
       </configuration>
       <vaultSecrets>
         <com.datapipe.jenkins.vault.model.VaultSecret>
           <path>secret/my-secret</path>
+          <engineVersion>1</engineVersion>
           <secretValues>
             <com.datapipe.jenkins.vault.model.VaultSecretValue>
               <envVar>USERNAME</envVar>
@@ -22,6 +26,7 @@
         </com.datapipe.jenkins.vault.model.VaultSecret>
         <com.datapipe.jenkins.vault.model.VaultSecret>
           <path>secret/my-secret2</path>
+          <engineVersion>2</engineVersion>
           <secretValues>
             <com.datapipe.jenkins.vault.model.VaultSecretValue>
               <envVar>USERNAME2</envVar>
diff --git a/tests/wrappers/fixtures/vault-full.yaml b/tests/wrappers/fixtures/vault-full.yaml
index 74d6960..082f96e 100644
--- a/tests/wrappers/fixtures/vault-full.yaml
+++ b/tests/wrappers/fixtures/vault-full.yaml
@@ -2,6 +2,9 @@ wrappers:
   - vault-secrets:
       vault-url: 'http://127.0.0.1:8200'
       credentials-id: 'myCredentials'
+      fail-if-not-found: 'false'
+      skip-ssl-verification: 'true'
+      engine-version: '2'
       secrets:
         - secret-path: 'secret/my-secret'
           secret-values:
@@ -10,6 +13,7 @@ wrappers:
             - env-var: 'PASSWORD'
               vault-key: 'password'
         - secret-path: 'secret/my-secret2'
+          engine-version: '2'
           secret-values:
             - env-var: 'USERNAME2'
               vault-key: 'username2'
diff --git a/tests/wrappers/fixtures/vault-minimal.xml b/tests/wrappers/fixtures/vault-minimal.xml
index 2b69a86..7079d2f 100644
--- a/tests/wrappers/fixtures/vault-minimal.xml
+++ b/tests/wrappers/fixtures/vault-minimal.xml
@@ -5,10 +5,14 @@
       <configuration>
         <vaultUrl>http://127.0.0.1:8200</vaultUrl>
         <vaultCredentialId>myCredentials</vaultCredentialId>
+        <engineVersion>1</engineVersion>
+        <failIfNotFound>true</failIfNotFound>
+        <skipSslVerification>false</skipSslVerification>
       </configuration>
       <vaultSecrets>
         <com.datapipe.jenkins.vault.model.VaultSecret>
           <path>secret/my-token</path>
+          <engineVersion>1</engineVersion>
           <secretValues>
             <com.datapipe.jenkins.vault.model.VaultSecretValue>
               <envVar>TOKEN</envVar>