stklcode/jvaultconnector
stklcode/jvaultconnector
1
0
Fork 0
Code Issues Actions Releases 33 Wiki Activity

Merge branch 'main' into develop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Stefan Kalscheuer 2023-11-26 11:04:17 +01:00
commit 10965b01d6
Signed by: stefan
GPG Key ID: 3887EC2A53B55430
7 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.drone.yml
View File

@ -3,7 +3,7 @@ name: default
steps: steps:
- name: compile - name: compile
image: maven:3-eclipse-temurin-17 image: maven:3-eclipse-temurin-21
commands: commands:
- mvn -B clean compile - mvn -B clean compile
when: when:
@ -14,7 +14,7 @@ steps:
- fix/* - fix/*
- release/* - release/*
- name: unit-tests - name: unit-tests
image: maven:3-eclipse-temurin-17 image: maven:3-eclipse-temurin-21
commands: commands:
- mvn -B test - mvn -B test
when: when:
@ -25,7 +25,7 @@ steps:
- name: setup-vault - name: setup-vault
image: alpine:latest image: alpine:latest
environment: environment:
VAULT_VERSION: 1.14.0 VAULT_VERSION: 1.15.0
commands: 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 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 - wget -q -O - https://releases.hashicorp.com/vault/$${VAULT_VERSION}/vault_$${VAULT_VERSION}_SHA256SUMS | grep linux_amd64 | sha256sum -c
@ -38,9 +38,9 @@ steps:
- main - main
- release/* - release/*
- name: unit-integration-tests - name: unit-integration-tests
image: maven:3-eclipse-temurin-17 image: maven:3-eclipse-temurin-21
environment: environment:
VAULT_VERSION: 1.14.0 VAULT_VERSION: 1.15.0
commands: commands:
- export PATH=.bin:$${PATH} - export PATH=.bin:$${PATH}
- mvn -B -P integration-test verify - mvn -B -P integration-test verify

14
.editorconfig Normal file
View File

@ -0,0 +1,14 @@
root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
max_line_length = 120
tab_width = 4
trim_trailing_whitespace = true
[{*.yaml,*.yml}]
indent_size = 2

4
.github/workflows/ci.yml vendored
View File

@ -5,8 +5,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
jdk: [ 11, 17, 20 ] jdk: [ 11, 17, 21 ]
vault: [ '1.2.0', '1.11.12', '1.14.0' ] vault: [ '1.2.0', '1.11.12', '1.15.0' ]
include: include:
- jdk: 17 - jdk: 17
vault: '1.11.12' vault: '1.11.12'

13
CHANGELOG.md
View File

@ -6,6 +6,9 @@
### Improvements ### Improvements
* Parse timestamps as `ZonedDateTime` instead of `String` representation * Parse timestamps as `ZonedDateTime` instead of `String` representation
### Dependencies
* Updated Jackson to 2.16.0
## 1.1.5 (2023-08-19) ## 1.1.5 (2023-08-19)
@ -13,7 +16,7 @@
* Fixed JSON type conversion in `SecretResponse#get(String, Class)` (#67) * Fixed JSON type conversion in `SecretResponse#get(String, Class)` (#67)
### Test ### Test
* Tested against Vault 1.2.0 to 1.14.0 * Tested against Vault 1.2 to 1.15
## 1.1.4 (2023-06-15) ## 1.1.4 (2023-06-15)
@ -183,7 +186,7 @@ Old builders will be removed in 1.0
* Added `entity_id`, `token_policies`, `token_type` and `orphan` flags to auth response * Added `entity_id`, `token_policies`, `token_type` and `orphan` flags to auth response
* Added `entity_id`, `expire_time`, `explicit_max_ttl`, `issue_time`, `renewable` and `type` flags to token data * Added `entity_id`, `expire_time`, `explicit_max_ttl`, `issue_time`, `renewable` and `type` flags to token data
* Added `explicit_max_ttl`, `period` and `entity_alias` flags to _Token_ model (#41) * Added `explicit_max_ttl`, `period` and `entity_alias` flags to _Token_ model (#41)
* Added `enable_local_secret_ids`, `token_bound_cidrs`, `token_explicit_max_ttl`, `token_no_default_policy`, * Added `enable_local_secret_ids`, `token_bound_cidrs`, `token_explicit_max_ttl`, `token_no_default_policy`,
`token_num_uses`, `token_period` and `token_type` flags to _AppRole_ model `token_num_uses`, `token_period` and `token_type` flags to _AppRole_ model
* Minor dependency updates * Minor dependency updates
@ -203,14 +206,14 @@ Old builders will be removed in 1.0
## 0.8.2 (2019-10-20) ## 0.8.2 (2019-10-20)
### Fixes ### Fixes
* Fixed token lookup (#31) * Fixed token lookup (#31)
### Improvements ### Improvements
* Updated dependencies * Updated dependencies
## 0.8.1 (2019-08-16) ## 0.8.1 (2019-08-16)
### Fixes ### Fixes
* Removed compile dependency to JUnit library (#30) * Removed compile dependency to JUnit library (#30)
### Improvements ### Improvements
* Updated dependencies * Updated dependencies
@ -302,7 +305,7 @@ Old builders will be removed in 1.0
### Fixes ### Fixes
* `SecretResponse` does not throw NPE on `get(key)` and `getData()` * `SecretResponse` does not throw NPE on `get(key)` and `getData()`
### Test ### Test
* Tested against Vault 0.7.2 * Tested against Vault 0.7.2

2
README.md
View File

@ -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.2 to 1.14 * Tested against Vault 1.2 to 1.15
## Maven Artifact ## Maven Artifact

35
pom.xml
View File

@ -49,24 +49,24 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.15.2</version> <version>2.16.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId> <artifactId>jackson-datatype-jsr310</artifactId>
<version>2.15.2</version> <version>2.16.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId> <artifactId>junit-jupiter</artifactId>
<version>5.10.0</version> <version>5.10.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>5.4.0</version> <version>5.7.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -76,21 +76,21 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.tomakehurst</groupId> <groupId>org.wiremock</groupId>
<artifactId>wiremock-jre8</artifactId> <artifactId>wiremock</artifactId>
<version>2.35.0</version> <version>3.3.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.13.0</version> <version>2.15.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>nl.jqno.equalsverifier</groupId> <groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId> <artifactId>equalsverifier</artifactId>
<version>3.15.1</version> <version>3.15.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -116,7 +116,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version> <version>3.3.2</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -126,7 +126,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>3.1.2</version> <version>3.2.2</version>
<configuration> <configuration>
<argLine> <argLine>
@{argLine} @{argLine}
@ -164,7 +164,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version> <version>3.2.2</version>
<configuration> <configuration>
<argLine> <argLine>
@{argLine} @{argLine}
@ -182,12 +182,12 @@
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version> <version>0.8.11</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.sonarsource.scanner.maven</groupId> <groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId> <artifactId>sonar-maven-plugin</artifactId>
<version>3.9.1.2184</version> <version>3.10.0.2594</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@ -227,7 +227,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version> <version>3.6.2</version>
<configuration> <configuration>
<source>11</source> <source>11</source>
</configuration> </configuration>
@ -322,7 +322,10 @@
<plugin> <plugin>
<groupId>org.owasp</groupId> <groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId> <artifactId>dependency-check-maven</artifactId>
<version>8.3.1</version> <version>9.0.0</version>
<configuration>
<nvdApiKey>${env.NVD_API_KEY}</nvdApiKey>
</configuration>
<executions> <executions>
<execution> <execution>
<goals> <goals>

2
src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorIT.java
View File

@ -51,7 +51,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
* @since 0.1 * @since 0.1
*/ */
class HTTPVaultConnectorIT { class HTTPVaultConnectorIT {
private static String VAULT_VERSION = "1.14.0"; // The vault version this test is supposed to run against. private static String VAULT_VERSION = "1.15.0"; // 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";