Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
548038ab52
|
|||
941734e5be
|
|||
c591fcd7a2
|
|||
91276e1615
|
|||
6d2313289c
|
|||
bcbb3a0926
|
|||
f03c05bd5b
|
|||
afdad92ae6
|
|||
9fa360393d
|
|||
d28c189ec2
|
|||
46fffcc711
|
6
.github/workflows/ci-it.yml
vendored
6
.github/workflows/ci-it.yml
vendored
@@ -14,11 +14,11 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
jdk: [ 11, 17, 21 ]
|
jdk: [ 17, 21 ]
|
||||||
vault: [ '1.2.0', '1.19.5' ]
|
vault: [ '1.2.0', '1.20.0' ]
|
||||||
include:
|
include:
|
||||||
- jdk: 21
|
- jdk: 21
|
||||||
vault: '1.19.5'
|
vault: '1.20.0'
|
||||||
analysis: true
|
analysis: true
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
jdk: [ 11, 17, 21 ]
|
jdk: [ 17, 21 ]
|
||||||
include:
|
include:
|
||||||
- jdk: 21
|
- jdk: 21
|
||||||
analysis: true
|
analysis: true
|
||||||
|
15
CHANGELOG.md
15
CHANGELOG.md
@@ -1,3 +1,18 @@
|
|||||||
|
## unreleased
|
||||||
|
|
||||||
|
### Breaking
|
||||||
|
* Requires Java 17 or later (#100)
|
||||||
|
|
||||||
|
### Dependencies
|
||||||
|
* Updated Jackson to 2.19.1 (#101)
|
||||||
|
|
||||||
|
### Fix
|
||||||
|
* Use `Long` for numeric TTL fields (#103) (#104)
|
||||||
|
|
||||||
|
### Test
|
||||||
|
* Tested against Vault 1.2 to 1.20 (#102)
|
||||||
|
|
||||||
|
|
||||||
## 1.5.1 (2025-06-02)
|
## 1.5.1 (2025-06-02)
|
||||||
|
|
||||||
### Improvements
|
### Improvements
|
||||||
|
@@ -32,7 +32,7 @@ Java Vault Connector is a connector library for [Vault](https://www.vaultproject
|
|||||||
* Database secret handling
|
* Database secret handling
|
||||||
* Transit API support
|
* Transit API support
|
||||||
* Connector Factory with builder pattern
|
* Connector Factory with builder pattern
|
||||||
* Tested against Vault 1.2 to 1.19
|
* Tested against Vault 1.2 to 1.20
|
||||||
|
|
||||||
|
|
||||||
## Maven Artifact
|
## Maven Artifact
|
||||||
|
27
pom.xml
27
pom.xml
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<groupId>de.stklcode.jvault</groupId>
|
<groupId>de.stklcode.jvault</groupId>
|
||||||
<artifactId>jvault-connector</artifactId>
|
<artifactId>jvault-connector</artifactId>
|
||||||
<version>1.5.1</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
|
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
<connection>scm:git:git://github.com/stklcode/jvaultconnector.git</connection>
|
<connection>scm:git:git://github.com/stklcode/jvaultconnector.git</connection>
|
||||||
<developerConnection>scm:git:git@github.com:stklcode/jvaultconnector.git</developerConnection>
|
<developerConnection>scm:git:git@github.com:stklcode/jvaultconnector.git</developerConnection>
|
||||||
<url>https://github.com/stklcode/jvaultconnector</url>
|
<url>https://github.com/stklcode/jvaultconnector</url>
|
||||||
<tag>v1.5.1</tag>
|
<tag>HEAD</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<issueManagement>
|
<issueManagement>
|
||||||
@@ -43,7 +43,6 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.build.outputTimestamp>2025-06-02T14:59:15Z</project.build.outputTimestamp>
|
|
||||||
<argLine />
|
<argLine />
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@@ -51,18 +50,18 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
<version>2.19.0</version>
|
<version>2.19.1</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.19.0</version>
|
<version>2.19.1</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.13.0</version>
|
<version>5.13.2</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -80,7 +79,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.wiremock</groupId>
|
<groupId>org.wiremock</groupId>
|
||||||
<artifactId>wiremock</artifactId>
|
<artifactId>wiremock</artifactId>
|
||||||
<version>3.13.0</version>
|
<version>3.13.1</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -92,7 +91,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>nl.jqno.equalsverifier</groupId>
|
<groupId>nl.jqno.equalsverifier</groupId>
|
||||||
<artifactId>equalsverifier</artifactId>
|
<artifactId>equalsverifier</artifactId>
|
||||||
<version>3.19.4</version>
|
<version>4.0.4</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -111,13 +110,13 @@
|
|||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.14.0</version>
|
<version>3.14.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<release>11</release>
|
<release>17</release>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<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.4.1</version>
|
<version>3.5.0</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@@ -208,7 +207,7 @@
|
|||||||
<version>[3.6.3,)</version>
|
<version>[3.6.3,)</version>
|
||||||
</requireMavenVersion>
|
</requireMavenVersion>
|
||||||
<requireJavaVersion>
|
<requireJavaVersion>
|
||||||
<version>[11,)</version>
|
<version>[17,)</version>
|
||||||
</requireJavaVersion>
|
</requireJavaVersion>
|
||||||
</rules>
|
</rules>
|
||||||
</configuration>
|
</configuration>
|
||||||
@@ -254,7 +253,7 @@
|
|||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<version>3.11.2</version>
|
<version>3.11.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>11</source>
|
<source>17</source>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
@@ -370,7 +369,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.owasp</groupId>
|
<groupId>org.owasp</groupId>
|
||||||
<artifactId>dependency-check-maven</artifactId>
|
<artifactId>dependency-check-maven</artifactId>
|
||||||
<version>12.1.1</version>
|
<version>12.1.3</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<nvdApiKey>${env.NVD_API_KEY}</nvdApiKey>
|
<nvdApiKey>${env.NVD_API_KEY}</nvdApiKey>
|
||||||
<nvdDatafeedUrl>${env.NVD_DATAFEED_URL}</nvdDatafeedUrl>
|
<nvdDatafeedUrl>${env.NVD_DATAFEED_URL}</nvdDatafeedUrl>
|
||||||
@@ -394,7 +393,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.sonatype.central</groupId>
|
<groupId>org.sonatype.central</groupId>
|
||||||
<artifactId>central-publishing-maven-plugin</artifactId>
|
<artifactId>central-publishing-maven-plugin</artifactId>
|
||||||
<version>0.7.0</version>
|
<version>0.8.0</version>
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<publishingServerId>central</publishingServerId>
|
<publishingServerId>central</publishingServerId>
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.exception;
|
package de.stklcode.jvault.connector.exception;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception thrown trying to do a request without any authorization handles.
|
* Exception thrown trying to do a request without any authorization handles.
|
||||||
*
|
*
|
||||||
@@ -23,5 +25,6 @@ package de.stklcode.jvault.connector.exception;
|
|||||||
* @since 0.1
|
* @since 0.1
|
||||||
*/
|
*/
|
||||||
public class AuthorizationRequiredException extends VaultConnectorException {
|
public class AuthorizationRequiredException extends VaultConnectorException {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 2629577936657393880L;
|
private static final long serialVersionUID = 2629577936657393880L;
|
||||||
}
|
}
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.exception;
|
package de.stklcode.jvault.connector.exception;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception thrown on problems with connection to Vault backend.
|
* Exception thrown on problems with connection to Vault backend.
|
||||||
*
|
*
|
||||||
@@ -23,6 +25,7 @@ package de.stklcode.jvault.connector.exception;
|
|||||||
* @since 0.1
|
* @since 0.1
|
||||||
*/
|
*/
|
||||||
public class ConnectionException extends VaultConnectorException {
|
public class ConnectionException extends VaultConnectorException {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 3005430116002990418L;
|
private static final long serialVersionUID = 3005430116002990418L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.exception;
|
package de.stklcode.jvault.connector.exception;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception thrown when trying to send malformed request.
|
* Exception thrown when trying to send malformed request.
|
||||||
*
|
*
|
||||||
@@ -23,6 +25,7 @@ package de.stklcode.jvault.connector.exception;
|
|||||||
* @since 0.1
|
* @since 0.1
|
||||||
*/
|
*/
|
||||||
public class InvalidRequestException extends VaultConnectorException {
|
public class InvalidRequestException extends VaultConnectorException {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -6712239648281809159L;
|
private static final long serialVersionUID = -6712239648281809159L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.exception;
|
package de.stklcode.jvault.connector.exception;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception thrown when response from vault returned with erroneous status code or payload could not be parsed
|
* Exception thrown when response from vault returned with erroneous status code or payload could not be parsed
|
||||||
* to entity class.
|
* to entity class.
|
||||||
@@ -24,6 +26,7 @@ package de.stklcode.jvault.connector.exception;
|
|||||||
* @since 0.1
|
* @since 0.1
|
||||||
*/
|
*/
|
||||||
public final class InvalidResponseException extends VaultConnectorException {
|
public final class InvalidResponseException extends VaultConnectorException {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 2003151038614163479L;
|
private static final long serialVersionUID = 2003151038614163479L;
|
||||||
|
|
||||||
private final Integer statusCode;
|
private final Integer statusCode;
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.exception;
|
package de.stklcode.jvault.connector.exception;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception thrown when trying to access a path the current user/token does not have permission to access.
|
* Exception thrown when trying to access a path the current user/token does not have permission to access.
|
||||||
*
|
*
|
||||||
@@ -23,6 +25,7 @@ package de.stklcode.jvault.connector.exception;
|
|||||||
* @since 0.1
|
* @since 0.1
|
||||||
*/
|
*/
|
||||||
public class PermissionDeniedException extends VaultConnectorException {
|
public class PermissionDeniedException extends VaultConnectorException {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -7149134015090750776L;
|
private static final long serialVersionUID = -7149134015090750776L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.exception;
|
package de.stklcode.jvault.connector.exception;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exception thrown on errors with TLS connection.
|
* Exception thrown on errors with TLS connection.
|
||||||
*
|
*
|
||||||
@@ -23,6 +25,7 @@ package de.stklcode.jvault.connector.exception;
|
|||||||
* @since 0.4.0
|
* @since 0.4.0
|
||||||
*/
|
*/
|
||||||
public class TlsException extends VaultConnectorException {
|
public class TlsException extends VaultConnectorException {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -5139276834988258086L;
|
private static final long serialVersionUID = -5139276834988258086L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.exception;
|
package de.stklcode.jvault.connector.exception;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Abstract Exception class for Vault Connector internal exceptions.
|
* Abstract Exception class for Vault Connector internal exceptions.
|
||||||
*
|
*
|
||||||
@@ -23,6 +25,7 @@ package de.stklcode.jvault.connector.exception;
|
|||||||
* @since 0.1
|
* @since 0.1
|
||||||
*/
|
*/
|
||||||
public abstract class VaultConnectorException extends Exception {
|
public abstract class VaultConnectorException extends Exception {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -2612477894310906036L;
|
private static final long serialVersionUID = -2612477894310906036L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -18,6 +18,8 @@ package de.stklcode.jvault.connector.model;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.*;
|
import com.fasterxml.jackson.annotation.*;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -32,7 +34,8 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class AppRole implements Serializable {
|
public final class AppRole implements Serializable {
|
||||||
private static final long serialVersionUID = 693228837510483448L;
|
@Serial
|
||||||
|
private static final long serialVersionUID = 1546673231280751679L;
|
||||||
|
|
||||||
@JsonProperty("role_name")
|
@JsonProperty("role_name")
|
||||||
private String name;
|
private String name;
|
||||||
@@ -53,7 +56,7 @@ public final class AppRole implements Serializable {
|
|||||||
|
|
||||||
@JsonProperty("secret_id_ttl")
|
@JsonProperty("secret_id_ttl")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
private Integer secretIdTtl;
|
private Long secretIdTtl;
|
||||||
|
|
||||||
@JsonProperty("local_secret_ids")
|
@JsonProperty("local_secret_ids")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
@@ -61,11 +64,11 @@ public final class AppRole implements Serializable {
|
|||||||
|
|
||||||
@JsonProperty("token_ttl")
|
@JsonProperty("token_ttl")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
private Integer tokenTtl;
|
private Long tokenTtl;
|
||||||
|
|
||||||
@JsonProperty("token_max_ttl")
|
@JsonProperty("token_max_ttl")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
private Integer tokenMaxTtl;
|
private Long tokenMaxTtl;
|
||||||
|
|
||||||
private List<String> tokenPolicies;
|
private List<String> tokenPolicies;
|
||||||
|
|
||||||
@@ -75,7 +78,7 @@ public final class AppRole implements Serializable {
|
|||||||
|
|
||||||
@JsonProperty("token_explicit_max_ttl")
|
@JsonProperty("token_explicit_max_ttl")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
private Integer tokenExplicitMaxTtl;
|
private Long tokenExplicitMaxTtl;
|
||||||
|
|
||||||
@JsonProperty("token_no_default_policy")
|
@JsonProperty("token_no_default_policy")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
@@ -255,7 +258,7 @@ public final class AppRole implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* @return maximum TTL in seconds for secrets
|
* @return maximum TTL in seconds for secrets
|
||||||
*/
|
*/
|
||||||
public Integer getSecretIdTtl() {
|
public Long getSecretIdTtl() {
|
||||||
return secretIdTtl;
|
return secretIdTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -271,14 +274,14 @@ public final class AppRole implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* @return token TTL in seconds
|
* @return token TTL in seconds
|
||||||
*/
|
*/
|
||||||
public Integer getTokenTtl() {
|
public Long getTokenTtl() {
|
||||||
return tokenTtl;
|
return tokenTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return maximum token TTL in seconds, including renewals
|
* @return maximum token TTL in seconds, including renewals
|
||||||
*/
|
*/
|
||||||
public Integer getTokenMaxTtl() {
|
public Long getTokenMaxTtl() {
|
||||||
return tokenMaxTtl;
|
return tokenMaxTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -286,7 +289,7 @@ public final class AppRole implements Serializable {
|
|||||||
* @return explicit maximum token TTL in seconds, including renewals
|
* @return explicit maximum token TTL in seconds, including renewals
|
||||||
* @since 0.9
|
* @since 0.9
|
||||||
*/
|
*/
|
||||||
public Integer getTokenExplicitMaxTtl() {
|
public Long getTokenExplicitMaxTtl() {
|
||||||
return tokenExplicitMaxTtl;
|
return tokenExplicitMaxTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -370,12 +373,12 @@ public final class AppRole implements Serializable {
|
|||||||
private List<String> secretIdBoundCidrs;
|
private List<String> secretIdBoundCidrs;
|
||||||
private List<String> tokenPolicies;
|
private List<String> tokenPolicies;
|
||||||
private Integer secretIdNumUses;
|
private Integer secretIdNumUses;
|
||||||
private Integer secretIdTtl;
|
private Long secretIdTtl;
|
||||||
private Boolean localSecretIds;
|
private Boolean localSecretIds;
|
||||||
private Integer tokenTtl;
|
private Long tokenTtl;
|
||||||
private Integer tokenMaxTtl;
|
private Long tokenMaxTtl;
|
||||||
private List<String> tokenBoundCidrs;
|
private List<String> tokenBoundCidrs;
|
||||||
private Integer tokenExplicitMaxTtl;
|
private Long tokenExplicitMaxTtl;
|
||||||
private Boolean tokenNoDefaultPolicy;
|
private Boolean tokenNoDefaultPolicy;
|
||||||
private Integer tokenNumUses;
|
private Integer tokenNumUses;
|
||||||
private Integer tokenPeriod;
|
private Integer tokenPeriod;
|
||||||
@@ -520,7 +523,7 @@ public final class AppRole implements Serializable {
|
|||||||
* @param secretIdTtl the TTL
|
* @param secretIdTtl the TTL
|
||||||
* @return self
|
* @return self
|
||||||
*/
|
*/
|
||||||
public Builder withSecretIdTtl(final Integer secretIdTtl) {
|
public Builder withSecretIdTtl(final Long secretIdTtl) {
|
||||||
this.secretIdTtl = secretIdTtl;
|
this.secretIdTtl = secretIdTtl;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -544,7 +547,7 @@ public final class AppRole implements Serializable {
|
|||||||
* @param tokenTtl the TTL
|
* @param tokenTtl the TTL
|
||||||
* @return self
|
* @return self
|
||||||
*/
|
*/
|
||||||
public Builder withTokenTtl(final Integer tokenTtl) {
|
public Builder withTokenTtl(final Long tokenTtl) {
|
||||||
this.tokenTtl = tokenTtl;
|
this.tokenTtl = tokenTtl;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -555,7 +558,7 @@ public final class AppRole implements Serializable {
|
|||||||
* @param tokenMaxTtl the TTL
|
* @param tokenMaxTtl the TTL
|
||||||
* @return self
|
* @return self
|
||||||
*/
|
*/
|
||||||
public Builder withTokenMaxTtl(final Integer tokenMaxTtl) {
|
public Builder withTokenMaxTtl(final Long tokenMaxTtl) {
|
||||||
this.tokenMaxTtl = tokenMaxTtl;
|
this.tokenMaxTtl = tokenMaxTtl;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -596,7 +599,7 @@ public final class AppRole implements Serializable {
|
|||||||
* @param tokenExplicitMaxTtl the TTL
|
* @param tokenExplicitMaxTtl the TTL
|
||||||
* @return self
|
* @return self
|
||||||
*/
|
*/
|
||||||
public Builder withTokenExplicitMaxTtl(final Integer tokenExplicitMaxTtl) {
|
public Builder withTokenExplicitMaxTtl(final Long tokenExplicitMaxTtl) {
|
||||||
this.tokenExplicitMaxTtl = tokenExplicitMaxTtl;
|
this.tokenExplicitMaxTtl = tokenExplicitMaxTtl;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@@ -18,6 +18,7 @@ package de.stklcode.jvault.connector.model;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.*;
|
import com.fasterxml.jackson.annotation.*;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -32,6 +33,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class AppRoleSecret implements Serializable {
|
public final class AppRoleSecret implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -3401074170145792641L;
|
private static final long serialVersionUID = -3401074170145792641L;
|
||||||
|
|
||||||
@JsonProperty("secret_id")
|
@JsonProperty("secret_id")
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@@ -32,7 +33,8 @@ import java.util.*;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class Token implements Serializable {
|
public final class Token implements Serializable {
|
||||||
private static final long serialVersionUID = 5208508683665365287L;
|
@Serial
|
||||||
|
private static final long serialVersionUID = 7003016071684507115L;
|
||||||
|
|
||||||
@JsonProperty("id")
|
@JsonProperty("id")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
@@ -56,11 +58,11 @@ public final class Token implements Serializable {
|
|||||||
|
|
||||||
@JsonProperty("ttl")
|
@JsonProperty("ttl")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
private Integer ttl;
|
private Long ttl;
|
||||||
|
|
||||||
@JsonProperty("explicit_max_ttl")
|
@JsonProperty("explicit_max_ttl")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
private Integer explicitMaxTtl;
|
private Long explicitMaxTtl;
|
||||||
|
|
||||||
@JsonProperty("num_uses")
|
@JsonProperty("num_uses")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
@@ -162,7 +164,7 @@ public final class Token implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* @return Time-to-live in seconds
|
* @return Time-to-live in seconds
|
||||||
*/
|
*/
|
||||||
public Integer getTtl() {
|
public Long getTtl() {
|
||||||
return ttl;
|
return ttl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,7 +172,7 @@ public final class Token implements Serializable {
|
|||||||
* @return Explicit maximum time-to-live in seconds
|
* @return Explicit maximum time-to-live in seconds
|
||||||
* @since 0.9
|
* @since 0.9
|
||||||
*/
|
*/
|
||||||
public Integer getExplicitMaxTtl() {
|
public Long getExplicitMaxTtl() {
|
||||||
return explicitMaxTtl;
|
return explicitMaxTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -282,8 +284,8 @@ public final class Token implements Serializable {
|
|||||||
private String displayName;
|
private String displayName;
|
||||||
private Boolean noParent;
|
private Boolean noParent;
|
||||||
private Boolean noDefaultPolicy;
|
private Boolean noDefaultPolicy;
|
||||||
private Integer ttl;
|
private Long ttl;
|
||||||
private Integer explicitMaxTtl;
|
private Long explicitMaxTtl;
|
||||||
private Integer numUses;
|
private Integer numUses;
|
||||||
private List<String> policies;
|
private List<String> policies;
|
||||||
private Map<String, String> meta;
|
private Map<String, String> meta;
|
||||||
@@ -331,7 +333,7 @@ public final class Token implements Serializable {
|
|||||||
* @param ttl the ttl
|
* @param ttl the ttl
|
||||||
* @return self
|
* @return self
|
||||||
*/
|
*/
|
||||||
public Builder withTtl(final Integer ttl) {
|
public Builder withTtl(final Long ttl) {
|
||||||
this.ttl = ttl;
|
this.ttl = ttl;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -342,7 +344,7 @@ public final class Token implements Serializable {
|
|||||||
* @param explicitMaxTtl the explicit max. TTL
|
* @param explicitMaxTtl the explicit max. TTL
|
||||||
* @return self
|
* @return self
|
||||||
*/
|
*/
|
||||||
public Builder withExplicitMaxTtl(final Integer explicitMaxTtl) {
|
public Builder withExplicitMaxTtl(final Long explicitMaxTtl) {
|
||||||
this.explicitMaxTtl = explicitMaxTtl;
|
this.explicitMaxTtl = explicitMaxTtl;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -34,7 +35,8 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class TokenRole implements Serializable {
|
public final class TokenRole implements Serializable {
|
||||||
private static final long serialVersionUID = -3505215215838576321L;
|
@Serial
|
||||||
|
private static final long serialVersionUID = -4856948364869438439L;
|
||||||
|
|
||||||
@JsonProperty("name")
|
@JsonProperty("name")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
@@ -78,7 +80,7 @@ public final class TokenRole implements Serializable {
|
|||||||
|
|
||||||
@JsonProperty("token_explicit_max_ttl")
|
@JsonProperty("token_explicit_max_ttl")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
private Integer tokenExplicitMaxTtl;
|
private Long tokenExplicitMaxTtl;
|
||||||
|
|
||||||
@JsonProperty("token_no_default_policy")
|
@JsonProperty("token_no_default_policy")
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
@@ -204,7 +206,7 @@ public final class TokenRole implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* @return Token explicit maximum TTL
|
* @return Token explicit maximum TTL
|
||||||
*/
|
*/
|
||||||
public Integer getTokenExplicitMaxTtl() {
|
public Long getTokenExplicitMaxTtl() {
|
||||||
return tokenExplicitMaxTtl;
|
return tokenExplicitMaxTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -285,7 +287,7 @@ public final class TokenRole implements Serializable {
|
|||||||
private String pathSuffix;
|
private String pathSuffix;
|
||||||
private List<String> allowedEntityAliases;
|
private List<String> allowedEntityAliases;
|
||||||
private List<String> tokenBoundCidrs;
|
private List<String> tokenBoundCidrs;
|
||||||
private Integer tokenExplicitMaxTtl;
|
private Long tokenExplicitMaxTtl;
|
||||||
private Boolean tokenNoDefaultPolicy;
|
private Boolean tokenNoDefaultPolicy;
|
||||||
private Integer tokenNumUses;
|
private Integer tokenNumUses;
|
||||||
private Integer tokenPeriod;
|
private Integer tokenPeriod;
|
||||||
@@ -537,7 +539,7 @@ public final class TokenRole implements Serializable {
|
|||||||
* @param tokenExplicitMaxTtl explicit maximum TTL
|
* @param tokenExplicitMaxTtl explicit maximum TTL
|
||||||
* @return self
|
* @return self
|
||||||
*/
|
*/
|
||||||
public Builder withTokenExplicitMaxTtl(final Integer tokenExplicitMaxTtl) {
|
public Builder withTokenExplicitMaxTtl(final Long tokenExplicitMaxTtl) {
|
||||||
this.tokenExplicitMaxTtl = tokenExplicitMaxTtl;
|
this.tokenExplicitMaxTtl = tokenExplicitMaxTtl;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import de.stklcode.jvault.connector.model.AppRole;
|
import de.stklcode.jvault.connector.model.AppRole;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,6 +31,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class AppRoleResponse extends VaultDataResponse {
|
public final class AppRoleResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -6536422219633829177L;
|
private static final long serialVersionUID = -6536422219633829177L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import de.stklcode.jvault.connector.model.AppRoleSecret;
|
import de.stklcode.jvault.connector.model.AppRoleSecret;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,6 +31,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class AppRoleSecretResponse extends VaultDataResponse {
|
public final class AppRoleSecretResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -2484103304072370585L;
|
private static final long serialVersionUID = -2484103304072370585L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.AuthMethod;
|
import de.stklcode.jvault.connector.model.response.embedded.AuthMethod;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -32,6 +33,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class AuthMethodsResponse extends VaultDataResponse {
|
public final class AuthMethodsResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -1802724129533405375L;
|
private static final long serialVersionUID = -1802724129533405375L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -19,6 +19,8 @@ package de.stklcode.jvault.connector.model.response;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.AuthData;
|
import de.stklcode.jvault.connector.model.response.embedded.AuthData;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Vault response for authentication providing auth info in {@link AuthData} field.
|
* Vault response for authentication providing auth info in {@link AuthData} field.
|
||||||
*
|
*
|
||||||
@@ -27,5 +29,6 @@ import de.stklcode.jvault.connector.model.response.embedded.AuthData;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class AuthResponse extends VaultDataResponse {
|
public final class AuthResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 1628851361067456715L;
|
private static final long serialVersionUID = 1628851361067456715L;
|
||||||
}
|
}
|
||||||
|
@@ -18,6 +18,8 @@ package de.stklcode.jvault.connector.model.response;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Vault response from credentials lookup. Simple wrapper for data objects containing username and password fields.
|
* Vault response from credentials lookup. Simple wrapper for data objects containing username and password fields.
|
||||||
*
|
*
|
||||||
@@ -26,6 +28,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class CredentialsResponse extends PlainSecretResponse {
|
public final class CredentialsResponse extends PlainSecretResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -1439692963299045425L;
|
private static final long serialVersionUID = -1439692963299045425L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@@ -30,6 +31,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class ErrorResponse implements VaultResponse {
|
public final class ErrorResponse implements VaultResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -6227368087842549149L;
|
private static final long serialVersionUID = -6227368087842549149L;
|
||||||
|
|
||||||
@JsonProperty("errors")
|
@JsonProperty("errors")
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -29,6 +30,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class HealthResponse implements VaultResponse {
|
public final class HealthResponse implements VaultResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 8675155916902904516L;
|
private static final long serialVersionUID = 8675155916902904516L;
|
||||||
|
|
||||||
@JsonProperty("cluster_id")
|
@JsonProperty("cluster_id")
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -29,6 +30,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class HelpResponse implements VaultResponse {
|
public final class HelpResponse implements VaultResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -1152070966642848490L;
|
private static final long serialVersionUID = -1152070966642848490L;
|
||||||
|
|
||||||
@JsonProperty("help")
|
@JsonProperty("help")
|
||||||
|
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
|||||||
import de.stklcode.jvault.connector.model.response.embedded.SecretWrapper;
|
import de.stklcode.jvault.connector.model.response.embedded.SecretWrapper;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -34,6 +35,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class MetaSecretResponse extends SecretResponse {
|
public class MetaSecretResponse extends SecretResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -1076542846391240162L;
|
private static final long serialVersionUID = -1076542846391240162L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.SecretMetadata;
|
import de.stklcode.jvault.connector.model.response.embedded.SecretMetadata;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
|
||||||
@@ -31,6 +32,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class MetadataResponse extends VaultDataResponse {
|
public class MetadataResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -3679762333630984679L;
|
private static final long serialVersionUID = -3679762333630984679L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -33,6 +34,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class PlainSecretResponse extends SecretResponse {
|
public class PlainSecretResponse extends SecretResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 3010138542437913023L;
|
private static final long serialVersionUID = 3010138542437913023L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -31,6 +32,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class RawDataResponse extends VaultDataResponse {
|
public final class RawDataResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -319727427792124071L;
|
private static final long serialVersionUID = -319727427792124071L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@@ -30,6 +31,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SealResponse implements VaultResponse {
|
public final class SealResponse implements VaultResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -6000309255473305787L;
|
private static final long serialVersionUID = -6000309255473305787L;
|
||||||
|
|
||||||
@JsonProperty("type")
|
@JsonProperty("type")
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.SecretListWrapper;
|
import de.stklcode.jvault.connector.model.response.embedded.SecretListWrapper;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -32,8 +33,9 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SecretListResponse extends VaultDataResponse {
|
public final class SecretListResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 8597121175002967213L;
|
private static final long serialVersionUID = 8597121175002967213L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
private SecretListWrapper data;
|
private SecretListWrapper data;
|
||||||
|
|
||||||
|
@@ -25,6 +25,7 @@ import de.stklcode.jvault.connector.exception.InvalidResponseException;
|
|||||||
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -37,6 +38,7 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public abstract class SecretResponse extends VaultDataResponse {
|
public abstract class SecretResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 5198088815871692951L;
|
private static final long serialVersionUID = 5198088815871692951L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
import de.stklcode.jvault.connector.model.response.embedded.VersionMetadata;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,6 +31,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class SecretVersionResponse extends VaultDataResponse {
|
public class SecretVersionResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 2748635005258576174L;
|
private static final long serialVersionUID = 2748635005258576174L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.TokenData;
|
import de.stklcode.jvault.connector.model.response.embedded.TokenData;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,6 +31,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class TokenResponse extends VaultDataResponse {
|
public final class TokenResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -4341114947980033457L;
|
private static final long serialVersionUID = -4341114947980033457L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
|||||||
import de.stklcode.jvault.connector.model.TokenRole;
|
import de.stklcode.jvault.connector.model.TokenRole;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.TokenData;
|
import de.stklcode.jvault.connector.model.response.embedded.TokenData;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -31,6 +32,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class TokenRoleResponse extends VaultDataResponse {
|
public final class TokenRoleResponse extends VaultDataResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 5265363857731948626L;
|
private static final long serialVersionUID = 5265363857731948626L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -18,6 +18,7 @@ package de.stklcode.jvault.connector.model.response;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonSetter;
|
import com.fasterxml.jackson.annotation.JsonSetter;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@@ -29,6 +30,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
public class TransitResponse extends VaultDataResponse {
|
public class TransitResponse extends VaultDataResponse {
|
||||||
|
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 6873804240772242771L;
|
private static final long serialVersionUID = 6873804240772242771L;
|
||||||
|
|
||||||
private String ciphertext;
|
private String ciphertext;
|
||||||
|
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
|||||||
import de.stklcode.jvault.connector.model.response.embedded.AuthData;
|
import de.stklcode.jvault.connector.model.response.embedded.AuthData;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.WrapInfo;
|
import de.stklcode.jvault.connector.model.response.embedded.WrapInfo;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@@ -30,6 +31,7 @@ import java.util.Objects;
|
|||||||
* @since 0.1
|
* @since 0.1
|
||||||
*/
|
*/
|
||||||
public abstract class VaultDataResponse implements VaultResponse {
|
public abstract class VaultDataResponse implements VaultResponse {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 4787715235558510045L;
|
private static final long serialVersionUID = 4787715235558510045L;
|
||||||
|
|
||||||
@JsonProperty("request_id")
|
@JsonProperty("request_id")
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -33,6 +34,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class AuthData implements Serializable {
|
public final class AuthData implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 5969334512309655317L;
|
private static final long serialVersionUID = 5969334512309655317L;
|
||||||
|
|
||||||
@JsonProperty("client_token")
|
@JsonProperty("client_token")
|
||||||
|
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
|||||||
import com.fasterxml.jackson.annotation.JsonSetter;
|
import com.fasterxml.jackson.annotation.JsonSetter;
|
||||||
import de.stklcode.jvault.connector.model.AuthBackend;
|
import de.stklcode.jvault.connector.model.AuthBackend;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -34,6 +35,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class AuthMethod implements Serializable {
|
public final class AuthMethod implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -439987082190917691L;
|
private static final long serialVersionUID = -439987082190917691L;
|
||||||
|
|
||||||
private AuthBackend type;
|
private AuthBackend type;
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -31,6 +32,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class MfaConstraintAny implements Serializable {
|
public final class MfaConstraintAny implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 1226126781813149627L;
|
private static final long serialVersionUID = 1226126781813149627L;
|
||||||
|
|
||||||
@JsonProperty("any")
|
@JsonProperty("any")
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@@ -30,6 +31,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class MfaMethodId implements Serializable {
|
public final class MfaMethodId implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 691298070242998814L;
|
private static final long serialVersionUID = 691298070242998814L;
|
||||||
|
|
||||||
@JsonProperty("type")
|
@JsonProperty("type")
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -31,6 +32,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class MfaRequirement implements Serializable {
|
public final class MfaRequirement implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -2516941512455319638L;
|
private static final long serialVersionUID = -2516941512455319638L;
|
||||||
|
|
||||||
@JsonProperty("mfa_request_id")
|
@JsonProperty("mfa_request_id")
|
||||||
|
@@ -3,6 +3,8 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -15,13 +17,14 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class MountConfig implements Serializable {
|
public class MountConfig implements Serializable {
|
||||||
private static final long serialVersionUID = -8653909672663717792L;
|
@Serial
|
||||||
|
private static final long serialVersionUID = 7241631159224756605L;
|
||||||
|
|
||||||
@JsonProperty("default_lease_ttl")
|
@JsonProperty("default_lease_ttl")
|
||||||
private Integer defaultLeaseTtl;
|
private Long defaultLeaseTtl;
|
||||||
|
|
||||||
@JsonProperty("max_lease_ttl")
|
@JsonProperty("max_lease_ttl")
|
||||||
private Integer maxLeaseTtl;
|
private Long maxLeaseTtl;
|
||||||
|
|
||||||
@JsonProperty("force_no_cache")
|
@JsonProperty("force_no_cache")
|
||||||
private Boolean forceNoCache;
|
private Boolean forceNoCache;
|
||||||
@@ -56,14 +59,14 @@ public class MountConfig implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* @return Default lease TTL
|
* @return Default lease TTL
|
||||||
*/
|
*/
|
||||||
public Integer getDefaultLeaseTtl() {
|
public Long getDefaultLeaseTtl() {
|
||||||
return defaultLeaseTtl;
|
return defaultLeaseTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Maximum lease TTL
|
* @return Maximum lease TTL
|
||||||
*/
|
*/
|
||||||
public Integer getMaxLeaseTtl() {
|
public Long getMaxLeaseTtl() {
|
||||||
return maxLeaseTtl;
|
return maxLeaseTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -3,6 +3,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -16,7 +17,9 @@ import java.util.Objects;
|
|||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class SecretListWrapper implements Serializable {
|
public class SecretListWrapper implements Serializable {
|
||||||
|
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -8777605197063766125L;
|
private static final long serialVersionUID = -8777605197063766125L;
|
||||||
|
|
||||||
@JsonProperty("keys")
|
@JsonProperty("keys")
|
||||||
private List<String> keys;
|
private List<String> keys;
|
||||||
|
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -34,6 +35,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SecretMetadata implements Serializable {
|
public final class SecretMetadata implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -905059942871916214L;
|
private static final long serialVersionUID = -905059942871916214L;
|
||||||
|
|
||||||
@JsonProperty("created_time")
|
@JsonProperty("created_time")
|
||||||
|
@@ -3,6 +3,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -15,6 +16,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class SecretWrapper implements Serializable {
|
public class SecretWrapper implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 8600413181758893378L;
|
private static final long serialVersionUID = 8600413181758893378L;
|
||||||
|
|
||||||
@JsonProperty("data")
|
@JsonProperty("data")
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -34,7 +35,8 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class TokenData implements Serializable {
|
public final class TokenData implements Serializable {
|
||||||
private static final long serialVersionUID = -5749716740973138916L;
|
@Serial
|
||||||
|
private static final long serialVersionUID = -4168046151053509784L;
|
||||||
|
|
||||||
@JsonProperty("accessor")
|
@JsonProperty("accessor")
|
||||||
private String accessor;
|
private String accessor;
|
||||||
@@ -43,7 +45,7 @@ public final class TokenData implements Serializable {
|
|||||||
private Integer creationTime;
|
private Integer creationTime;
|
||||||
|
|
||||||
@JsonProperty("creation_ttl")
|
@JsonProperty("creation_ttl")
|
||||||
private Integer creationTtl;
|
private Long creationTtl;
|
||||||
|
|
||||||
@JsonProperty("display_name")
|
@JsonProperty("display_name")
|
||||||
private String name;
|
private String name;
|
||||||
@@ -55,7 +57,7 @@ public final class TokenData implements Serializable {
|
|||||||
private ZonedDateTime expireTime;
|
private ZonedDateTime expireTime;
|
||||||
|
|
||||||
@JsonProperty("explicit_max_ttl")
|
@JsonProperty("explicit_max_ttl")
|
||||||
private Integer explicitMaxTtl;
|
private Long explicitMaxTtl;
|
||||||
|
|
||||||
@JsonProperty("id")
|
@JsonProperty("id")
|
||||||
private String id;
|
private String id;
|
||||||
@@ -82,7 +84,7 @@ public final class TokenData implements Serializable {
|
|||||||
private boolean renewable;
|
private boolean renewable;
|
||||||
|
|
||||||
@JsonProperty("ttl")
|
@JsonProperty("ttl")
|
||||||
private Integer ttl;
|
private Long ttl;
|
||||||
|
|
||||||
@JsonProperty("type")
|
@JsonProperty("type")
|
||||||
private String type;
|
private String type;
|
||||||
@@ -104,7 +106,7 @@ public final class TokenData implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* @return Creation TTL (in seconds)
|
* @return Creation TTL (in seconds)
|
||||||
*/
|
*/
|
||||||
public Integer getCreationTtl() {
|
public Long getCreationTtl() {
|
||||||
return creationTtl;
|
return creationTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -135,7 +137,7 @@ public final class TokenData implements Serializable {
|
|||||||
* @return Explicit maximum TTL
|
* @return Explicit maximum TTL
|
||||||
* @since 0.9
|
* @since 0.9
|
||||||
*/
|
*/
|
||||||
public Integer getExplicitMaxTtl() {
|
public Long getExplicitMaxTtl() {
|
||||||
return explicitMaxTtl;
|
return explicitMaxTtl;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -202,7 +204,7 @@ public final class TokenData implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* @return Token TTL (in seconds)
|
* @return Token TTL (in seconds)
|
||||||
*/
|
*/
|
||||||
public Integer getTtl() {
|
public Long getTtl() {
|
||||||
return ttl;
|
return ttl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -3,6 +3,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@@ -14,6 +15,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class UserLockoutConfig implements Serializable {
|
public class UserLockoutConfig implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = -8051060041593140550L;
|
private static final long serialVersionUID = -8051060041593140550L;
|
||||||
|
|
||||||
@JsonProperty("lockout_threshold")
|
@JsonProperty("lockout_threshold")
|
||||||
|
@@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -34,6 +35,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class VersionMetadata implements Serializable {
|
public final class VersionMetadata implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 8495687554714216478L;
|
private static final long serialVersionUID = 8495687554714216478L;
|
||||||
|
|
||||||
@JsonProperty("created_time")
|
@JsonProperty("created_time")
|
||||||
|
@@ -18,6 +18,7 @@ package de.stklcode.jvault.connector.model.response.embedded;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -29,6 +30,7 @@ import java.util.Objects;
|
|||||||
* @since 1.1
|
* @since 1.1
|
||||||
*/
|
*/
|
||||||
public class WrapInfo implements Serializable {
|
public class WrapInfo implements Serializable {
|
||||||
|
@Serial
|
||||||
private static final long serialVersionUID = 4864973237090355607L;
|
private static final long serialVersionUID = 4864973237090355607L;
|
||||||
|
|
||||||
@JsonProperty("token")
|
@JsonProperty("token")
|
||||||
|
@@ -52,7 +52,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.19.5"; // The vault version this test is supposed to run against.
|
private static String VAULT_VERSION = "1.20.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";
|
||||||
@@ -862,7 +862,7 @@ class HTTPVaultConnectorIT {
|
|||||||
.withDefaultPolicy()
|
.withDefaultPolicy()
|
||||||
.withMeta("test", "success")
|
.withMeta("test", "success")
|
||||||
.withMeta("key", "value")
|
.withMeta("key", "value")
|
||||||
.withTtl(1234)
|
.withTtl(1234L)
|
||||||
.build();
|
.build();
|
||||||
InvalidResponseException e = assertThrows(
|
InvalidResponseException e = assertThrows(
|
||||||
InvalidResponseException.class,
|
InvalidResponseException.class,
|
||||||
@@ -1222,7 +1222,7 @@ class HTTPVaultConnectorIT {
|
|||||||
// Write configuration file.
|
// Write configuration file.
|
||||||
File configFile = new File(dir, "vault.conf");
|
File configFile = new File(dir, "vault.conf");
|
||||||
try {
|
try {
|
||||||
Files.write(configFile.toPath(), config.toString().getBytes(UTF_8));
|
Files.writeString(configFile.toPath(), config.toString(), UTF_8);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new IllegalStateException("Unable to generate config file", e);
|
throw new IllegalStateException("Unable to generate config file", e);
|
||||||
}
|
}
|
||||||
@@ -1282,10 +1282,8 @@ class HTTPVaultConnectorIT {
|
|||||||
|
|
||||||
return socket.getLocalPort();
|
return socket.getLocalPort();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
throw new IllegalStateException("Unable to find a free TCP port", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new IllegalStateException("Unable to find a free TCP port");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -42,11 +42,11 @@ class AppRoleTest extends AbstractModelTest<AppRole> {
|
|||||||
private static final String POLICY = "policy";
|
private static final String POLICY = "policy";
|
||||||
private static final String POLICY_2 = "policy2";
|
private static final String POLICY_2 = "policy2";
|
||||||
private static final Integer SECRET_ID_NUM_USES = 10;
|
private static final Integer SECRET_ID_NUM_USES = 10;
|
||||||
private static final Integer SECRET_ID_TTL = 7200;
|
private static final Long SECRET_ID_TTL = 7200L;
|
||||||
private static final Boolean LOCAL_SECRET_IDS = false;
|
private static final Boolean LOCAL_SECRET_IDS = false;
|
||||||
private static final Integer TOKEN_TTL = 4800;
|
private static final Long TOKEN_TTL = 4800L;
|
||||||
private static final Integer TOKEN_MAX_TTL = 9600;
|
private static final Long TOKEN_MAX_TTL = 9600L;
|
||||||
private static final Integer TOKEN_EXPLICIT_MAX_TTL = 14400;
|
private static final Long TOKEN_EXPLICIT_MAX_TTL = 14400L;
|
||||||
private static final Boolean TOKEN_NO_DEFAULT_POLICY = false;
|
private static final Boolean TOKEN_NO_DEFAULT_POLICY = false;
|
||||||
private static final Integer TOKEN_NUM_USES = 42;
|
private static final Integer TOKEN_NUM_USES = 42;
|
||||||
private static final Integer TOKEN_PERIOD = 1234;
|
private static final Integer TOKEN_PERIOD = 1234;
|
||||||
|
@@ -59,7 +59,7 @@ class TokenRoleTest extends AbstractModelTest<TokenRole> {
|
|||||||
private static final String TOKEN_BOUND_CIDR_2 = "198.51.100.0/24";
|
private static final String TOKEN_BOUND_CIDR_2 = "198.51.100.0/24";
|
||||||
private static final String TOKEN_BOUND_CIDR_3 = "203.0.113.0/24";
|
private static final String TOKEN_BOUND_CIDR_3 = "203.0.113.0/24";
|
||||||
private static final List<String> TOKEN_BOUND_CIDRS = Arrays.asList(TOKEN_BOUND_CIDR_2, TOKEN_BOUND_CIDR_1);
|
private static final List<String> TOKEN_BOUND_CIDRS = Arrays.asList(TOKEN_BOUND_CIDR_2, TOKEN_BOUND_CIDR_1);
|
||||||
private static final Integer TOKEN_EXPLICIT_MAX_TTL = 1234;
|
private static final Long TOKEN_EXPLICIT_MAX_TTL = 1234L;
|
||||||
private static final Boolean TOKEN_NO_DEFAULT_POLICY = false;
|
private static final Boolean TOKEN_NO_DEFAULT_POLICY = false;
|
||||||
private static final Integer TOKEN_NUM_USES = 5;
|
private static final Integer TOKEN_NUM_USES = 5;
|
||||||
private static final Integer TOKEN_PERIOD = 2345;
|
private static final Integer TOKEN_PERIOD = 2345;
|
||||||
|
@@ -35,8 +35,8 @@ class TokenTest extends AbstractModelTest<Token> {
|
|||||||
private static final String DISPLAY_NAME = "display-name";
|
private static final String DISPLAY_NAME = "display-name";
|
||||||
private static final Boolean NO_PARENT = false;
|
private static final Boolean NO_PARENT = false;
|
||||||
private static final Boolean NO_DEFAULT_POLICY = false;
|
private static final Boolean NO_DEFAULT_POLICY = false;
|
||||||
private static final Integer TTL = 123;
|
private static final Long TTL = 123L;
|
||||||
private static final Integer EXPLICIT_MAX_TTL = 456;
|
private static final Long EXPLICIT_MAX_TTL = 456L;
|
||||||
private static final Integer NUM_USES = 4;
|
private static final Integer NUM_USES = 4;
|
||||||
private static final List<String> POLICIES = new ArrayList<>();
|
private static final List<String> POLICIES = new ArrayList<>();
|
||||||
private static final String POLICY = "policy";
|
private static final String POLICY = "policy";
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import de.stklcode.jvault.connector.model.AppRole;
|
import de.stklcode.jvault.connector.model.AppRole;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -32,9 +31,9 @@ import static org.junit.jupiter.api.Assertions.*;
|
|||||||
* @since 0.6.2
|
* @since 0.6.2
|
||||||
*/
|
*/
|
||||||
class AppRoleResponseTest extends AbstractModelTest<AppRoleResponse> {
|
class AppRoleResponseTest extends AbstractModelTest<AppRoleResponse> {
|
||||||
private static final Integer ROLE_TOKEN_TTL = 1200;
|
private static final Long ROLE_TOKEN_TTL = 1200L;
|
||||||
private static final Integer ROLE_TOKEN_MAX_TTL = 1800;
|
private static final Long ROLE_TOKEN_MAX_TTL = 1800L;
|
||||||
private static final Integer ROLE_SECRET_TTL = 600;
|
private static final Long ROLE_SECRET_TTL = 600L;
|
||||||
private static final Integer ROLE_SECRET_NUM_USES = 40;
|
private static final Integer ROLE_SECRET_NUM_USES = 40;
|
||||||
private static final String ROLE_POLICY = "default";
|
private static final String ROLE_POLICY = "default";
|
||||||
private static final Integer ROLE_PERIOD = 0;
|
private static final Integer ROLE_PERIOD = 0;
|
||||||
@@ -67,12 +66,10 @@ class AppRoleResponseTest extends AbstractModelTest<AppRoleResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected AppRoleResponse createFull() {
|
protected AppRoleResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, AppRoleResponse.class);
|
() -> objectMapper.readValue(RES_JSON, AppRoleResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import de.stklcode.jvault.connector.model.AuthBackend;
|
import de.stklcode.jvault.connector.model.AuthBackend;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.AuthMethod;
|
import de.stklcode.jvault.connector.model.response.embedded.AuthMethod;
|
||||||
@@ -45,9 +44,9 @@ class AuthMethodsResponseTest extends AbstractModelTest<AuthMethodsResponse> {
|
|||||||
private static final String TK_UUID = "32ea9681-6bd6-6cec-eec3-d11260ba9741";
|
private static final String TK_UUID = "32ea9681-6bd6-6cec-eec3-d11260ba9741";
|
||||||
private static final String TK_ACCESSOR = "auth_token_ac0dd95a";
|
private static final String TK_ACCESSOR = "auth_token_ac0dd95a";
|
||||||
private static final String TK_DESCR = "token based credentials";
|
private static final String TK_DESCR = "token based credentials";
|
||||||
private static final Integer TK_LEASE_TTL = 0;
|
private static final Long TK_LEASE_TTL = 0L;
|
||||||
private static final Boolean TK_FORCE_NO_CACHE = false;
|
private static final Boolean TK_FORCE_NO_CACHE = false;
|
||||||
private static final Integer TK_MAX_LEASE_TTL = 0;
|
private static final Long TK_MAX_LEASE_TTL = 0L;
|
||||||
private static final String TK_TOKEN_TYPE = "default-service";
|
private static final String TK_TOKEN_TYPE = "default-service";
|
||||||
private static final String TK_RUNNING_PLUGIN_VERSION = "v1.15.3+builtin.vault";
|
private static final String TK_RUNNING_PLUGIN_VERSION = "v1.15.3+builtin.vault";
|
||||||
|
|
||||||
@@ -90,12 +89,10 @@ class AuthMethodsResponseTest extends AbstractModelTest<AuthMethodsResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected AuthMethodsResponse createFull() {
|
protected AuthMethodsResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, AuthMethodsResponse.class);
|
() -> objectMapper.readValue(RES_JSON, AuthMethodsResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.AuthData;
|
import de.stklcode.jvault.connector.model.response.embedded.AuthData;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.MfaConstraintAny;
|
import de.stklcode.jvault.connector.model.response.embedded.MfaConstraintAny;
|
||||||
@@ -101,12 +100,10 @@ class AuthResponseTest extends AbstractModelTest<AuthResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected AuthResponse createFull() {
|
protected AuthResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, AuthResponse.class);
|
() -> objectMapper.readValue(RES_JSON, AuthResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -49,12 +48,10 @@ class CredentialsResponseTest extends AbstractModelTest<CredentialsResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected CredentialsResponse createFull() {
|
protected CredentialsResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(JSON, CredentialsResponse.class);
|
() -> objectMapper.readValue(JSON, CredentialsResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -42,12 +41,10 @@ class ErrorResponseTest extends AbstractModelTest<ErrorResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected ErrorResponse createFull() {
|
protected ErrorResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(JSON, ErrorResponse.class);
|
() -> objectMapper.readValue(JSON, ErrorResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -67,12 +66,10 @@ class HealthResponseTest extends AbstractModelTest<HealthResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected HealthResponse createFull() {
|
protected HealthResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, HealthResponse.class);
|
() -> objectMapper.readValue(RES_JSON, HealthResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -38,12 +37,10 @@ class HelpResponseTest extends AbstractModelTest<HelpResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected HelpResponse createFull() {
|
protected HelpResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(JSON, HelpResponse.class);
|
() -> objectMapper.readValue(JSON, HelpResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -95,12 +94,10 @@ class MetaSecretResponseTest extends AbstractModelTest<MetaSecretResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MetaSecretResponse createFull() {
|
protected MetaSecretResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(SECRET_JSON_V2, MetaSecretResponse.class);
|
() -> objectMapper.readValue(SECRET_JSON_V2, MetaSecretResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -80,12 +79,10 @@ class MetadataResponseTest extends AbstractModelTest<MetadataResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MetadataResponse createFull() {
|
protected MetadataResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(META_JSON, MetadataResponse.class);
|
() -> objectMapper.readValue(META_JSON, MetadataResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -17,7 +17,6 @@
|
|||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.exception.InvalidResponseException;
|
import de.stklcode.jvault.connector.exception.InvalidResponseException;
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -60,12 +59,10 @@ class PlainSecretResponseTest extends AbstractModelTest<PlainSecretResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected PlainSecretResponse createFull() {
|
protected PlainSecretResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(SECRET_JSON, PlainSecretResponse.class);
|
() -> objectMapper.readValue(SECRET_JSON, PlainSecretResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -83,12 +82,10 @@ class SealResponseTest extends AbstractModelTest<SealResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SealResponse createFull() {
|
protected SealResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_UNSEALED, SealResponse.class);
|
() -> objectMapper.readValue(RES_UNSEALED, SealResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,13 +16,13 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JUnit Test for {@link SecretListResponse} model.
|
* JUnit Test for {@link SecretListResponse} model.
|
||||||
@@ -52,12 +52,10 @@ class SecretListResponseTest extends AbstractModelTest<SecretListResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SecretListResponse createFull() {
|
protected SecretListResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(JSON, SecretListResponse.class);
|
() -> objectMapper.readValue(JSON, SecretListResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -48,12 +47,10 @@ class SecretVersionResponseTest extends AbstractModelTest<SecretVersionResponse>
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SecretVersionResponse createFull() {
|
protected SecretVersionResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(META_JSON, SecretVersionResponse.class);
|
() -> objectMapper.readValue(META_JSON, SecretVersionResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import de.stklcode.jvault.connector.model.response.embedded.TokenData;
|
import de.stklcode.jvault.connector.model.response.embedded.TokenData;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -35,8 +34,8 @@ import static org.junit.jupiter.api.Assertions.*;
|
|||||||
*/
|
*/
|
||||||
class TokenResponseTest extends AbstractModelTest<TokenResponse> {
|
class TokenResponseTest extends AbstractModelTest<TokenResponse> {
|
||||||
private static final Integer TOKEN_CREATION_TIME = 1457533232;
|
private static final Integer TOKEN_CREATION_TIME = 1457533232;
|
||||||
private static final Integer TOKEN_TTL = 2764800;
|
private static final Long TOKEN_TTL = 2764800L;
|
||||||
private static final Integer TOKEN_EXPLICIT_MAX_TTL = 0;
|
private static final Long TOKEN_EXPLICIT_MAX_TTL = 0L;
|
||||||
private static final String TOKEN_DISPLAY_NAME = "token";
|
private static final String TOKEN_DISPLAY_NAME = "token";
|
||||||
private static final String TOKEN_META_KEY = "foo";
|
private static final String TOKEN_META_KEY = "foo";
|
||||||
private static final String TOKEN_META_VALUE = "bar";
|
private static final String TOKEN_META_VALUE = "bar";
|
||||||
@@ -47,7 +46,7 @@ class TokenResponseTest extends AbstractModelTest<TokenResponse> {
|
|||||||
private static final String TOKEN_POLICY_1 = "default";
|
private static final String TOKEN_POLICY_1 = "default";
|
||||||
private static final String TOKEN_POLICY_2 = "web";
|
private static final String TOKEN_POLICY_2 = "web";
|
||||||
private static final Boolean RES_RENEWABLE = false;
|
private static final Boolean RES_RENEWABLE = false;
|
||||||
private static final Integer RES_TTL = 2591976;
|
private static final Long RES_TTL = 2591976L;
|
||||||
private static final Integer RES_LEASE_DURATION = 0;
|
private static final Integer RES_LEASE_DURATION = 0;
|
||||||
private static final String TOKEN_ACCESSOR = "VKvzT2fKHFsZFUus9LyoXCvu";
|
private static final String TOKEN_ACCESSOR = "VKvzT2fKHFsZFUus9LyoXCvu";
|
||||||
private static final String TOKEN_ENTITY_ID = "7d2e3179-f69b-450c-7179-ac8ee8bd8ca9";
|
private static final String TOKEN_ENTITY_ID = "7d2e3179-f69b-450c-7179-ac8ee8bd8ca9";
|
||||||
@@ -96,12 +95,10 @@ class TokenResponseTest extends AbstractModelTest<TokenResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected TokenResponse createFull() {
|
protected TokenResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, TokenResponse.class);
|
() -> objectMapper.readValue(RES_JSON, TokenResponse.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package de.stklcode.jvault.connector.model.response;
|
package de.stklcode.jvault.connector.model.response;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -39,19 +38,17 @@ class TransitResponseTest extends AbstractModelTest<TransitResponse> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected TransitResponse createFull() {
|
protected TransitResponse createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(
|
() -> objectMapper.readValue(
|
||||||
json(
|
json(
|
||||||
"\"ciphertext\": \"" + CIPHERTEXT + "\", " +
|
"\"ciphertext\": \"" + CIPHERTEXT + "\", " +
|
||||||
"\"plaintext\": \"" + PLAINTEXT + "\", " +
|
"\"plaintext\": \"" + PLAINTEXT + "\", " +
|
||||||
"\"sum\": \"" + SUM + "\""
|
"\"sum\": \"" + SUM + "\""
|
||||||
),
|
),
|
||||||
TransitResponse.class
|
TransitResponse.class
|
||||||
|
),
|
||||||
|
"Creation of full model failed"
|
||||||
);
|
);
|
||||||
} catch (JsonProcessingException e) {
|
|
||||||
fail("Creation of full model failed", e);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
package de.stklcode.jvault.connector.model.response.embedded;
|
package de.stklcode.jvault.connector.model.response.embedded;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@@ -14,8 +13,8 @@ import static org.junit.jupiter.api.Assertions.*;
|
|||||||
* @author Stefan Kalscheuer
|
* @author Stefan Kalscheuer
|
||||||
*/
|
*/
|
||||||
class MountConfigTest extends AbstractModelTest<MountConfig> {
|
class MountConfigTest extends AbstractModelTest<MountConfig> {
|
||||||
private static final Integer DEFAULT_LEASE_TTL = 1800;
|
private static final Long DEFAULT_LEASE_TTL = 1800L;
|
||||||
private static final Integer MAX_LEASE_TTL = 3600;
|
private static final Long MAX_LEASE_TTL = 3600L;
|
||||||
private static final Boolean FORCE_NO_CACHE = false;
|
private static final Boolean FORCE_NO_CACHE = false;
|
||||||
private static final String TOKEN_TYPE = "default-service";
|
private static final String TOKEN_TYPE = "default-service";
|
||||||
private static final String AUDIT_NON_HMAC_REQ_KEYS_1 = "req1";
|
private static final String AUDIT_NON_HMAC_REQ_KEYS_1 = "req1";
|
||||||
@@ -62,12 +61,10 @@ class MountConfigTest extends AbstractModelTest<MountConfig> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MountConfig createFull() {
|
protected MountConfig createFull() {
|
||||||
try {
|
return assertDoesNotThrow(
|
||||||
return objectMapper.readValue(RES_JSON, MountConfig.class);
|
() -> objectMapper.readValue(RES_JSON, MountConfig.class),
|
||||||
} catch (JsonProcessingException e) {
|
"Creation of full model instance failed"
|
||||||
fail("Creation of full model instance failed", e);
|
);
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user