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

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2022-05-19 09:31:19 -04:00
parent c1f121ca6d bc8227cc4d
commit d8f6341f33
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepository.java
View File

@@ -46,7 +46,7 @@ public class SpringVaultEnvironmentRepository extends AbstractVaultEnvironmentRe
super(request, watch, properties);
this.keyValueTemplate = keyValueTemplate;
if (properties.getKvVersion() == 2 && StringUtils.hasText(properties.getPathToKey())) {
path = "data/" + properties.getPathToKey() + "/";
path = properties.getPathToKey() + "/";
}
this.objectMapper = new ObjectMapper();
}

2
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepositoryTests.java
View File

@@ -64,7 +64,7 @@ public class SpringVaultEnvironmentRepositoryTests {
private void defaultKeyTest(String myPathKey, int version) {
String path = "";
if (StringUtils.hasText(myPathKey) && version == 2) {
path = "data/" + myPathKey + "/";
path = myPathKey + "/";
}
VaultKeyValueOperations keyValueTemplate = mock(VaultKeyValueOperations.class);
when(keyValueTemplate.get(path + "myapp")).thenReturn(withVaultResponse("foo", "bar"));