From bc8227cc4d9ede583642489584ad320171d60019 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 19 May 2022 09:30:58 -0400 Subject: [PATCH] VaultKeyValue2Accessor already adds /data to the path. Fixes 2092 --- .../environment/vault/SpringVaultEnvironmentRepository.java | 2 +- .../vault/SpringVaultEnvironmentRepositoryTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepository.java index 3e220fda..a51b9ddd 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepository.java @@ -47,7 +47,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(); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepositoryTests.java index 0a354cf3..303ccaf3 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/vault/SpringVaultEnvironmentRepositoryTests.java @@ -65,7 +65,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"));