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

Polishing.

Browse Source 
Adopt Vault 0.6.1 compatibility in tests (disabled generation of root tokens). Fix typos.
This commit is contained in:
Mark Paluch
2016-09-25 18:05:42 +02:00
parent 8bf1e3b0ba
commit ea09b804b0
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/src/main/asciidoc/quickstart.adoc
View File

@@ -18,7 +18,7 @@ $ src/test/bash/install_vault.sh
$ src/test/bash/create_certificates.sh
----
NOTE: `create_certificates.sh` creates certificates in `work/ca` and a JKS truststore `work/keystore.jsk`. If you want to run Spring Cloud Vault using this quickstart guide you need to configure the truststore the `spring.cloud.vault.ssl.trust-store` property to `file:work/keystore.jks`.
NOTE: `create_certificates.sh` creates certificates in `work/ca` and a JKS truststore `work/keystore.jks`. If you want to run Spring Cloud Vault using this quickstart guide you need to configure the truststore the `spring.cloud.vault.ssl.trust-store` property to `file:work/keystore.jks`.
*Start Vault server*

11
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java
View File

@@ -68,6 +68,15 @@ public class VaultConfigAppIdCustomMechanismTests {
VaultOperations vaultOperations = vaultRule.prepare().getVaultOperations();
String rules = "{ \"name\": \"testpolicy\",\n" //
+ " \"path\": {\n" //
+ " \"*\": { \"policy\": \"read\" }\n" //
+ " }\n" //
+ "}";
vaultOperations.write("sys/policy/testpolicy",
Collections.singletonMap("rules", rules));
String appId = VaultConfigAppIdCustomMechanismTests.class.getSimpleName();
vaultOperations.write(
@@ -75,7 +84,7 @@ public class VaultConfigAppIdCustomMechanismTests {
Collections.singletonMap("vault.value", "foo"));
Map<String, String> appIdData = new HashMap<String, String>();
appIdData.put("value", "root"); // policy
appIdData.put("value", "testpolicy"); // policy
appIdData.put("display_name", "this is my test application");
vaultOperations.write(String.format("auth/app-id/map/app-id/%s", appId),

11
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java
View File

@@ -65,13 +65,22 @@ public class VaultConfigAppIdTests {
VaultOperations vaultOperations = vaultRule.prepare().getVaultOperations();
String rules = "{ \"name\": \"testpolicy\",\n" //
+ " \"path\": {\n" //
+ " \"*\": { \"policy\": \"read\" }\n" //
+ " }\n" //
+ "}";
vaultOperations.write("sys/policy/testpolicy",
Collections.singletonMap("rules", rules));
String appId = VaultConfigAppIdTests.class.getSimpleName();
vaultOperations.write("secret/" + VaultConfigAppIdTests.class.getSimpleName(),
Collections.singletonMap("vault.value", "foo"));
Map<String, String> appIdData = new HashMap<String, String>();
appIdData.put("value", "root"); // policy
appIdData.put("value", "testpolicy"); // policy
appIdData.put("display_name", "this is my test application");
vaultOperations.write(String.format("auth/app-id/map/app-id/%s", appId),

11
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java
View File

@@ -67,6 +67,15 @@ public class VaultConfigTlsCertAuthenticationTests {
VaultOperations vaultOperations = vaultRule.prepare().getVaultOperations();
String rules = "{ \"name\": \"testpolicy\",\n" //
+ " \"path\": {\n" //
+ " \"*\": { \"policy\": \"read\" }\n" //
+ " }\n" //
+ "}";
vaultOperations.write("sys/policy/testpolicy",
Collections.singletonMap("rules", rules));
vaultOperations.write(
"secret/" + VaultConfigTlsCertAuthenticationTests.class.getSimpleName(),
Collections.singletonMap("vault.value", "foo"));
@@ -78,7 +87,7 @@ public class VaultConfigTlsCertAuthenticationTests {
Map<String, String> role = new HashMap<>();
role.put("certificate", certificate);
role.put("policies", "root");
role.put("policies", "testpolicy");
vaultOperations.write("auth/cert/certs/my-role", role);
}