diff --git a/.drone.yml b/.drone.yml index 662074d..18fc3dc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,10 +13,11 @@ steps: - name: test-online image: maven:3.5-jdk-8-alpine commands: - - wget https://releases.hashicorp.com/vault/0.11.5/vault_0.11.5_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.11.5/vault_0.11.5_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.11.5_linux_amd64.zip - - rm vault_0.11.5_linux_amd64.zip + - export VAULT_VERSION=0.11.5 + - wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_${VAULT_VERSION}_linux_amd64.zip + - rm vault_${VAULT_VERSION}_linux_amd64.zip - mv vault /bin/ - mvn clean test when: diff --git a/.travis.yml b/.travis.yml index 9d59ceb..357e491 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,12 @@ addons: token: secure: "sM9OfX5jW764pn9cb2LSXArnXucKMws+eGeg5NnZxHRcGYt4hpBKLSregBSsBNzUoWVj0zNzPCpnh+UQvgxQzUerOqwEdjTBpy3SNPaxSn7UpoSg+Wz3aUmL9ugmx01b51/wMG4UCHEwTZt2tpgTPVtw8K6uSO78e0dSICCBHDnRcdQwOjMEQHIJJ/qHVRwuy/MzLCAP3W1JPZlsphZg9QsFyhB4hW97dE90joZezfocQIv2xI/r6k+BLz0pY6MxYCul0RiDumaiaej0CPvEJI/uSu//BAQjUdHw+mQgnKUYIbrn2ONOviwNfwdr94JyoZEN2B6zASUmNLjPf4AbIojDeyS+CrpQpm17EVm/Qk/Ds+Xra4PPPIcsZhiWzV0KoDUz9xLfXuRJ526VT5tDPiaeI7oETf0+8l+JIS1b399FyqHi7smzjpvC6GuKflQrbuHK4MuKzDh7WTHiqokGG4SS0wOQIaaHB3dfdwwQzPh6IM24e8CETxh3DjMeqUTU4DWmv5po55jZ934TtxVQvVN78bTG9O0zS9u+JmRY04OZ+OaXuFam6MfMUFQi0EPZzdGul/oWSibGUu3bNfVEBp60CnJwYNM/dKG6U7pJthLHvSwiQFOdKzHZ+l1jZJ4gPaXaIGqpwqVGr28ntqA/El1rytPixr2driE6bYMt5jw=" env: - - PATH=$PATH:. + - PATH=$PATH:. VAULT_VERSION=0.11.5 before_script: - - wget https://releases.hashicorp.com/vault/0.11.5/vault_0.11.5_linux_amd64.zip - - wget -q -O - https://releases.hashicorp.com/vault/0.11.5/vault_0.11.5_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_0.11.5_linux_amd64.zip - - rm vault_0.11.5_linux_amd64.zip + - wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip + - wget -q -O - https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_${VAULT_VERSION}_linux_amd64.zip + - rm vault_${VAULT_VERSION}_linux_amd64.zip cache: directories: - '$HOME/.m2/repository' diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 93d29c4..59bff1e 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorTest { - private static final String VAULT_VERISON = "0.11.5"; // the vault version this test is supposed to run against + private static String VAULT_VERSION = "0.11.5"; // the vault version this test is supposed to run against private static final String KEY = "81011a8061e5c028bd0d9503eeba40bd9054b9af0408d080cb24f57405c27a61"; private static final String TOKEN_ROOT = "d1bd50e2-587b-6e68-d80b-a9a507625cb7"; private static final String USER_VALID = "validUser"; @@ -81,6 +81,15 @@ public class HTTPVaultConnectorTest { @Rule public TemporaryFolder tmpDir = new TemporaryFolder(); + @BeforeAll + public static void init() { + // Override vault version if defined in sysenv. + if (System.getenv("VAULT_VERSION") != null) { + VAULT_VERSION = System.getenv("VAULT_VERSION"); + System.out.println("Vault version set to " + VAULT_VERSION); + } + } + /** * Initialize Vault instance with generated configuration and provided file backend. * Requires "vault" binary to be in current user's executable path. Not using MLock, so no extended rights required. @@ -162,7 +171,7 @@ public class HTTPVaultConnectorTest { fail("Retrieving health status failed: " + e.getMessage()); } assertThat("Health response should be set", res, is(notNullValue())); - assertThat("Unexpected version", res.getVersion(), is(VAULT_VERISON)); + assertThat("Unexpected version", res.getVersion(), is(VAULT_VERSION)); assertThat("Unexpected init status", res.isInitialized(), is(true)); assertThat("Unexpected seal status", res.isSealed(), is(false)); assertThat("Unexpected standby status", res.isStandby(), is(false));