cleanup for config server #1615
Conversation
Configure Renovate
| @@ -117,16 +117,6 @@ static MultipleSourcesContainer secretsDataByName(CoreV1Api coreV1Api, String na | |||
| includeDefaultProfileData); | |||
| } | |||
|
|
|||
| static MultipleSourcesContainer secretsDataByName(CoreV1Api coreV1Api, String namespace, | |||
There was a problem hiding this comment.
these are never used
| @@ -194,11 +194,11 @@ public static MultipleSourcesContainer processNamedData(List<StrippedSourceConta | |||
| // processed before profile based sources. This way, we replicate that | |||
| // "application-dev.yaml" | |||
| // overrides properties from "application.yaml" | |||
| sourceNames.forEach(source -> { | |||
There was a problem hiding this comment.
I want to present the minor changes I have in mind in small batches, so that it's easier to review, so a few more like this will follow.
What I am doing here is rename source to sourceName; p with activeProfile; and replace contains with endsWith:
p -> key.contains("-" + p)
to
sourceName.endsWith("-" + activeProfile)
|
@ryanjbaxter a few of these will come... thank you for looking at it |
| @@ -230,7 +231,8 @@ public static MultipleSourcesContainer processNamedData(List<StrippedSourceConta | |||
| */ | |||
| private static boolean containsDataWithProfile(Map<String, String> rawData, String[] activeProfiles) { | |||
| return rawData.keySet().stream().anyMatch( | |||
| key -> Arrays.stream(activeProfiles).anyMatch(p -> key.contains("-" + p) || "default".equals(p))); | |||
| key -> Arrays.stream(activeProfiles).anyMatch(activeProfile -> key.contains("-" + activeProfile) | |||
There was a problem hiding this comment.
Sholdn't this be endsWith as well instead of contains?
There was a problem hiding this comment.
not here no, good eye though :) in the case above we check the source name (config map name), so its something like : account-k8s; so endsWith is perfectly valid.
In the case here, we check for -<ACTIVE_PROFILE>.<EXTENSTION>, where extension is yaml/yml/properties, so it makes sense to be contains here, for the time being at least.
In my next PR, I will amend this a bit too.
No description provided.