Skip to content

Commit 30c3753

Browse files
wind57wind57
committed
fix
1 parent 51d0b94 commit 30c3753

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void namedSingleConfigMapFails() {
113113
stubFor(get(path).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
114114

115115
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
116-
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
116+
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT, false);
117117

118118
CoreV1Api api = new CoreV1Api();
119119
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -159,7 +159,7 @@ void namedTwoConfigMapsOneFails(CapturedOutput output) {
159159

160160
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
161161
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
162-
RetryProperties.DEFAULT);
162+
RetryProperties.DEFAULT, false);
163163

164164
CoreV1Api api = new CoreV1Api();
165165
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -205,7 +205,7 @@ void namedTwoConfigMapsBothFail(CapturedOutput output) {
205205

206206
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
207207
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
208-
RetryProperties.DEFAULT);
208+
RetryProperties.DEFAULT, false);
209209

210210
CoreV1Api api = new CoreV1Api();
211211
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -249,7 +249,8 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
249249
null, null, null);
250250

251251
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
252-
List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);
252+
List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT,
253+
false);
253254

254255
CoreV1Api api = new CoreV1Api();
255256
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -302,7 +303,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
302303

303304
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
304305
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
305-
false, RetryProperties.DEFAULT);
306+
false, RetryProperties.DEFAULT, false);
306307

307308
CoreV1Api api = new CoreV1Api();
308309
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -357,7 +358,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
357358

358359
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
359360
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
360-
false, RetryProperties.DEFAULT);
361+
false, RetryProperties.DEFAULT, false);
361362

362363
CoreV1Api api = new CoreV1Api();
363364
KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void namedSingleConfigMapFails() {
7474
mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
7575

7676
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
77-
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
77+
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT, false);
7878

7979
Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
8080
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -115,7 +115,7 @@ void namedTwoConfigMapsOneFails() {
115115

116116
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
117117
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
118-
RetryProperties.DEFAULT);
118+
RetryProperties.DEFAULT, false);
119119

120120
Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
121121
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -150,7 +150,7 @@ void namedTwoConfigMapsBothFail() {
150150

151151
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
152152
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
153-
RetryProperties.DEFAULT);
153+
RetryProperties.DEFAULT, false);
154154

155155
Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
156156
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -182,7 +182,8 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
182182
Source configMapSource = new Source(null, namespace, labels, null, null, null);
183183

184184
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
185-
List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);
185+
List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT,
186+
false);
186187

187188
Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
188189
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -228,7 +229,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
228229

229230
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
230231
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
231-
false, RetryProperties.DEFAULT);
232+
false, RetryProperties.DEFAULT, false);
232233

233234
Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
234235
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -268,7 +269,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
268269

269270
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
270271
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
271-
false, RetryProperties.DEFAULT);
272+
false, RetryProperties.DEFAULT, false);
272273

273274
Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
274275
configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void namedSingleSecretFails(CapturedOutput output) {
7474
mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
7575

7676
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
77-
List.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
77+
List.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT, false);
7878

7979
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
8080
secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -113,7 +113,8 @@ void namedTwoSecretsOneFails() {
113113
Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);
114114

115115
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
116-
List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
116+
List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT,
117+
false);
117118

118119
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
119120
secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -147,7 +148,8 @@ void namedTwoSecretsBothFail() {
147148
Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);
148149

149150
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
150-
List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
151+
List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT,
152+
false);
151153

152154
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
153155
secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -179,7 +181,8 @@ void labeledSingleSecretFails(CapturedOutput output) {
179181
Source secretSource = new Source(null, namespace, labels, null, null, null);
180182

181183
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, labels, List.of(),
182-
List.of(secretSource), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
184+
List.of(secretSource), true, null, namespace, false, true, false, RetryProperties.DEFAULT,
185+
false);
183186

184187
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
185188
secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -225,7 +228,7 @@ void labeledTwoSecretsOneFails(CapturedOutput output) {
225228

226229
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
227230
Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
228-
true, false, RetryProperties.DEFAULT);
231+
true, false, RetryProperties.DEFAULT, false);
229232

230233
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
231234
secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -265,7 +268,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
265268

266269
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
267270
Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
268-
true, false, RetryProperties.DEFAULT);
271+
true, false, RetryProperties.DEFAULT, false);
269272

270273
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
271274
secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));

0 commit comments

Comments
 (0)