From bed9c868f6bfe204d8b76c8f57979793b15bacee Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Mon, 17 Jun 2019 19:11:26 +0200 Subject: [PATCH] Test against 1.1.3; update Drone CI config; minor test cleanup --- .drone.yml | 50 ++++++++----------- .travis.yml | 2 +- README.md | 2 +- .../connector/HTTPVaultConnectorTest.java | 2 +- .../HTTPVaultConnectorBuilderTest.java | 8 +-- 5 files changed, 28 insertions(+), 36 deletions(-) diff --git a/.drone.yml b/.drone.yml index e232992..b93e52e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,33 +1,25 @@ kind: pipeline name: default -clone: - disable: true - steps: -- name: clone - image: plugins/git - settings: - depth: 10 - skip_verify: true -- name: test-online - image: maven:3-jdk-11-slim - commands: - - export VAULT_VERSION=1.1.2 - - 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: - branch: - - master -- name: test-offline - image: maven:3-jdk-11-slim - commands: - - mvn clean test -Dtest='!HTTPVaultConnectorTest' - when: - branch: - - develop - - feature/* + - name: test-online + image: maven:3-jdk-11-slim + commands: + - export VAULT_VERSION=1.1.3 + - 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: + branch: + - master + - name: test-offline + image: maven:3-jdk-11-slim + commands: + - mvn clean test -Dtest='!HTTPVaultConnectorTest' + when: + branch: + - develop + - feature/* diff --git a/.travis.yml b/.travis.yml index 924bfd4..0ec610e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ 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:. VAULT_VERSION=1.1.2 + - PATH=$PATH:. VAULT_VERSION=1.1.3 before_script: - 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 diff --git a/README.md b/README.md index 78d7bd5..a29e1d9 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject * SQL secret handling * KV v1 and v2 support * Connector Factory with builder pattern -* Tested against Vault 1.1.2 +* Tested against Vault 1.1.3 ## Maven Artifact diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index cd1f6e6..2f661bf 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -51,7 +51,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; * @since 0.1 */ public class HTTPVaultConnectorTest { - private static String VAULT_VERSION = "1.1.2"; // the vault version this test is supposed to run against + private static String VAULT_VERSION = "1.1.3"; // the vault version this test is supposed to run against private static final String KEY1 = "E38bkCm0VhUvpdCKGQpcohhD9XmcHJ/2hreOSY019Lho"; private static final String KEY2 = "O5OHwDleY3IiPdgw61cgHlhsrEm6tVJkrxhF6QAnILd1"; private static final String KEY3 = "mw7Bm3nbt/UWa/juDjjL2EPQ04kiJ0saC5JEXwJvXYsB"; diff --git a/src/test/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilderTest.java b/src/test/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilderTest.java index 34b30b7..c1b657b 100644 --- a/src/test/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilderTest.java +++ b/src/test/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilderTest.java @@ -42,9 +42,9 @@ import static org.junit.jupiter.api.Assertions.fail; */ @EnableRuleMigrationSupport public class HTTPVaultConnectorBuilderTest { - private static String VAULT_ADDR = "https://localhost:8201"; - private static Integer VAULT_MAX_RETRIES = 13; - private static String VAULT_TOKEN = "00001111-2222-3333-4444-555566667777"; + private static final String VAULT_ADDR = "https://localhost:8201"; + private static final Integer VAULT_MAX_RETRIES = 13; + private static final String VAULT_TOKEN = "00001111-2222-3333-4444-555566667777"; @TempDir File tempDir; @@ -56,7 +56,7 @@ public class HTTPVaultConnectorBuilderTest { * Test building from environment variables */ @Test - public void testFromEnv() throws NoSuchFieldException, IllegalAccessException, IOException { + void testFromEnv() throws NoSuchFieldException, IllegalAccessException, IOException { /* Provide address only should be enough */ setenv(VAULT_ADDR, null, null, null);