feat: retry in case vault is not reachable (#107)

elastic · Jul 4, 2019 · 9a58bcf · 9a58bcf
1 parent 0ec5cb7
commit 9a58bcf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/test/groovy/GetVaultSecretStepTests.groovy b/src/test/groovy/GetVaultSecretStepTests.groovy
@@ -80,6 +80,11 @@ class GetVaultSecretStepTests extends BasePipelineTest {
       def script = loadScript("vars/toJSON.groovy")
       return script.call(s)
       })
+    helper.registerAllowedMethod("retry", [Integer.class, Closure.class], { i, c ->
+      c.call()
+    })
+    helper.registerAllowedMethod("randomNumber", [Map.class], { m -> return m.min })
+    helper.registerAllowedMethod("sleep", [Integer.class], { 'OK' })
   }
 
   @Test

diff --git a/vars/getVaultSecret.groovy b/vars/getVaultSecret.groovy
@@ -49,8 +49,11 @@ def readSecret(secret){
     string(credentialsId: 'vault-addr', variable: 'VAULT_ADDR'),
     string(credentialsId: 'vault-role-id', variable: 'VAULT_ROLE_ID'),
     string(credentialsId: 'vault-secret-id', variable: 'VAULT_SECRET_ID')]) {
-    def token = getVaultToken(env.VAULT_ADDR, env.VAULT_ROLE_ID, env.VAULT_SECRET_ID)
-    props = getVaultSecretObject(env.VAULT_ADDR, secret, token)
+    retry(2) {
+      sleep randomNumber(min: 5, max: 10)
+      def token = getVaultToken(env.VAULT_ADDR, env.VAULT_ROLE_ID, env.VAULT_SECRET_ID)
+      props = getVaultSecretObject(env.VAULT_ADDR, secret, token)
+    }
     //we do not have permissions to revoke a token.
     //revokeToken(env.VAULT_ADDR, token)
   }