From 20983e508930ec3e71481dac29f4adc64d123d71 Mon Sep 17 00:00:00 2001
From: Stefan Kalscheuer <stefan@stklcode.de>
Date: Fri, 14 Jun 2024 16:54:12 +0200
Subject: [PATCH] test: test against Vault 1.17.0

---
 .drone.yml                                               | 9 ++++-----
 .github/workflows/ci.yml                                 | 8 +++++---
 README.md                                                | 2 +-
 .../stklcode/jvault/connector/HTTPVaultConnectorIT.java  | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d9321ab..75e553e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,14 +25,13 @@ steps:
   - name: setup-vault
     image: alpine:latest
     environment:
-      VAULT_VERSION: 1.16.0
+      VAULT_VERSION: 1.17.0
     commands:
       - wget -q -O vault_$${VAULT_VERSION}_linux_amd64.zip 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
       - mkdir -p .bin
-      - mv vault .bin/
+      - unzip vault_$${VAULT_VERSION}_linux_amd64.zip -d .bin
+      - rm vault_$${VAULT_VERSION}_linux_amd64.zip
     when:
       branch:
         - main
@@ -40,7 +39,7 @@ steps:
   - name: unit-integration-tests
     image: maven:3-eclipse-temurin-21
     environment:
-      VAULT_VERSION: 1.16.0
+      VAULT_VERSION: 1.17.0
     commands:
       - export PATH=.bin:$${PATH}
       - mvn -B -P integration-test verify
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d6925ac..87d111f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         jdk: [ 11, 17, 21 ]
-        vault: [ '1.2.0', '1.11.12', '1.16.0' ]
+        vault: [ '1.2.0', '1.11.12', '1.17.0' ]
         include:
           - jdk: 21
             vault: '1.11.12'
@@ -28,9 +28,11 @@ jobs:
         run: |
           wget -q "https://releases.hashicorp.com/vault/${{ matrix.vault }}/vault_${{ matrix.vault }}_linux_amd64.zip"
           wget -q -O - "https://releases.hashicorp.com/vault/${{ matrix.vault }}/vault_${{ matrix.vault }}_SHA256SUMS" | grep linux_amd64 | sha256sum -c
-          unzip "vault_${{ matrix.vault }}_linux_amd64.zip"
+          tmp="$(mktemp -d)"
+          unzip "vault_${{ matrix.vault }}_linux_amd64.zip" -d "$tmp"
           rm "vault_${{ matrix.vault }}_linux_amd64.zip"
-          sudo mv vault /usr/bin/vault
+          sudo mv "$tmp/vault" /usr/bin/vault
+          rm -rf "$tmp"
       - name: Test (Unit & Integration)
         if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')
         env:
diff --git a/README.md b/README.md
index 861a3fc..a9040a8 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.2 to 1.16
+* Tested against Vault 1.2 to 1.17
 
 
 ## Maven Artifact
diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java
index aa340db..6af5454 100644
--- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java
+++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java
@@ -51,7 +51,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
  * @since 0.1
  */
 class HTTPVaultConnectorIT {
-    private static String VAULT_VERSION = "1.16.0";  // The vault version this test is supposed to run against.
+    private static String VAULT_VERSION = "1.17.0";  // 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";