Do not combine profiles when spring.cloud.config.pofiles is set. #2354
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
spencergibb
reviewed
Nov 15, 2023
| @@ -92,6 +92,9 @@ private List<String> combineProfiles(ConfigClientProperties properties, | |||
| if (!ObjectUtils.isEmpty(properties.getProfile())) { | |||
| combinedProfiles = Stream.of(properties.getProfile().split(",")).map(String::trim).filter(s -> !s.isEmpty()) | |||
| .collect(Collectors.toList()); | |||
| // If spring.cloud.config.profiles is set it should override all other | |||
| // profiles set other ways | |||
| return combinedProfiles; | |||
There was a problem hiding this comment.
This makes this method weird right? It's no longer combining profiles. It's returning either the config props profiles, or the active profiles, or default profiles
|
Nothing else broke with the build, so maybe it is ok, but the terminology of the method and some variables don't make sense anymore. |
Fixes spring-cloud#2349 Revert "Make method clearer" This reverts commit fda8596568fb035d8c7839eeef6edaae712b427f. Make method clearer
ryanjbaxter
force-pushed
the
fix-combine-profiles
branch
from
923e4a0 to
42c046f
Compare
|
@spencergibb let me know if this makes things clearer |
spencergibb
approved these changes
Nov 21, 2023
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2349