Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make path in WrappedMetadata optional.

Browse Source 
Path is provided as of Vault 0.8.0 and we want to support also older Vault versions.

See gh-208.
This commit is contained in:
Mark Paluch
2018-07-31 18:13:54 +02:00
parent 0342ef57c2
commit 672962645f
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-vault-core/src/main/java/org/springframework/vault/support/WrappedMetadata.java
View File

@@ -18,6 +18,7 @@ package org.springframework.vault.support;
import java.time.Duration;
import java.time.Instant;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@@ -41,35 +42,35 @@ public class WrappedMetadata {
* @param token must not be {@literal null}.
* @param ttl must not be {@literal null}.
* @param creationTime must not be {@literal null}.
* @param path must not be {@literal null}.
* @param path can be {@literal null}.
*/
public WrappedMetadata(VaultToken token, Duration ttl, Instant creationTime,
String path) {
@Nullable String path) {
Assert.notNull(token, "VaultToken must not be null");
Assert.notNull(ttl, "TTL duration must not be null");
Assert.notNull(creationTime, "Creation time must not be null");
Assert.notNull(path, "Path must not be null");
this.token = token;
this.ttl = ttl;
this.creationTime = creationTime;
this.path = path;
this.ttl = ttl;
}
public VaultToken getToken() {
return token;
}
public Duration getTtl() {
return ttl;
}
public Instant getCreationTime() {
return creationTime;
}
@Nullable
public String getPath() {
return path;
}
public Duration getTtl() {
return ttl;
}
}

3
spring-vault-core/src/test/java/org/springframework/vault/core/VaultWrappingTemplateIntegrationTests.java
View File

@@ -78,7 +78,6 @@ public class VaultWrappingTemplateIntegrationTests extends IntegrationTestSuppor
WrappedMetadata metadata = wrappingOperations.wrap(map, Duration.ofSeconds(100));
assertThat(metadata.getPath()).isEqualTo("sys/wrapping/wrap");
assertThat(metadata.getTtl()).isEqualTo(Duration.ofSeconds(100));
assertThat(metadata.getToken()).isNotNull();
assertThat(metadata.getCreationTime()).isBefore(Instant.now().plusSeconds(60))
@@ -94,7 +93,6 @@ public class VaultWrappingTemplateIntegrationTests extends IntegrationTestSuppor
WrappedMetadata lookup = wrappingOperations.lookup(metadata.getToken());
assertThat(lookup.getPath()).isEqualTo("sys/wrapping/wrap");
assertThat(lookup.getTtl()).isEqualTo(Duration.ofSeconds(100));
assertThat(lookup.getToken()).isNotNull();
assertThat(lookup.getCreationTime()).isBefore(Instant.now().plusSeconds(60))
@@ -149,7 +147,6 @@ public class VaultWrappingTemplateIntegrationTests extends IntegrationTestSuppor
WrappedMetadata rewrap = wrappingOperations.rewrap(metadata.getToken());
assertThat(rewrap.getPath()).isEqualTo("sys/wrapping/wrap");
assertThat(rewrap.getTtl()).isEqualTo(Duration.ofSeconds(100));
assertThat(rewrap.getToken()).isNotEqualTo(metadata.getToken());
assertThat(rewrap.getCreationTime()).isBefore(Instant.now().plusSeconds(60))