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

Do not override kv.profiles in VaultConfigDataLocationResolver if already set.

Browse Source 
Current implementation overrides any profiles set through `spring.cloud.vault.kv.profiles` with the currently active profile, which is possibly unwanted behavior and prevents fine grained configuration.

Closes gh-648
This commit is contained in:
kpentchev
2023-02-23 10:54:53 +02:00
committed by Mark Paluch
parent e89cc8d8c8
commit 03cd8e43a7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultConfigDataLocationResolver.java
View File

@@ -194,7 +194,9 @@ public class VaultConfigDataLocationResolver implements ConfigDataLocationResolv
kvProperties.setApplicationName(binder.bind("spring.cloud.vault.kv.application-name", String.class)
.orElseGet(() -> binder.bind("spring.cloud.vault.application-name", String.class)
.orElseGet(() -> binder.bind("spring.application.name", String.class).orElse(""))));
kvProperties.setProfiles(profiles.getActive());
if (kvProperties.profiles == null) {
kvProperties.setProfiles(profiles.getActive());
}
return kvProperties;
}