Skip to content

Commit c697df4

Browse files
committed
started some basic work
Signed-off-by: wind57 <[email protected]>
1 parent 877505e commit c697df4

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,9 @@ public static MultipleSourcesContainer processLabeledData(List<StrippedSourceCon
323323
if (decode) {
324324
rawData = decodeData(rawData);
325325
}
326-
result.putAll(SourceDataEntriesProcessor.processAllEntries(rawData, environment));
326+
327+
Map<String, Object> dataFromOneSource = SourceDataEntriesProcessor.processAllEntries(rawData, environment);
328+
result.put(foundSourceName, dataFromOneSource);
327329
});
328330

329331
return new MultipleSourcesContainer(sourceNames, result);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
*
2626
* @author wind57
2727
*/
28-
public final record PrefixContext(Map<String, Object> data, String prefix, String namespace,
28+
public record PrefixContext(Map<String, Object> data, String prefix, String namespace,
2929
Set<String> propertySourceNames) {
3030
}

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
import org.springframework.mock.env.MockEnvironment;
3030

31+
import static org.assertj.core.api.Assertions.assertThat;
32+
3133
/**
3234
* @author wind57
3335
*/
@@ -222,4 +224,29 @@ void testKeysWithPrefixNonEmptyPrefix() {
222224
Assertions.assertEquals(Map.of("prefix-a", "b", "prefix-c", "d"), result);
223225
}
224226

227+
@Test
228+
void testIssue1757() {
229+
230+
StrippedSourceContainer containerA = new StrippedSourceContainer(Map.of("load", "true"), "client-1",
231+
Map.of("client-id", "clientA", "client-secret", "a"));
232+
233+
StrippedSourceContainer containerB = new StrippedSourceContainer(Map.of("load", "true"), "client-2",
234+
Map.of("client-id", "clientB", "client-secret", "b"));
235+
236+
MultipleSourcesContainer container = ConfigUtils.processLabeledData(List.of(containerA, containerB),
237+
new MockEnvironment(), Map.of("load", "true"), "default", Set.of(), false);
238+
239+
System.out.println(container);
240+
assertThat(container.names()).containsExactly("client-1", "client-2");
241+
242+
Map<String, Object> client1Data = (Map<String, Object>) container.data().get("client-1");
243+
assertThat(client1Data)
244+
.containsExactlyInAnyOrderEntriesOf(Map.of("client-id", "clientA", "client-secret", "a"));
245+
246+
Map<String, Object> client2Data = (Map<String, Object>) container.data().get("client-2");
247+
assertThat(client2Data)
248+
.containsExactlyInAnyOrderEntriesOf(Map.of("client-id", "clientB", "client-secret", "b"));
249+
250+
}
251+
225252
}

0 commit comments

Comments
 (0)