diff --git a/docs/src/main/asciidoc/quickstart.adoc b/docs/src/main/asciidoc/quickstart.adoc index 97ad4620..8fe7bd33 100644 --- a/docs/src/main/asciidoc/quickstart.adoc +++ b/docs/src/main/asciidoc/quickstart.adoc @@ -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* diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java index 33fffb10..1fb388a8 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java @@ -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 appIdData = new HashMap(); - 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), diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java index 78a7f3ca..1b64f76b 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java @@ -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 appIdData = new HashMap(); - 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), diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java index ccdde1d6..b16a5cbb 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java @@ -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 role = new HashMap<>(); role.put("certificate", certificate); - role.put("policies", "root"); + role.put("policies", "testpolicy"); vaultOperations.write("auth/cert/certs/my-role", role); }