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

started some basic work

Browse Source 
Signed-off-by: wind57 <eugen.rabii@gmail.com>
This commit is contained in:
wind57
2025-04-01 22:46:56 +03:00
parent 877505ee82
commit c697df4264
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtils.java
View File

@@ -323,7 +323,9 @@ public final class ConfigUtils {
if (decode) {
rawData = decodeData(rawData);
}
result.putAll(SourceDataEntriesProcessor.processAllEntries(rawData, environment));
Map<String, Object> dataFromOneSource = SourceDataEntriesProcessor.processAllEntries(rawData, environment);
result.put(foundSourceName, dataFromOneSource);
});
return new MultipleSourcesContainer(sourceNames, result);

2
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/PrefixContext.java
View File

@@ -25,6 +25,6 @@ import java.util.Set;
*
* @author wind57
*/
public final record PrefixContext(Map<String, Object> data, String prefix, String namespace,
public record PrefixContext(Map<String, Object> data, String prefix, String namespace,
Set<String> propertySourceNames) {
}

27
spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsTests.java
View File

@@ -28,6 +28,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.mock.env.MockEnvironment;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author wind57
*/
@@ -222,4 +224,29 @@ class ConfigUtilsTests {
Assertions.assertEquals(Map.of("prefix-a", "b", "prefix-c", "d"), result);
}
@Test
void testIssue1757() {
StrippedSourceContainer containerA = new StrippedSourceContainer(Map.of("load", "true"), "client-1",
Map.of("client-id", "clientA", "client-secret", "a"));
StrippedSourceContainer containerB = new StrippedSourceContainer(Map.of("load", "true"), "client-2",
Map.of("client-id", "clientB", "client-secret", "b"));
MultipleSourcesContainer container = ConfigUtils.processLabeledData(List.of(containerA, containerB),
new MockEnvironment(), Map.of("load", "true"), "default", Set.of(), false);
System.out.println(container);
assertThat(container.names()).containsExactly("client-1", "client-2");
Map<String, Object> client1Data = (Map<String, Object>) container.data().get("client-1");
assertThat(client1Data)
.containsExactlyInAnyOrderEntriesOf(Map.of("client-id", "clientA", "client-secret", "a"));
Map<String, Object> client2Data = (Map<String, Object>) container.data().get("client-2");
assertThat(client2Data)
.containsExactlyInAnyOrderEntriesOf(Map.of("client-id", "clientB", "client-secret", "b"));
}
}