From bdf4fc4b83ceab775044f3d25f97bdacf98c4409 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer <stefan@stklcode.de> Date: Sun, 6 Jun 2021 12:02:01 +0200 Subject: [PATCH 1/4] fix typo in method AppRole.Builder#wit0hTokenPeriod (#49) --- CHANGELOG.md | 5 +++++ pom.xml | 2 +- .../jvault/connector/model/AppRole.java | 19 ++++++++++++++++--- .../connector/model/AppRoleBuilder.java | 19 ++++++++++++++++--- .../connector/HTTPVaultConnectorTest.java | 2 +- .../connector/model/AppRoleBuilderTest.java | 4 ++-- 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a82c3e8..afefe69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## unreleased + +### Deprecations +* `AppRole.Builder#wit0hTokenPeriod()` is deprecated in favor of `#withTokenPeriod()` + ## 0.9.3 (2021-04-02) ### Improvements diff --git a/pom.xml b/pom.xml index 7917544..6da517a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>de.stklcode.jvault</groupId> <artifactId>jvault-connector</artifactId> - <version>0.9.3</version> + <version>0.9.4-SNAPSHOT</version> <packaging>jar</packaging> diff --git a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java index 3af63a2..f0674b9 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java +++ b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java @@ -703,21 +703,34 @@ public final class AppRole { * @return self * @since 0.9 */ - public Builder wit0hTokenPeriod(final Integer tokenPeriod) { + public Builder withTokenPeriod(final Integer tokenPeriod) { this.tokenPeriod = tokenPeriod; return this; } + /** + * Set renewal period for generated token in seconds. + * + * @param tokenPeriod period in seconds + * @return self + * @since 0.9 + * @deprecated Use {@link #withTokenPeriod(Integer)} instead. + */ + @Deprecated + public Builder wit0hTokenPeriod(final Integer tokenPeriod) { + return withTokenPeriod(tokenPeriod); + } + /** * Set renewal period for generated token in seconds. * * @param period period in seconds * @return self - * @deprecated Use {@link #wit0hTokenPeriod(Integer)} instead. + * @deprecated Use {@link #withTokenPeriod(Integer)} instead. */ @Deprecated public Builder withPeriod(final Integer period) { - return wit0hTokenPeriod(period); + return withTokenPeriod(period); } /** diff --git a/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java b/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java index cb14478..e09e056 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java +++ b/src/main/java/de/stklcode/jvault/connector/model/AppRoleBuilder.java @@ -308,21 +308,34 @@ public final class AppRoleBuilder { * @return self * @since 0.9 */ - public AppRoleBuilder wit0hTokenPeriod(final Integer tokenPeriod) { + public AppRoleBuilder withTokenPeriod(final Integer tokenPeriod) { this.tokenPeriod = tokenPeriod; return this; } + /** + * Set renewal period for generated token in seconds. + * + * @param tokenPeriod period in seconds + * @return self + * @since 0.9 + * @deprecated Use {@link #withTokenPeriod(Integer)} instead. + */ + @Deprecated + public AppRoleBuilder wit0hTokenPeriod(final Integer tokenPeriod) { + return withTokenPeriod(tokenPeriod); + } + /** * Set renewal period for generated token in seconds. * * @param period period in seconds * @return self - * @deprecated Use {@link #wit0hTokenPeriod(Integer)} instead. + * @deprecated Use {@link #withTokenPeriod(Integer)} instead. */ @Deprecated public AppRoleBuilder withPeriod(final Integer period) { - return wit0hTokenPeriod(period); + return withTokenPeriod(period); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 5a99b02..8b54da1 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -771,7 +771,7 @@ class HTTPVaultConnectorTest { /* Update role model with custom flags */ AppRole role2 = AppRole.builder(roleName) - .wit0hTokenPeriod(321) + .withTokenPeriod(321) .build(); /* Create role */ diff --git a/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java b/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java index 6c4b7c7..45e1bce 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java @@ -138,7 +138,7 @@ class AppRoleBuilderTest { .withTokenExplicitMaxTtl(TOKEN_EXPLICIT_MAX_TTL) .withTokenNoDefaultPolicy(TOKEN_NO_DEFAULT_POLICY) .withTokenNumUses(TOKEN_NUM_USES) - .wit0hTokenPeriod(TOKEN_PERIOD) + .withTokenPeriod(TOKEN_PERIOD) .withTokenType(TOKEN_TYPE) .build(); assertThat(role.getName(), is(NAME)); @@ -183,7 +183,7 @@ class AppRoleBuilderTest { .withTokenExplicitMaxTtl(TOKEN_EXPLICIT_MAX_TTL) .withTokenNoDefaultPolicy(TOKEN_NO_DEFAULT_POLICY) .withTokenNumUses(TOKEN_NUM_USES) - .wit0hTokenPeriod(TOKEN_PERIOD) + .withTokenPeriod(TOKEN_PERIOD) .withTokenType(TOKEN_TYPE) .build(); assertThat(role.getName(), is(NAME)); From ce33d373961628a7a5516e5da0f3155d5e12865e Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer <stefan@stklcode.de> Date: Sun, 6 Jun 2021 12:06:34 +0200 Subject: [PATCH 2/4] minor dependency updates; test against Vault 1.7.2 --- .drone.yml | 10 ++++---- .travis.yml | 4 ++-- CHANGELOG.md | 8 ++++++- README.md | 2 +- pom.xml | 23 +++++++++---------- .../connector/HTTPVaultConnectorTest.java | 2 +- 6 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index b0f1e6c..f4c3769 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.7.0 + VAULT_VERSION: 1.7.2 commands: - - curl -s -o vault_1.7.0_linux_amd64.zip https://releases.hashicorp.com/vault/1.7.0/vault_1.7.0_linux_amd64.zip - - curl -s https://releases.hashicorp.com/vault/1.7.0/vault_1.7.0_SHA256SUMS | grep linux_amd64 | sha256sum -c - - unzip vault_1.7.0_linux_amd64.zip - - rm vault_1.7.0_linux_amd64.zip + - curl -s -o vault_1.7.2_linux_amd64.zip https://releases.hashicorp.com/vault/1.7.2/vault_1.7.2_linux_amd64.zip + - curl -s https://releases.hashicorp.com/vault/1.7.2/vault_1.7.2_SHA256SUMS | grep linux_amd64 | sha256sum -c + - unzip vault_1.7.2_linux_amd64.zip + - rm vault_1.7.2_linux_amd64.zip - mv vault /bin/ - mvn -B resources:testResources compiler:testCompile surefire:test when: diff --git a/.travis.yml b/.travis.yml index 72c31a1..cc5a001 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ addons: 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: - - PATH=$PATH:. VAULT_VERSION=1.7.0 ANALYSIS=false + - PATH=$PATH:. VAULT_VERSION=1.7.2 ANALYSIS=false cache: directories: @@ -18,7 +18,7 @@ jobs: include: - jdk: openjdk8 - jdk: openjdk11 - env: PATH=$PATH:. VAULT_VERSION=1.7.0 ANALYSIS=true + env: PATH=$PATH:. VAULT_VERSION=1.7.2 ANALYSIS=true - jdk: openjdk16 before_script: diff --git a/CHANGELOG.md b/CHANGELOG.md index afefe69..bf1b829 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ ## unreleased ### Deprecations -* `AppRole.Builder#wit0hTokenPeriod()` is deprecated in favor of `#withTokenPeriod()` +* `AppRole.Builder#wit0hTokenPeriod()` is deprecated in favor of `#withTokenPeriod()` (#49) + +### Improvements +* Minor dependency updates + +### Test +* Tested against Vault 1.7.2 ## 0.9.3 (2021-04-02) diff --git a/README.md b/README.md index c6fa985..6a7969f 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.7.0 +* Tested against Vault 1.7.2 ## Maven Artifact diff --git a/pom.xml b/pom.xml index 6da517a..74ad17b 100644 --- a/pom.xml +++ b/pom.xml @@ -113,13 +113,13 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.12.2</version> + <version>2.12.3</version> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter</artifactId> - <version>5.7.1</version> + <version>5.7.2</version> <scope>test</scope> </dependency> <dependency> @@ -131,13 +131,13 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>3.8.0</version> + <version>3.11.0</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-inline</artifactId> - <version>3.8.0</version> + <version>3.11.0</version> <scope>test</scope> </dependency> <dependency> @@ -149,7 +149,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.8.0</version> + <version>2.9.0</version> <scope>test</scope> </dependency> </dependencies> @@ -159,7 +159,7 @@ <dependency> <groupId>org.sonarsource.scanner.maven</groupId> <artifactId>sonar-maven-plugin</artifactId> - <version>3.8.0.2131</version> + <version>3.9.0.2155</version> </dependency> </dependencies> </dependencyManagement> @@ -224,7 +224,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> + <version>3.0.1</version> <executions> <execution> <id>sign-artifacts</id> @@ -249,17 +249,16 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.6</version> + <version>0.8.7</version> <executions> <execution> - <id>prepare-agent</id> + <id>default-prepare-agent</id> <goals> <goal>prepare-agent</goal> </goals> </execution> <execution> - <id>report</id> - <phase>prepare-package</phase> + <id>default-report</id> <goals> <goal>report</goal> </goals> @@ -294,7 +293,7 @@ <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> - <version>6.1.5</version> + <version>6.2.0</version> <executions> <execution> <goals> diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 8b54da1..aa6e9fe 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -54,7 +54,7 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue; */ @Tag("online") class HTTPVaultConnectorTest { - private static String VAULT_VERSION = "1.7.0"; // the vault version this test is supposed to run against + private static String VAULT_VERSION = "1.7.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"; From e2c439379e23e3d797e8d4221c805267c9fa30a7 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer <stefan@stklcode.de> Date: Sat, 1 May 2021 19:48:33 +0200 Subject: [PATCH 3/4] switch to "main" as default branch name --- .drone.yml | 4 ++-- .travis.yml | 4 ++-- README.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index f4c3769..96fd8e8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ steps: - mvn -B clean compile when: branch: - - master + - main - develop - feature/* - fix/* @@ -35,5 +35,5 @@ steps: - mvn -B resources:testResources compiler:testCompile surefire:test when: branch: - - master + - main - release/* \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index cc5a001..2d68e45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ jobs: before_script: - | - if [[ "$TRAVIS_BRANCH" =~ ^master|(release\/.+)$ ]]; then + if [[ "$TRAVIS_BRANCH" =~ ^main|(release\/.+)$ ]]; then wget -q 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 @@ -33,7 +33,7 @@ before_script: script: - mvn -B clean compile - | - if [[ "$TRAVIS_BRANCH" =~ ^master|(release\/.+)$ ]]; then + if [[ "$TRAVIS_BRANCH" =~ ^main|(release\/.+)$ ]]; then mvn -B resources:testResources compiler:testCompile surefire:test -P coverage else mvn -B resources:testResources compiler:testCompile surefire:test -P coverage -P offline-tests diff --git a/README.md b/README.md index 6a7969f..19c82b7 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Java Vault Connector -[](https://travis-ci.com/stklcode/jvaultconnector) +[](https://travis-ci.com/stklcode/jvaultconnector) [](https://sonarcloud.io/dashboard?id=de.stklcode.jvault%3Ajvault-connector) -[](https://github.com/stklcode/jvaultconnector/blob/master/LICENSE.txt) +[](https://github.com/stklcode/jvaultconnector/blob/main/LICENSE.txt) [](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22de.stklcode.jvault%22%20AND%20a%3A%22jvault-connector%22) - + Java Vault Connector is a connector library for [Vault](https://www.vaultproject.io) by [Hashicorp](https://www.hashicorp.com) written in Java. The connector allows simple usage of Vault's secret store in own applications. From 5f9950e048106cfb85017c66a57dd81c27a7994a Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer <stefan@stklcode.de> Date: Sun, 6 Jun 2021 12:15:47 +0200 Subject: [PATCH 4/4] prepare release 0.9.4 --- CHANGELOG.md | 2 +- README.md | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf1b829..48d44d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## unreleased +## 0.9.4 (2021-06-06) ### Deprecations * `AppRole.Builder#wit0hTokenPeriod()` is deprecated in favor of `#withTokenPeriod()` (#49) diff --git a/README.md b/README.md index 19c82b7..edd7a12 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject <dependency> <groupId>de.stklcode.jvault</groupId> <artifactId>jvault-connector</artifactId> - <version>0.9.3</version> + <version>0.9.4</version> </dependency> ``` diff --git a/pom.xml b/pom.xml index 74ad17b..f0d8b57 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>de.stklcode.jvault</groupId> <artifactId>jvault-connector</artifactId> - <version>0.9.4-SNAPSHOT</version> + <version>0.9.4</version> <packaging>jar</packaging>