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

Default-label in CredhubEnviornmentRepository should be used only if label is not provided (#2581)

Browse Source 
Signed-off-by: kvmw <mshamsi@broadcom.com>
This commit is contained in:
Kaveh Shamsi
2024-10-09 16:50:38 +02:00
committed by GitHub
parent 9756a6a49b
commit ce3b9847c4
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CredhubEnvironmentRepository.java
View File

@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.springframework.cloud.config.environment.Environment;
import org.springframework.cloud.config.environment.PropertySource;
@@ -77,7 +76,7 @@ public class CredhubEnvironmentRepository implements EnvironmentRepository, Orde
List<String> applications = normalize(application, DEFAULT_APPLICATION);
List<String> profiles = normalize(profile, DEFAULT_PROFILE);
List<String> labels = normalize(label, this.defaultLabel);
List<String> labels = normalize(label);
Environment environment = new Environment(application, split(profile), label, null, null);
for (String l : labels) {
@@ -92,12 +91,20 @@ public class CredhubEnvironmentRepository implements EnvironmentRepository, Orde
}
/**
* Splits the comma delimited items and returns the reversed distinct items with given
* Splits the comma-delimited items and returns the reversed distinct items with given
* default item at the end.
*/
private List<String> normalize(String commaDelimitedItems, String defaultItem) {
var items = Stream.concat(Stream.of(defaultItem), Arrays.stream(split(commaDelimitedItems)))
return normalize(defaultItem + "," + commaDelimitedItems);
}
/**
* Splits the comma-delimited items and returns the reversed distinct items.
*/
private List<String> normalize(String commaDelimitedItems) {
var items = Arrays.stream(split(commaDelimitedItems))
.distinct()
.filter(StringUtils::hasText)
.collect(Collectors.toList());
Collections.reverse(items);

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

@@ -125,7 +125,7 @@ public class CredhubEnvironmentRepositoryTests {
public void shouldRetrieveGivenLabelsProfiles() {
stubCredentials("/myApp/prod/myLabel", credential("c1", "k1", "v1"));
stubCredentials("/myApp/cloud/mySecondLabel", credential("c2", "k2", "v2"));
stubCredentials("/myApp/prod/myThirdLabel", credential("c3", "k3", "v3"));
stubCredentials("/myApp/prod/master", credential("c3", "k3", "v3"));
Environment environment = this.credhubEnvironmentRepository.findOne("myApp", "prod,cloud",
"myLabel,mySecondLabel");