README.md

@@ -28,9 +28,8 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject
     * Delete secrets
     * Renew/revoke leases
     * Raw secret content or JSON decoding
+    * SQL secret handling
     * KV v1 and v2 support
-    * Database secret handling
-* Transit API support
 * Connector Factory with builder pattern
 * Tested against Vault 1.2 to 1.19
 
@@ -40,7 +39,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject
 <dependency>
     <groupId>de.stklcode.jvault</groupId>
     <artifactId>jvault-connector</artifactId>
-    <version>1.5.0</version>
+    <version>1.4.0</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>de.stklcode.jvault</groupId>
     <artifactId>jvault-connector</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.5.0</version>
 
     <packaging>jar</packaging>
 
@@ -33,7 +33,7 @@
         <connection>scm:git:git://github.com/stklcode/jvaultconnector.git</connection>
         <developerConnection>scm:git:git@github.com:stklcode/jvaultconnector.git</developerConnection>
         <url>https://github.com/stklcode/jvaultconnector</url>
-        <tag>HEAD</tag>
+        <tag>v1.5.0</tag>
     </scm>
 
     <issueManagement>
@@ -43,6 +43,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.outputTimestamp>2025-04-13T09:25:23Z</project.build.outputTimestamp>
         <argLine></argLine>
     </properties>
 
@@ -79,7 +80,7 @@
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock</artifactId>
-            <version>3.13.0</version>
+            <version>3.12.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java

@@ -17,13 +17,13 @@
 package de.stklcode.jvault.connector;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
-import com.github.tomakehurst.wiremock.junit5.WireMockTest;
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import de.stklcode.jvault.connector.exception.ConnectionException;
 import de.stklcode.jvault.connector.exception.InvalidResponseException;
 import de.stklcode.jvault.connector.exception.PermissionDeniedException;
 import de.stklcode.jvault.connector.exception.VaultConnectorException;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.function.Executable;
 
 import java.io.IOException;
@@ -36,7 +36,9 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -46,23 +48,26 @@ import static org.junit.jupiter.api.Assertions.*;
  * @author Stefan Kalscheuer
  * @since 0.7.0
  */
-@WireMockTest
 class HTTPVaultConnectorTest {
+    @RegisterExtension
+    static WireMockExtension wireMock = WireMockExtension.newInstance()
+            .options(wireMockConfig().dynamicPort())
+            .build();
 
     /**
      * Test exceptions thrown during request.
      */
     @Test
-    void requestExceptionTest(WireMockRuntimeInfo wireMock) throws IOException, URISyntaxException {
-        HTTPVaultConnector connector = HTTPVaultConnector.builder(wireMock.getHttpBaseUrl()).withTimeout(250).build();
+    void requestExceptionTest() throws IOException, URISyntaxException {
+        HTTPVaultConnector connector = HTTPVaultConnector.builder(wireMock.url("/")).withTimeout(250).build();
 
         // Test invalid response code.
         final int responseCode = 400;
         mockHttpResponse(responseCode, "", "application/json");
         VaultConnectorException e = assertThrows(
-            InvalidResponseException.class,
-            connector::getHealth,
-            "Querying health status succeeded on invalid instance"
+                InvalidResponseException.class,
+                connector::getHealth,
+                "Querying health status succeeded on invalid instance"
         );
         assertEquals("Invalid response code", e.getMessage(), "Unexpected exception message");
         assertEquals(responseCode, ((InvalidResponseException) e).getStatusCode(), "Unexpected status code in exception");
@@ -71,9 +76,9 @@ class HTTPVaultConnectorTest {
         // Simulate permission denied response.
         mockHttpResponse(responseCode, "{\"errors\":[\"permission denied\"]}", "application/json");
         assertThrows(
-            PermissionDeniedException.class,
-            connector::getHealth,
-            "Querying health status succeeded on invalid instance"
+                PermissionDeniedException.class,
+                connector::getHealth,
+                "Querying health status succeeded on invalid instance"
         );
 
         // Test exception thrown during request.
@@ -81,22 +86,22 @@ class HTTPVaultConnectorTest {
             connector = HTTPVaultConnector.builder("http://localst:" + s.getLocalPort() + "/").withTimeout(250).build();
         }
         e = assertThrows(
-            ConnectionException.class,
-            connector::getHealth,
-            "Querying health status succeeded on invalid instance"
+                ConnectionException.class,
+                connector::getHealth,
+                "Querying health status succeeded on invalid instance"
         );
         assertEquals("Unable to connect to Vault server", e.getMessage(), "Unexpected exception message");
         assertInstanceOf(IOException.class, e.getCause(), "Unexpected cause");
 
         // Now simulate a failing request that succeeds on second try.
-        connector = HTTPVaultConnector.builder(wireMock.getHttpBaseUrl()).withNumberOfRetries(1).withTimeout(250).build();
+        connector = HTTPVaultConnector.builder(wireMock.url("/")).withNumberOfRetries(1).withTimeout(250).build();
 
-        stubFor(
-            WireMock.any(anyUrl())
-                .willReturn(aResponse().withStatus(500))
-                .willReturn(aResponse().withStatus(500))
-                .willReturn(aResponse().withStatus(500))
-                .willReturn(aResponse().withStatus(200).withBody("{}").withHeader("Content-Type", "application/json"))
+        wireMock.stubFor(
+                WireMock.any(anyUrl())
+                        .willReturn(aResponse().withStatus(500))
+                        .willReturn(aResponse().withStatus(500))
+                        .willReturn(aResponse().withStatus(500))
+                        .willReturn(aResponse().withStatus(200).withBody("{}").withHeader("Content-Type", "application/json"))
         );
         assertDoesNotThrow(connector::getHealth, "Request failed unexpectedly");
     }
@@ -159,9 +164,9 @@ class HTTPVaultConnectorTest {
             connector = HTTPVaultConnector.builder("http://localst:" + s.getLocalPort()).withTimeout(250).build();
         }
         ConnectionException e = assertThrows(
-            ConnectionException.class,
-            connector::sealStatus,
-            "Querying seal status succeeded on invalid instance"
+                ConnectionException.class,
+                connector::sealStatus,
+                "Querying seal status succeeded on invalid instance"
         );
         assertEquals("Unable to connect to Vault server", e.getMessage(), "Unexpected exception message");
     }
@@ -177,9 +182,9 @@ class HTTPVaultConnectorTest {
             connector = HTTPVaultConnector.builder("http://localhost:" + s.getLocalPort() + "/").withTimeout(250).build();
         }
         ConnectionException e = assertThrows(
-            ConnectionException.class,
-            connector::getHealth,
-            "Querying health status succeeded on invalid instance"
+                ConnectionException.class,
+                connector::getHealth,
+                "Querying health status succeeded on invalid instance"
         );
         assertEquals("Unable to connect to Vault server", e.getMessage(), "Unexpected exception message");
     }
@@ -188,8 +193,8 @@ class HTTPVaultConnectorTest {
      * Test behavior on unparsable responses.
      */
     @Test
-    void parseExceptionTest(WireMockRuntimeInfo wireMock) throws URISyntaxException {
-        HTTPVaultConnector connector = HTTPVaultConnector.builder(wireMock.getHttpBaseUrl()).withTimeout(250).build();
+    void parseExceptionTest() throws URISyntaxException {
+        HTTPVaultConnector connector = HTTPVaultConnector.builder(wireMock.url("/")).withTimeout(250).build();
         // Mock authorization.
         setPrivate(connector, "authorized", true);
         // Mock response.
@@ -222,8 +227,8 @@ class HTTPVaultConnectorTest {
      * Test requests that expect an empty response with code 204, but receive a 200 body.
      */
     @Test
-    void nonEmpty204ResponseTest(WireMockRuntimeInfo wireMock) throws URISyntaxException {
-        HTTPVaultConnector connector = HTTPVaultConnector.builder(wireMock.getHttpBaseUrl()).withTimeout(250).build();
+    void nonEmpty204ResponseTest() throws URISyntaxException {
+        HTTPVaultConnector connector = HTTPVaultConnector.builder(wireMock.url("/")).withTimeout(250).build();
         // Mock authorization.
         setPrivate(connector, "authorized", true);
         // Mock response.
@@ -231,45 +236,45 @@ class HTTPVaultConnectorTest {
 
         // Now test the methods expecting a 204.
         assertThrows(
-            InvalidResponseException.class,
-            () -> connector.createAppRole("appID", Collections.singletonList("policy")),
-            "createAppRole() with 200 response succeeded"
+                InvalidResponseException.class,
+                () -> connector.createAppRole("appID", Collections.singletonList("policy")),
+                "createAppRole() with 200 response succeeded"
         );
 
         assertThrows(
-            InvalidResponseException.class,
-            () -> connector.deleteAppRole("roleName"),
-            "deleteAppRole() with 200 response succeeded"
+                InvalidResponseException.class,
+                () -> connector.deleteAppRole("roleName"),
+                "deleteAppRole() with 200 response succeeded"
         );
 
         assertThrows(
-            InvalidResponseException.class,
-            () -> connector.setAppRoleID("roleName", "roleID"),
-            "setAppRoleID() with 200 response succeeded"
+                InvalidResponseException.class,
+                () -> connector.setAppRoleID("roleName", "roleID"),
+                "setAppRoleID() with 200 response succeeded"
         );
 
         assertThrows(
-            InvalidResponseException.class,
-            () -> connector.destroyAppRoleSecret("roleName", "secretID"),
-            "destroyAppRoleSecret() with 200 response succeeded"
+                InvalidResponseException.class,
+                () -> connector.destroyAppRoleSecret("roleName", "secretID"),
+                "destroyAppRoleSecret() with 200 response succeeded"
         );
 
         assertThrows(
-            InvalidResponseException.class,
-            () -> connector.destroyAppRoleSecret("roleName", "secretUD"),
-            "destroyAppRoleSecret() with 200 response succeeded"
+                InvalidResponseException.class,
+                () -> connector.destroyAppRoleSecret("roleName", "secretUD"),
+                "destroyAppRoleSecret() with 200 response succeeded"
         );
 
         assertThrows(
-            InvalidResponseException.class,
-            () -> connector.delete("key"),
-            "delete() with 200 response succeeded"
+                InvalidResponseException.class,
+                () -> connector.delete("key"),
+                "delete() with 200 response succeeded"
         );
 
         assertThrows(
-            InvalidResponseException.class,
-            () -> connector.revoke("leaseID"),
-            "destroyAppRoleSecret() with 200 response succeeded"
+                InvalidResponseException.class,
+                () -> connector.revoke("leaseID"),
+                "destroyAppRoleSecret() with 200 response succeeded"
         );
     }
 
@@ -305,10 +310,10 @@ class HTTPVaultConnectorTest {
     }
 
     private void mockHttpResponse(int status, String body, String contentType) {
-        stubFor(
-            WireMock.any(anyUrl()).willReturn(
-                aResponse().withStatus(status).withBody(body).withHeader("Content-Type", contentType)
-            )
+        wireMock.stubFor(
+                WireMock.any(anyUrl()).willReturn(
+                        aResponse().withStatus(status).withBody(body).withHeader("Content-Type", contentType)
+                )
         );
     }
 }