fix

wind57 · Nov 25, 2024 · 30c3753 · 30c3753
1 parent 51d0b94
commit 30c3753
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/...rk/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java b/...rk/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java
@@ -113,7 +113,7 @@ void namedSingleConfigMapFails() {
 		stubFor(get(path).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
-				Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
+				Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT, false);
 
 		CoreV1Api api = new CoreV1Api();
 		KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -159,7 +159,7 @@ void namedTwoConfigMapsOneFails(CapturedOutput output) {
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
-				RetryProperties.DEFAULT);
+				RetryProperties.DEFAULT, false);
 
 		CoreV1Api api = new CoreV1Api();
 		KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -205,7 +205,7 @@ void namedTwoConfigMapsBothFail(CapturedOutput output) {
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
-				RetryProperties.DEFAULT);
+				RetryProperties.DEFAULT, false);
 
 		CoreV1Api api = new CoreV1Api();
 		KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -249,7 +249,8 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
 				null, null, null);
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
-				List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);
+				List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT,
+				false);
 
 		CoreV1Api api = new CoreV1Api();
 		KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -302,7 +303,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
-				false, RetryProperties.DEFAULT);
+				false, RetryProperties.DEFAULT, false);
 
 		CoreV1Api api = new CoreV1Api();
 		KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,
@@ -357,7 +358,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
-				false, RetryProperties.DEFAULT);
+				false, RetryProperties.DEFAULT, false);
 
 		CoreV1Api api = new CoreV1Api();
 		KubernetesClientConfigMapPropertySourceLocator locator = new KubernetesClientConfigMapPropertySourceLocator(api,

diff --git a/...gframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java b/...gframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java
@@ -74,7 +74,7 @@ void namedSingleConfigMapFails() {
 		mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
-				Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
+				Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT, false);
 
 		Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -115,7 +115,7 @@ void namedTwoConfigMapsOneFails() {
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
-				RetryProperties.DEFAULT);
+				RetryProperties.DEFAULT, false);
 
 		Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -150,7 +150,7 @@ void namedTwoConfigMapsBothFail() {
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
-				RetryProperties.DEFAULT);
+				RetryProperties.DEFAULT, false);
 
 		Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -182,7 +182,8 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
 		Source configMapSource = new Source(null, namespace, labels, null, null, null);
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
-				List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);
+				List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT,
+				false);
 
 		Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -228,7 +229,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
-				false, RetryProperties.DEFAULT);
+				false, RetryProperties.DEFAULT, false);
 
 		Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -268,7 +269,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 
 		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
-				false, RetryProperties.DEFAULT);
+				false, RetryProperties.DEFAULT, false);
 
 		Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
 				configMapConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));

diff --git a/...ringframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java b/...ringframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java
@@ -74,7 +74,7 @@ void namedSingleSecretFails(CapturedOutput output) {
 		mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
 
 		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
-				List.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
+				List.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT, false);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -113,7 +113,8 @@ void namedTwoSecretsOneFails() {
 		Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);
 
 		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
-				List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
+				List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT,
+				false);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -147,7 +148,8 @@ void namedTwoSecretsBothFail() {
 		Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);
 
 		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
-				List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
+				List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT,
+				false);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -179,7 +181,8 @@ void labeledSingleSecretFails(CapturedOutput output) {
 		Source secretSource = new Source(null, namespace, labels, null, null, null);
 
 		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, labels, List.of(),
-				List.of(secretSource), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
+				List.of(secretSource), true, null, namespace, false, true, false, RetryProperties.DEFAULT,
+				false);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -225,7 +228,7 @@ void labeledTwoSecretsOneFails(CapturedOutput output) {
 
 		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
 				Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
-				true, false, RetryProperties.DEFAULT);
+				true, false, RetryProperties.DEFAULT, false);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));
@@ -265,7 +268,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 
 		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
 				Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
-				true, false, RetryProperties.DEFAULT);
+				true, false, RetryProperties.DEFAULT, false);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
 				secretsConfigProperties, new KubernetesNamespaceProvider(new MockEnvironment()));