Skip to content

Commit dea54b4

Browse files
wind57wind57
committed
started work
Signed-off-by: wind57 <[email protected]>
1 parent 8655517 commit dea54b4

File tree

7 files changed

+27
-39
lines changed

7 files changed

+27
-39
lines changed

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void namedSingleConfigMapFails(CapturedOutput output) {
110110

111111
stubFor(get(path).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
112112

113-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
113+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
114114
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
115115

116116
CoreV1Api api = new CoreV1Api();
@@ -142,7 +142,7 @@ void namedTwoConfigMapsOneFails(CapturedOutput output) {
142142
.inScenario("started")
143143
.willSetStateTo("go-to-next"));
144144

145-
stubFor(get(path).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(SINGLE_CONFIGMAP_LIST)))
145+
stubFor(get(path).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(SINGLE_CONFIGMAP_LIST)))
146146
.inScenario("started")
147147
.whenScenarioStateIs("go-to-next")
148148
.willSetStateTo("done"));
@@ -152,7 +152,7 @@ void namedTwoConfigMapsOneFails(CapturedOutput output) {
152152
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(configMapNameTwo, namespace,
153153
Map.of(), null, null, null);
154154

155-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
155+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
156156
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
157157
RetryProperties.DEFAULT, ReadType.BATCH);
158158

@@ -199,7 +199,7 @@ void namedTwoConfigMapsBothFail(CapturedOutput output) {
199199
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(configMapNameTwo, namespace,
200200
Map.of(), null, null, null);
201201

202-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
202+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
203203
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
204204
RetryProperties.DEFAULT, ReadType.BATCH);
205205

@@ -243,7 +243,7 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
243243
ConfigMapConfigProperties.Source configMapSource = new ConfigMapConfigProperties.Source(null, namespace, labels,
244244
null, null, null);
245245

246-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
246+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
247247
List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT,
248248
ReadType.BATCH);
249249

@@ -285,7 +285,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
285285
.willSetStateTo("second"));
286286

287287
// one that passes
288-
stubFor(get(path).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(DOUBLE_CONFIGMAP_LIST)))
288+
stubFor(get(path).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(DOUBLE_CONFIGMAP_LIST)))
289289
.inScenario("started")
290290
.whenScenarioStateIs("second")
291291
.willSetStateTo("done"));
@@ -295,7 +295,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
295295
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
296296
configMapTwoLabels, null, null, null);
297297

298-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
298+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
299299
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
300300
false, RetryProperties.DEFAULT, ReadType.BATCH);
301301

@@ -349,7 +349,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
349349
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
350350
configMapTwoLabels, null, null, null);
351351

352-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
352+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
353353
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
354354
false, RetryProperties.DEFAULT, ReadType.BATCH);
355355

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* @author Isik Erhan
3636
*/
3737
@ConfigurationProperties(ConfigMapConfigProperties.PREFIX)
38-
public record ConfigMapConfigProperties(@DefaultValue("true") boolean enableApi, @DefaultValue List<String> paths,
38+
public record ConfigMapConfigProperties(@DefaultValue("true") boolean enableApi,
3939
@DefaultValue List<Source> sources, @DefaultValue Map<String, String> labels,
4040
@DefaultValue("true") boolean enabled, String name, String namespace, boolean useNameAsPrefix,
4141
@DefaultValue("true") boolean includeProfileSpecificSources, boolean failFast,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*/
3838
@ConfigurationProperties(SecretsConfigProperties.PREFIX)
3939
public record SecretsConfigProperties(boolean enableApi, @DefaultValue Map<String, String> labels,
40-
@DefaultValue List<String> paths, @DefaultValue List<Source> sources, @DefaultValue("true") boolean enabled,
40+
@DefaultValue List<Source> sources, @DefaultValue("true") boolean enabled,
4141
String name, String namespace, boolean useNameAsPrefix,
4242
@DefaultValue("true") boolean includeProfileSpecificSources, boolean failFast,
4343
@DefaultValue RetryProperties retry, @DefaultValue("BATCH") ReadType readType) {

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ void testWithDefaults() {
4040
ConfigMapConfigProperties props = context.getBean(ConfigMapConfigProperties.class);
4141
Assertions.assertThat(props).isNotNull();
4242
Assertions.assertThat(props.enableApi()).isTrue();
43-
Assertions.assertThat(props.paths().isEmpty()).isTrue();
4443
Assertions.assertThat(props.sources().isEmpty()).isTrue();
4544
Assertions.assertThat(props.labels().isEmpty()).isTrue();
4645
Assertions.assertThat(props.enabled()).isTrue();
@@ -64,7 +63,6 @@ void testWithDefaults() {
6463
void testWithNonDefaults() {
6564
new ApplicationContextRunner().withUserConfiguration(Config.class)
6665
.withPropertyValues("spring.cloud.kubernetes.config.enableApi=false",
67-
"spring.cloud.kubernetes.config.paths[0]=a", "spring.cloud.kubernetes.config.paths[1]=b",
6866
"spring.cloud.kubernetes.config.sources[0].name=source-a",
6967
"spring.cloud.kubernetes.config.sources[0].namespace=source-namespace-a",
7068
"spring.cloud.kubernetes.config.sources[0].labels.key=source-value",
@@ -88,10 +86,6 @@ void testWithNonDefaults() {
8886
Assertions.assertThat(props).isNotNull();
8987
Assertions.assertThat(props.enableApi()).isFalse();
9088

91-
Assertions.assertThat(props.paths().size()).isEqualTo(2);
92-
Assertions.assertThat(props.paths().get(0)).isEqualTo("a");
93-
Assertions.assertThat(props.paths().get(1)).isEqualTo("b");
94-
9589
Assertions.assertThat(props.sources().size()).isEqualTo(1);
9690
ConfigMapConfigProperties.Source source = props.sources().get(0);
9791
Assertions.assertThat(source.name()).isEqualTo("source-a");

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ConfigMapConfigPropertiesTests {
4848
*/
4949
@Test
5050
void testUseNameAsPrefixUnsetEmptySources() {
51-
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), List.of(), Map.of(), true,
51+
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), Map.of(), true,
5252
"config-map-a", "spring-k8s", false, false, false, RetryProperties.DEFAULT, BATCH);
5353

5454
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -74,7 +74,7 @@ void testUseNameAsPrefixUnsetEmptySources() {
7474
*/
7575
@Test
7676
void testUseNameAsPrefixSetEmptySources() {
77-
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), List.of(), Map.of(), true,
77+
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), Map.of(), true,
7878
"config-map-a", "spring-k8s", true, false, false, RetryProperties.DEFAULT, BATCH);
7979

8080
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -105,7 +105,7 @@ void testUseNameAsPrefixUnsetNonEmptySources() {
105105
ConfigMapConfigProperties.Source one = new ConfigMapConfigProperties.Source("config-map-one", null,
106106
Collections.emptyMap(), null, null, null);
107107

108-
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), List.of(one), Map.of(),
108+
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(one), Map.of(),
109109
true, "config-map-a", "spring-k8s", true, false, false, RetryProperties.DEFAULT, BATCH);
110110

111111
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -148,7 +148,7 @@ void testUseNameAsPrefixSetNonEmptySources() {
148148
ConfigMapConfigProperties.Source three = new ConfigMapConfigProperties.Source("config-map-three", null,
149149
Collections.emptyMap(), null, true, null);
150150

151-
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), List.of(one, two, three),
151+
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(one, two, three),
152152
Map.of(), true, "config-map-a", "spring-k8s", true, false, false, RetryProperties.DEFAULT, BATCH);
153153

154154
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -198,7 +198,7 @@ void testMultipleCases() {
198198
ConfigMapConfigProperties.Source four = new ConfigMapConfigProperties.Source(null, "config-map-four",
199199
Collections.emptyMap(), null, false, null);
200200

201-
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(),
201+
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true,
202202
List.of(one, two, three, four), Map.of(), true, "config-map-a", "spring-k8s", true, false, false,
203203
RetryProperties.DEFAULT, BATCH);
204204

@@ -232,7 +232,7 @@ void testMultipleCases() {
232232
@Test
233233
void testUseIncludeProfileSpecificSourcesNoChanges() {
234234

235-
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), List.of(), Map.of(), true,
235+
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), Map.of(), true,
236236
"config-map-a", "spring-k8s", false, true, false, RetryProperties.DEFAULT, BATCH);
237237

238238
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -261,7 +261,7 @@ void testUseIncludeProfileSpecificSourcesNoChanges() {
261261
@Test
262262
void testUseIncludeProfileSpecificSourcesDefaultChanged() {
263263

264-
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), List.of(), Map.of(), true,
264+
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), Map.of(), true,
265265
"config-map-a", "spring-k8s", false, false, false, RetryProperties.DEFAULT, BATCH);
266266

267267
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -305,7 +305,7 @@ void testUseIncludeProfileSpecificSourcesDefaultChangedSourceOverride() {
305305
ConfigMapConfigProperties.Source three = new ConfigMapConfigProperties.Source("config-map-three", null,
306306
Collections.emptyMap(), null, null, false);
307307

308-
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(), List.of(one, two, three),
308+
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(one, two, three),
309309
Map.of(), true, "config-map-a", "spring-k8s", false, false, false, RetryProperties.DEFAULT, BATCH);
310310

311311
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -362,7 +362,7 @@ void testLabelsMultipleCases() {
362362
ConfigMapConfigProperties.Source four = new ConfigMapConfigProperties.Source(null, null,
363363
Map.of("fourth-label", "configmap-four"), null, null, null);
364364

365-
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true, List.of(),
365+
ConfigMapConfigProperties properties = new ConfigMapConfigProperties(true,
366366
List.of(one, two, three, four), Map.of(), true, "config-map-a", "spring-k8s", false, false, false,
367367
RetryProperties.DEFAULT, BATCH);
368368

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ void testWithDefaults() {
4040
SecretsConfigProperties props = context.getBean(SecretsConfigProperties.class);
4141
Assertions.assertThat(props).isNotNull();
4242
Assertions.assertThat(props.enableApi()).isFalse();
43-
Assertions.assertThat(props.paths()).isEmpty();
4443
Assertions.assertThat(props.sources()).isEmpty();
4544
Assertions.assertThat(props.labels()).isEmpty();
4645
Assertions.assertThat(props.enabled()).isTrue();
@@ -64,7 +63,6 @@ void testWithDefaults() {
6463
void testWithNonDefaults() {
6564
new ApplicationContextRunner().withUserConfiguration(Config.class)
6665
.withPropertyValues("spring.cloud.kubernetes.secrets.enableApi=false",
67-
"spring.cloud.kubernetes.secrets.paths[0]=a", "spring.cloud.kubernetes.secrets.paths[1]=b",
6866
"spring.cloud.kubernetes.secrets.sources[0].name=source-a",
6967
"spring.cloud.kubernetes.secrets.sources[0].namespace=source-namespace-a",
7068
"spring.cloud.kubernetes.secrets.sources[0].labels.key=source-value",
@@ -88,10 +86,6 @@ void testWithNonDefaults() {
8886
Assertions.assertThat(props).isNotNull();
8987
Assertions.assertThat(props.enableApi()).isFalse();
9088

91-
Assertions.assertThat(props.paths().size()).isEqualTo(2);
92-
Assertions.assertThat(props.paths().get(0)).isEqualTo("a");
93-
Assertions.assertThat(props.paths().get(1)).isEqualTo("b");
94-
9589
Assertions.assertThat(props.sources().size()).isEqualTo(1);
9690
SecretsConfigProperties.Source source = props.sources().get(0);
9791
Assertions.assertThat(source.name()).isEqualTo("source-a");

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class SecretsConfigPropertiesTests {
3838
@Test
3939
void emptySourcesSecretName() {
4040

41-
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(), List.of(), true,
41+
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(), true,
4242
null, "namespace", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
4343

4444
List<NormalizedSource> source = properties.determineSources(new MockEnvironment());
@@ -79,7 +79,7 @@ void multipleSources() {
7979
SecretsConfigProperties.Source three = new SecretsConfigProperties.Source(null, "spring-k8s",
8080
Map.of("three", "3"), null, false, false);
8181

82-
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(),
82+
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(),
8383
List.of(one, two, three), true, null, "namespace", false, true, false, RetryProperties.DEFAULT,
8484
ReadType.BATCH);
8585

@@ -122,7 +122,7 @@ void multipleSources() {
122122
@Test
123123
void testUseNameAsPrefixUnsetEmptySources() {
124124

125-
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(), List.of(), true,
125+
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(), true,
126126
"secret-a", "namespace", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
127127

128128
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -149,7 +149,7 @@ void testUseNameAsPrefixUnsetEmptySources() {
149149
@Test
150150
void testUseNameAsPrefixSetEmptySources() {
151151

152-
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(), List.of(), true,
152+
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(), true,
153153
"secret-a", "namespace", true, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
154154

155155
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -180,7 +180,7 @@ void testUseNameAsPrefixUnsetNonEmptySources() {
180180
SecretsConfigProperties.Source one = new SecretsConfigProperties.Source("secret-one", "spring-k8s", Map.of(),
181181
null, true, false);
182182

183-
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(), List.of(one), true,
183+
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(one), true,
184184
"secret-one", null, false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
185185

186186
List<NormalizedSource> sources = properties.determineSources(new MockEnvironment());
@@ -223,7 +223,7 @@ void testUseNameAsPrefixSetNonEmptySources() {
223223
SecretsConfigProperties.Source three = new SecretsConfigProperties.Source("secret-three", "spring-k8s",
224224
Map.of(), null, true, false);
225225

226-
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(),
226+
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(),
227227
List.of(one, two, three), true, "secret-one", null, false, true, false, RetryProperties.DEFAULT,
228228
ReadType.BATCH);
229229

@@ -274,7 +274,7 @@ void testMultipleCases() {
274274
SecretsConfigProperties.Source four = new SecretsConfigProperties.Source("secret-four", "spring-k8s", Map.of(),
275275
null, false, false);
276276

277-
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(),
277+
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(),
278278
List.of(one, two, three, four), true, "secret-one", "spring-k8s", false, false, false,
279279
RetryProperties.DEFAULT, ReadType.BATCH);
280280

@@ -336,7 +336,7 @@ void testLabelsMultipleCases() {
336336
SecretsConfigProperties.Source four = new SecretsConfigProperties.Source(null, "spring-k8s",
337337
Map.of("fourth-label", "secret-four"), null, false, false);
338338

339-
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(), List.of(),
339+
SecretsConfigProperties properties = new SecretsConfigProperties(false, Map.of(),
340340
List.of(one, two, three, four), false, null, "spring-k8s", false, false, false, RetryProperties.DEFAULT,
341341
ReadType.BATCH);
342342

0 commit comments

Comments
 (0)