Skip to content

Commit a7ce440

Browse files
ryanjbaxterryanjbaxter
authored
Merge pull request #2047 from wind57/unify-config-propertie
Unify config properties
2 parents 4fd9a85 + 9e00168 commit a7ce440

25 files changed

+354
-280
lines changed

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

Lines changed: 16 additions & 15 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(List.of(), Map.of(), true,
113+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
114114
name, namespace, false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
115115

116116
CoreV1Api api = new CoreV1Api();
@@ -152,9 +152,9 @@ 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(
156-
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
157-
RetryProperties.DEFAULT, ReadType.BATCH);
155+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
156+
List.of(sourceOne, sourceTwo), Map.of(), null, namespace, false, true, false, RetryProperties.DEFAULT,
157+
ReadType.BATCH);
158158

159159
CoreV1Api api = new CoreV1Api();
160160
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -199,9 +199,9 @@ 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(
203-
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
204-
RetryProperties.DEFAULT, ReadType.BATCH);
202+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
203+
List.of(sourceOne, sourceTwo), Map.of(), null, namespace, false, true, false, RetryProperties.DEFAULT,
204+
ReadType.BATCH);
205205

206206
CoreV1Api api = new CoreV1Api();
207207
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -243,8 +243,9 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
243243
ConfigMapConfigProperties.Source configMapSource = new ConfigMapConfigProperties.Source(null, namespace, labels,
244244
null, null, null);
245245

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

249250
CoreV1Api api = new CoreV1Api();
250251
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -294,9 +295,9 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
294295
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
295296
configMapTwoLabels, null, null, null);
296297

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

301302
CoreV1Api api = new CoreV1Api();
302303
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -348,9 +349,9 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
348349
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
349350
configMapTwoLabels, null, null, null);
350351

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

355356
CoreV1Api api = new CoreV1Api();
356357
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void locateWithoutSources() {
106106
CoreV1Api api = new CoreV1Api();
107107
stubFor(get("/api/v1/namespaces/default/configmaps")
108108
.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(PROPERTIES_CONFIGMAP_LIST))));
109-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(List.of(), Map.of(), true,
109+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
110110
"bootstrap-640", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
111111
MockEnvironment mockEnvironment = new MockEnvironment();
112112
mockEnvironment.setProperty("spring.cloud.kubernetes.client.namespace", "default");
@@ -125,8 +125,8 @@ void locateWithSources() {
125125

126126
ConfigMapConfigProperties.Source source = new ConfigMapConfigProperties.Source("bootstrap-640", "default",
127127
Collections.emptyMap(), null, null, null);
128-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(List.of(source), Map.of(),
129-
true, "fake-name", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
128+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(source),
129+
Map.of(), "fake-name", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
130130

131131
PropertySource<?> propertySource = new KubernetesClientConfigMapPropertySourceLocator(api,
132132
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()))
@@ -148,7 +148,7 @@ void testLocateWithoutNamespaceConstructor() {
148148
stubFor(get("/api/v1/namespaces/default/configmaps")
149149
.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(PROPERTIES_CONFIGMAP_LIST))));
150150

151-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(List.of(), Map.of(), true,
151+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
152152
"bootstrap-640", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
153153

154154
assertThatThrownBy(() -> new KubernetesClientConfigMapPropertySourceLocator(api, configMapConfigProperties,
@@ -168,7 +168,7 @@ void testLocateWithoutNamespace() {
168168
CoreV1Api api = new CoreV1Api();
169169
stubFor(get("/api/v1/namespaces/default/configmaps")
170170
.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(PROPERTIES_CONFIGMAP_LIST))));
171-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(List.of(), Map.of(), true,
171+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
172172
"bootstrap-640", null, false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
173173
assertThatThrownBy(() -> new KubernetesClientConfigMapPropertySourceLocator(api, configMapConfigProperties,
174174
new KubernetesNamespaceProvider(ENV))
@@ -181,7 +181,7 @@ public void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
181181
stubFor(get("/api/v1/namespaces/default/configmaps")
182182
.willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
183183

184-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(List.of(), Map.of(), true,
184+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
185185
"bootstrap-640", "default", false, false, true, RetryProperties.DEFAULT, ReadType.BATCH);
186186

187187
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -197,7 +197,7 @@ public void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(Capture
197197
stubFor(get("/api/v1/namespaces/default/configmaps")
198198
.willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
199199

200-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(List.of(), Map.of(), true,
200+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), Map.of(),
201201
"bootstrap-640", "default", false, false, false, RetryProperties.DEFAULT, ReadType.BATCH);
202202

203203
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,8 @@ void getLocateWithSources() {
147147
SecretsConfigProperties.Source source2 = new SecretsConfigProperties.Source("rabbit-password", "",
148148
Collections.emptyMap(), null, null, null);
149149

150-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(Map.of(),
151-
List.of(source1, source2), true, "app", "default", false, true, false, RetryProperties.DEFAULT,
152-
ReadType.BATCH);
150+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, List.of(source1, source2),
151+
Map.of(), "app", "default", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
153152

154153
PropertySource<?> propertySource = new KubernetesClientSecretsPropertySourceLocator(api,
155154
new KubernetesNamespaceProvider(new MockEnvironment()), secretsConfigProperties)
@@ -162,7 +161,7 @@ void getLocateWithSources() {
162161
void getLocateWithOutSources() {
163162
CoreV1Api api = new CoreV1Api();
164163
stubFor(get(LIST_API).willReturn(aResponse().withStatus(200).withBody(LIST_BODY)));
165-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(Map.of(), List.of(), true,
164+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, List.of(), Map.of(),
166165
"db-secret", "default", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
167166

168167
PropertySource<?> propertySource = new KubernetesClientSecretsPropertySourceLocator(api,
@@ -184,7 +183,7 @@ void testLocateWithoutNamespaceConstructor() {
184183
CoreV1Api api = new CoreV1Api();
185184
stubFor(get(LIST_API).willReturn(aResponse().withStatus(200).withBody(LIST_BODY)));
186185

187-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(Map.of(), List.of(), true,
186+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, List.of(), Map.of(),
188187
"db-secret", "", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
189188

190189
assertThatThrownBy(() -> new KubernetesClientSecretsPropertySourceLocator(api,
@@ -197,7 +196,7 @@ void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() {
197196
CoreV1Api api = new CoreV1Api();
198197
stubFor(get(LIST_API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
199198

200-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(Map.of(), List.of(), true,
199+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, List.of(), Map.of(),
201200
"db-secret", "default", false, true, true, RetryProperties.DEFAULT, ReadType.BATCH);
202201

203202
KubernetesClientSecretsPropertySourceLocator locator = new KubernetesClientSecretsPropertySourceLocator(api,
@@ -212,7 +211,7 @@ void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(CapturedOutput
212211
CoreV1Api api = new CoreV1Api();
213212
stubFor(get(LIST_API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
214213

215-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(Map.of(), List.of(), true,
214+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, List.of(), Map.of(),
216215
"db-secret", "default", false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
217216

218217
KubernetesClientSecretsPropertySourceLocator locator = new KubernetesClientSecretsPropertySourceLocator(api,

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,9 @@ AbstractEnvironment environment() {
216216
// simulate that environment already has a
217217
// KubernetesClientConfigMapPropertySource,
218218
// otherwise we can't properly test reload functionality
219-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(List.of(), Map.of(),
220-
true, CONFIG_MAP_NAME, NAMESPACE, false, true, FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
219+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
220+
Map.of(), CONFIG_MAP_NAME, NAMESPACE, false, true, FAIL_FAST, RetryProperties.DEFAULT,
221+
ReadType.BATCH);
221222
KubernetesNamespaceProvider namespaceProvider = new KubernetesNamespaceProvider(mockEnvironment);
222223

223224
PropertySource<?> propertySource = new KubernetesClientConfigMapPropertySourceLocator(coreV1Api,
@@ -239,7 +240,7 @@ ConfigReloadProperties configReloadProperties() {
239240
@Bean
240241
@Primary
241242
ConfigMapConfigProperties configMapConfigProperties() {
242-
return new ConfigMapConfigProperties(List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false, true,
243+
return new ConfigMapConfigProperties(true, List.of(), Map.of(), CONFIG_MAP_NAME, NAMESPACE, false, true,
243244
FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
244245
}
245246

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ AbstractEnvironment environment() {
210210
V1Secret secret = secret(SECRET_NAME, Map.of());
211211
V1SecretList secretList = new V1SecretList().addItemsItem(secret);
212212

213-
stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList)))
213+
stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(secretList)))
214214
.inScenario(SCENARIO_NAME)
215215
.whenScenarioStateIs(Scenario.STARTED)
216216
.willSetStateTo("go-to-fail"));
@@ -221,7 +221,7 @@ AbstractEnvironment environment() {
221221
// simulate that environment already has a
222222
// KubernetesClientConfigMapPropertySource,
223223
// otherwise we can't properly test reload functionality
224-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(Map.of(), List.of(), true,
224+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, List.of(), Map.of(),
225225
SECRET_NAME, NAMESPACE, false, true, FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
226226
KubernetesNamespaceProvider namespaceProvider = new KubernetesNamespaceProvider(mockEnvironment);
227227

@@ -244,7 +244,7 @@ ConfigReloadProperties configReloadProperties() {
244244
@Bean
245245
@Primary
246246
SecretsConfigProperties secretsConfigProperties() {
247-
return new SecretsConfigProperties(Map.of(), List.of(), true, SECRET_NAME, NAMESPACE, false, true,
247+
return new SecretsConfigProperties(true, List.of(), Map.of(), SECRET_NAME, NAMESPACE, false, true,
248248
FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
249249
}
250250

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ AbstractEnvironment environment() {
192192
// simulate that environment already has a
193193
// KubernetesClientConfigMapPropertySource,
194194
// otherwise we can't properly test reload functionality
195-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(List.of(), Map.of(),
196-
true, CONFIG_MAP_NAME, NAMESPACE, false, true, true, RetryProperties.DEFAULT, ReadType.BATCH);
195+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
196+
Map.of(), CONFIG_MAP_NAME, NAMESPACE, false, true, true, RetryProperties.DEFAULT, ReadType.BATCH);
197197
KubernetesNamespaceProvider namespaceProvider = new KubernetesNamespaceProvider(mockEnvironment);
198198

199199
PropertySource<?> propertySource = new KubernetesClientConfigMapPropertySourceLocator(coreV1Api,
@@ -215,7 +215,7 @@ ConfigReloadProperties configReloadProperties() {
215215
@Bean
216216
@Primary
217217
ConfigMapConfigProperties configMapConfigProperties() {
218-
return new ConfigMapConfigProperties(List.of(), Map.of(), true, CONFIG_MAP_NAME, NAMESPACE, false, true,
218+
return new ConfigMapConfigProperties(true, List.of(), Map.of(), CONFIG_MAP_NAME, NAMESPACE, false, true,
219219
FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
220220
}
221221

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ AbstractEnvironment environment() {
194194
// simulate that environment already has a
195195
// KubernetesClientSecretPropertySource,
196196
// otherwise we can't properly test reload functionality
197-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(Map.of(), List.of(), true,
197+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, List.of(), Map.of(),
198198
SECRET_NAME, NAMESPACE, false, true, false, RetryProperties.DEFAULT, ReadType.BATCH);
199199
KubernetesNamespaceProvider namespaceProvider = new KubernetesNamespaceProvider(mockEnvironment);
200200

@@ -217,7 +217,7 @@ ConfigReloadProperties configReloadProperties() {
217217
@Bean
218218
@Primary
219219
SecretsConfigProperties secretsConfigProperties() {
220-
return new SecretsConfigProperties(Map.of(), List.of(), true, SECRET_NAME, NAMESPACE, false, true,
220+
return new SecretsConfigProperties(true, List.of(), Map.of(), SECRET_NAME, NAMESPACE, false, true,
221221
FAIL_FAST, RetryProperties.DEFAULT, ReadType.BATCH);
222222
}
223223

0 commit comments

Comments
 (0)