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

Use VaultTokenRequestBuilder in Vault preparation.

Browse Source 
Fixes gh-46.
This commit is contained in:
Mark Paluch
2016-10-13 19:12:41 +02:00
parent d099df8ab0
commit a738d38bc5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/PrepareVault.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.cloud.vault.util;
import java.util.Collections;
import java.util.Map;
import org.springframework.util.Assert;
@@ -28,6 +27,7 @@ import org.springframework.vault.support.VaultInitializationResponse;
import org.springframework.vault.support.VaultMount;
import org.springframework.vault.support.VaultToken;
import org.springframework.vault.support.VaultTokenRequest;
import org.springframework.vault.support.VaultTokenRequest.VaultTokenRequestBuilder;
import org.springframework.vault.support.VaultTokenResponse;
import org.springframework.vault.support.VaultUnsealStatus;
@@ -80,15 +80,15 @@ public class PrepareVault {
*/
public VaultToken createToken(String tokenId, String policy) {
VaultTokenRequest tokenRequest = new VaultTokenRequest();
tokenRequest.setId(tokenId);
if (policy != null) {
tokenRequest.setPolicies(Collections.singletonList(policy));
VaultTokenRequestBuilder builder = VaultTokenRequest.builder().id(tokenId);
if (StringUtils.hasText(policy)) {
builder.withPolicy(policy);
}
VaultTokenResponse vaultTokenResponse = vaultOperations.opsForToken()
.create(tokenRequest);
.create(builder.build());
return vaultTokenResponse.getToken();
}