Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handles multiple application names in CredhubEnvironmentRepository #2447

Merged
merged 2 commits into from
Aug 13, 2024
Merged

Handles multiple application names in CredhubEnvironmentRepository #2447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c36d95c
Handles multiple application names in CredhubEnvironmentRepository
kvmw Aug 9, 2024
75ca3b5
Always add the main credhub PropertySource, even if it is empty
kvmw Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 28 additions & 21 deletions ...ava/org/springframework/cloud/config/server/environment/CredhubEnvironmentRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.Arrays;
import java.util.Map;
import java.util.stream.Collectors;

import org.springframework.cloud.config.environment.Environment;
import org.springframework.cloud.config.environment.PropertySource;
Expand All @@ -37,8 +38,6 @@
*/
public class CredhubEnvironmentRepository implements EnvironmentRepository, Ordered {

private CredHubOperations credHubOperations;

private static final String DEFAULT_PROFILE = "default";

private static final String DEFAULT_LABEL = "master";
Expand All @@ -47,44 +46,52 @@ public class CredhubEnvironmentRepository implements EnvironmentRepository, Orde

private int order = Ordered.LOWEST_PRECEDENCE;

private final CredHubOperations credHubOperations;

public CredhubEnvironmentRepository(CredHubOperations credHubOperations) {
this.credHubOperations = credHubOperations;
}

@Override
public Environment findOne(String application, String profilesList, String label) {
if (ObjectUtils.isEmpty(profilesList)) {
profilesList = DEFAULT_PROFILE;
public Environment findOne(String application, String profile, String label) {
if (ObjectUtils.isEmpty(profile)) {
profile = DEFAULT_PROFILE;
}
if (ObjectUtils.isEmpty(label)) {
label = DEFAULT_LABEL;
}

String[] profiles = StringUtils.commaDelimitedListToStringArray(profilesList);
String[] applications = deDuplicateAndAddDefault(application, DEFAULT_APPLICATION);
String[] profiles = deDuplicateAndAddDefault(profile, DEFAULT_PROFILE);

Environment environment = new Environment(application, profiles, label, null, null);
for (String profile : profiles) {
environment.add(new PropertySource("credhub-" + application + "-" + profile + "-" + label,
findProperties(application, profile, label)));
if (!DEFAULT_APPLICATION.equals(application)) {
addDefaultPropertySource(environment, DEFAULT_APPLICATION, profile, label);
for (String prof : profiles) {
for (String app : applications) {
addPropertySource(environment, app, prof, label);
}
}

if (!Arrays.asList(profiles).contains(DEFAULT_PROFILE)) {
addDefaultPropertySource(environment, application, DEFAULT_PROFILE, label);
}

if (!Arrays.asList(profiles).contains(DEFAULT_PROFILE) && !DEFAULT_APPLICATION.equals(application)) {
addDefaultPropertySource(environment, DEFAULT_APPLICATION, DEFAULT_PROFILE, label);
}

return environment;
}

private void addDefaultPropertySource(Environment environment, String application, String profile, String label) {
/**
* Converts the comma delimited items to a List and then: - Removes duplicates and
* keeps unique items only. - Moves or Adds the given default item to the end of List.
*/
private String[] deDuplicateAndAddDefault(String commaDelimitedItems, String defaultItem) {
var items = Arrays.stream(StringUtils.commaDelimitedListToStringArray(commaDelimitedItems))
.distinct()
.filter(item -> !defaultItem.equals(item))
.collect(Collectors.toList());

items.add(defaultItem);
return items.toArray(new String[0]);
}

private void addPropertySource(Environment environment, String application, String profile, String label) {
Map<Object, Object> properties = findProperties(application, profile, label);
if (!properties.isEmpty()) {
// The main PropertySource (the first one) should be always there, even if it is empty.
if (!properties.isEmpty() || environment.getPropertySources().isEmpty()) {
PropertySource propertySource = new PropertySource("credhub-" + application + "-" + profile + "-" + label,
properties);
environment.add(propertySource);
Expand Down
Loading