From dc4b62496af660456dc8054bc1dbdb90a4526594 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Mon, 27 Dec 2021 18:54:49 +0100 Subject: [PATCH] model: use correct "replication_performance_mode" JSON field The official docs incorrectly state "replication_perf_mode" which was renamed to "replication_performance_mode" way back in Vault 0.9. We now use the correct field name that is emitted by the API. --- .drone.yml | 10 +++++----- .github/workflows/ci.yml | 4 ++-- CHANGELOG.md | 9 +++++++++ README.md | 2 +- pom.xml | 2 +- .../connector/model/response/HealthResponse.java | 2 +- .../jvault/connector/HTTPVaultConnectorIT.java | 2 +- .../connector/model/response/HealthResponseTest.java | 2 +- 8 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7370fd1..fa3fd9e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,12 +25,12 @@ steps: - name: unit-integration-tests image: maven:3-jdk-11 environment: - VAULT_VERSION: 1.9.0 + VAULT_VERSION: 1.9.2 commands: - - curl -s -o vault_1.9.0_linux_amd64.zip https://releases.hashicorp.com/vault/1.9.0/vault_1.9.0_linux_amd64.zip - - curl -s https://releases.hashicorp.com/vault/1.9.0/vault_1.9.0_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_1.9.0_linux_amd64.zip - - rm vault_1.9.0_linux_amd64.zip + - curl -s -o vault_1.9.2_linux_amd64.zip https://releases.hashicorp.com/vault/1.9.2/vault_1.9.2_linux_amd64.zip + - curl -s https://releases.hashicorp.com/vault/1.9.2/vault_1.9.2_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_1.9.2_linux_amd64.zip + - rm vault_1.9.2_linux_amd64.zip - mv vault /bin/ - mvn -B -P integration-test verify when: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c2e016..900a87f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,10 +6,10 @@ jobs: strategy: matrix: jdk: [ 11, 17 ] - vault: [ '1.9.0' ] + vault: [ '1.9.2' ] include: - jdk: 11 - vault: '1.9.0' + vault: '1.9.2' analysis: true steps: - name: Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index 532902f..a9bdd47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## UNRELEASED + +### Fix +* Use `replication_performance_mode` instead of `replication_perf_mode` in health response. + +### Test +* Tested against Vault 1.9.2 + + ## 1.0.1 (2021-11-21) ### Fix diff --git a/README.md b/README.md index fc13e6c..9f76f84 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.9.0 +* Tested against Vault 1.9.2 ## Maven Artifact diff --git a/pom.xml b/pom.xml index 80102cc..374a8a2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.stklcode.jvault jvault-connector - 1.0.1 + 1.0.2-SNAPSHOT jar diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java b/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java index aa3ea7a..81b1ad7 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/HealthResponse.java @@ -48,7 +48,7 @@ public final class HealthResponse implements VaultResponse { @JsonProperty("initialized") private Boolean initialized; - @JsonProperty("replication_perf_mode") + @JsonProperty("replication_performance_mode") private String replicationPerfMode; @JsonProperty("replication_dr_mode") diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java index a717b5f..c1c2037 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java @@ -49,7 +49,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; * @since 0.1 */ class HTTPVaultConnectorIT { - private static String VAULT_VERSION = "1.9.0"; // The vault version this test is supposed to run against. + private static String VAULT_VERSION = "1.9.2"; // 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/model/response/HealthResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java index ce6ecba..f971f79 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java @@ -47,7 +47,7 @@ class HealthResponseTest { " \"standby\": " + STANDBY + ",\n" + " \"sealed\": " + SEALED + ",\n" + " \"initialized\": " + INITIALIZED + ",\n" + - " \"replication_perf_mode\": \"" + REPL_PERF_MODE + "\",\n" + + " \"replication_performance_mode\": \"" + REPL_PERF_MODE + "\",\n" + " \"replication_dr_mode\": \"" + REPL_DR_MODE + "\",\n" + " \"performance_standby\": " + PERF_STANDBY + "\n" + "}";