Upgrade to Vault 0.8.3.
Accept generic and key/value for the key/value secret backend. Closes gh-142.
This commit is contained in:
@@ -26,6 +26,7 @@ env:
|
||||
- VAULT_VER=0.8.0
|
||||
- VAULT_VER=0.8.1
|
||||
- VAULT_VER=0.8.2
|
||||
- VAULT_VER=0.8.3
|
||||
- PROFILE=springNext
|
||||
|
||||
before_install:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2016 the original author or authors.
|
||||
* Copyright 2016-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
package org.springframework.vault.core;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -58,8 +59,9 @@ public class VaultSysTemplateIntegrationTests extends IntegrationTestSupport {
|
||||
assertThat(mounts).containsKey("secret/");
|
||||
|
||||
VaultMount secret = mounts.get("secret/");
|
||||
assertThat(secret.getDescription()).isEqualTo("generic secret storage");
|
||||
assertThat(secret.getType()).isEqualTo("generic");
|
||||
assertThat(Arrays.asList("generic secret storage", "key/value secret storage"))
|
||||
.contains(secret.getDescription());
|
||||
assertThat(Arrays.asList("kv", "generic")).contains(secret.getType());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -82,7 +84,7 @@ public class VaultSysTemplateIntegrationTests extends IntegrationTestSupport {
|
||||
VaultMount secret = mounts.get("other/");
|
||||
assertThat(secret.getDescription()).isEqualTo(mount.getDescription());
|
||||
assertThat(secret.getConfig()).containsEntry("default_lease_ttl", 3600);
|
||||
assertThat(secret.getType()).isEqualTo("generic");
|
||||
assertThat(Arrays.asList("kv", "generic")).contains(secret.getType());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
###########################################################################
|
||||
|
||||
|
||||
VAULT_VER="${VAULT_VER:-0.8.2}"
|
||||
VAULT_VER="${VAULT_VER:-0.8.3}"
|
||||
UNAME=$(uname -s | tr '[:upper:]' '[:lower:]')
|
||||
VAULT_ZIP="vault_${VAULT_VER}_${UNAME}_amd64.zip"
|
||||
IGNORE_CERTS="${IGNORE_CERTS:-no}"
|
||||
|
||||
Reference in New Issue
Block a user