Test against 1.1.3; update Drone CI config; minor test cleanup
This commit is contained in:
parent
7a45af8856
commit
bed9c868f6
50
.drone.yml
50
.drone.yml
@ -1,33 +1,25 @@
|
|||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: default
|
name: default
|
||||||
|
|
||||||
clone:
|
|
||||||
disable: true
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: clone
|
- name: test-online
|
||||||
image: plugins/git
|
image: maven:3-jdk-11-slim
|
||||||
settings:
|
commands:
|
||||||
depth: 10
|
- export VAULT_VERSION=1.1.3
|
||||||
skip_verify: true
|
- wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip
|
||||||
- name: test-online
|
- wget -q -O - https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c
|
||||||
image: maven:3-jdk-11-slim
|
- unzip vault_${VAULT_VERSION}_linux_amd64.zip
|
||||||
commands:
|
- rm vault_${VAULT_VERSION}_linux_amd64.zip
|
||||||
- export VAULT_VERSION=1.1.2
|
- mv vault /bin/
|
||||||
- wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip
|
- mvn clean test
|
||||||
- wget -q -O - https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c
|
when:
|
||||||
- unzip vault_${VAULT_VERSION}_linux_amd64.zip
|
branch:
|
||||||
- rm vault_${VAULT_VERSION}_linux_amd64.zip
|
- master
|
||||||
- mv vault /bin/
|
- name: test-offline
|
||||||
- mvn clean test
|
image: maven:3-jdk-11-slim
|
||||||
when:
|
commands:
|
||||||
branch:
|
- mvn clean test -Dtest='!HTTPVaultConnectorTest'
|
||||||
- master
|
when:
|
||||||
- name: test-offline
|
branch:
|
||||||
image: maven:3-jdk-11-slim
|
- develop
|
||||||
commands:
|
- feature/*
|
||||||
- mvn clean test -Dtest='!HTTPVaultConnectorTest'
|
|
||||||
when:
|
|
||||||
branch:
|
|
||||||
- develop
|
|
||||||
- feature/*
|
|
||||||
|
@ -11,7 +11,7 @@ addons:
|
|||||||
token:
|
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="
|
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:
|
env:
|
||||||
- PATH=$PATH:. VAULT_VERSION=1.1.2
|
- PATH=$PATH:. VAULT_VERSION=1.1.3
|
||||||
before_script:
|
before_script:
|
||||||
- wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_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
|
- wget -q -O - https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c
|
||||||
|
@ -32,7 +32,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject
|
|||||||
* SQL secret handling
|
* SQL secret handling
|
||||||
* KV v1 and v2 support
|
* KV v1 and v2 support
|
||||||
* Connector Factory with builder pattern
|
* Connector Factory with builder pattern
|
||||||
* Tested against Vault 1.1.2
|
* Tested against Vault 1.1.3
|
||||||
|
|
||||||
|
|
||||||
## Maven Artifact
|
## Maven Artifact
|
||||||
|
@ -51,7 +51,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
|
|||||||
* @since 0.1
|
* @since 0.1
|
||||||
*/
|
*/
|
||||||
public class HTTPVaultConnectorTest {
|
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 KEY1 = "E38bkCm0VhUvpdCKGQpcohhD9XmcHJ/2hreOSY019Lho";
|
||||||
private static final String KEY2 = "O5OHwDleY3IiPdgw61cgHlhsrEm6tVJkrxhF6QAnILd1";
|
private static final String KEY2 = "O5OHwDleY3IiPdgw61cgHlhsrEm6tVJkrxhF6QAnILd1";
|
||||||
private static final String KEY3 = "mw7Bm3nbt/UWa/juDjjL2EPQ04kiJ0saC5JEXwJvXYsB";
|
private static final String KEY3 = "mw7Bm3nbt/UWa/juDjjL2EPQ04kiJ0saC5JEXwJvXYsB";
|
||||||
|
@ -42,9 +42,9 @@ import static org.junit.jupiter.api.Assertions.fail;
|
|||||||
*/
|
*/
|
||||||
@EnableRuleMigrationSupport
|
@EnableRuleMigrationSupport
|
||||||
public class HTTPVaultConnectorBuilderTest {
|
public class HTTPVaultConnectorBuilderTest {
|
||||||
private static String VAULT_ADDR = "https://localhost:8201";
|
private static final String VAULT_ADDR = "https://localhost:8201";
|
||||||
private static Integer VAULT_MAX_RETRIES = 13;
|
private static final Integer VAULT_MAX_RETRIES = 13;
|
||||||
private static String VAULT_TOKEN = "00001111-2222-3333-4444-555566667777";
|
private static final String VAULT_TOKEN = "00001111-2222-3333-4444-555566667777";
|
||||||
|
|
||||||
@TempDir
|
@TempDir
|
||||||
File tempDir;
|
File tempDir;
|
||||||
@ -56,7 +56,7 @@ public class HTTPVaultConnectorBuilderTest {
|
|||||||
* Test building from environment variables
|
* Test building from environment variables
|
||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void testFromEnv() throws NoSuchFieldException, IllegalAccessException, IOException {
|
void testFromEnv() throws NoSuchFieldException, IllegalAccessException, IOException {
|
||||||
/* Provide address only should be enough */
|
/* Provide address only should be enough */
|
||||||
setenv(VAULT_ADDR, null, null, null);
|
setenv(VAULT_ADDR, null, null, null);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user