From 032014e7b841bb3346f2a9a097fe9bd5983a30e9 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sat, 4 Dec 2021 07:59:07 -0800 Subject: [PATCH 01/25] test --- delme.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 delme.sh diff --git a/delme.sh b/delme.sh new file mode 100644 index 0000000000..707d90cb73 --- /dev/null +++ b/delme.sh @@ -0,0 +1 @@ +dadsa \ No newline at end of file From 10889fd1fc9c5ec3a32699d70d4a0e914aae7577 Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 16 Dec 2021 04:15:40 -0800 Subject: [PATCH 02/25] fix @Nested tests not running --- .circleci/config.yml | 2 +- pom.xml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f197c14d8..7eed9f3449 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,7 +44,7 @@ jobs: echo $CLASSNAMES TEST_ARG=$(echo $CLASSNAMES | sed 's/ /,/g') echo $TEST_ARG - ./mvnw -s .settings.xml -DfailIfNoTests=false -Dtest=$TEST_ARG -e clean org.jacoco:jacoco-maven-plugin:prepare-agent test -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + ./mvnw -s .settings.xml -DfailIfNoTests=false -DtestsToRun=$TEST_ARG -e clean org.jacoco:jacoco-maven-plugin:prepare-agent test -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn mkdir -p $HOME/artifacts/junit/ find . -type f -regex ".*/spring-cloud-*.*/target/*.*" -exec cp {} $HOME/artifacts/ \; find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $HOME/artifacts/junit/ \; diff --git a/pom.xml b/pom.xml index 191dae7c2d..e25caca33c 100644 --- a/pom.xml +++ b/pom.xml @@ -204,6 +204,11 @@ all false + + + + ${testsToRun} + @@ -356,6 +361,11 @@ all false + + + + ${testsToRun} + ${surefireArgLine} From b041c00ea5cac0bb3e7bd43bc75ee470920cc3fe Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 13 Jan 2022 15:33:08 +0200 Subject: [PATCH 03/25] trigger again From a34ac473971fca316b05a0b886de000f05220b1e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 08:43:39 +0000 Subject: [PATCH 04/25] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000..7bd954555f --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ] +} From 618f25aeccb763010ba7777653994148514c8d99 Mon Sep 17 00:00:00 2001 From: erabii Date: Tue, 14 Mar 2023 10:39:50 +0200 Subject: [PATCH 05/25] Delete renovate.json --- renovate.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 renovate.json diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 7bd954555f..0000000000 --- a/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" - ] -} From 100a9cd110d5c5e614573d8c3726b21788c1b550 Mon Sep 17 00:00:00 2001 From: erabii Date: Tue, 14 Mar 2023 10:40:02 +0200 Subject: [PATCH 06/25] Delete delme.sh --- delme.sh | 1 - 1 file changed, 1 deletion(-) delete mode 100644 delme.sh diff --git a/delme.sh b/delme.sh deleted file mode 100644 index 707d90cb73..0000000000 --- a/delme.sh +++ /dev/null @@ -1 +0,0 @@ -dadsa \ No newline at end of file From bcad0513fc831f7b4d287bb3c43904f36f9c69a3 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 30 Jan 2024 13:22:21 +0200 Subject: [PATCH 07/25] merge --- spring-cloud-kubernetes-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index f52c99133b..aa08571b04 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -33,7 +33,7 @@ Spring Cloud Kubernetes Dependencies 0.13.0 - 6.9.2 + 6.10.0 19.0.0 2.26.3 4.4 From b475303cbb67b0a247a0222fbb3c397b986e5130 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 30 Jan 2024 14:23:59 +0200 Subject: [PATCH 08/25] fix compilation From d4372129a05f55152f84ce46ebfca7f96bfb397f Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 30 Jan 2024 14:54:57 +0200 Subject: [PATCH 09/25] merge --- ...netesClientConfigReloadAutoConfigurationTest.java | 3 +-- .../commons/KubernetesClientProperties.java | 12 ++++++------ .../commons/KubernetesClientPropertiesTests.java | 5 ----- .../KubernetesConfigDataLocationResolverTests.java | 2 +- .../kubernetes/fabric8/Fabric8AutoConfiguration.java | 4 ---- 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java index 3e017b2080..eeb494961b 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java @@ -479,8 +479,7 @@ static class LocalTestConfig { @Bean KubernetesClientProperties kubernetesClientProperties() { return new KubernetesClientProperties(null, null, null, "default", null, null, null, null, null, null, null, - null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null); + null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); } @Bean diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java index f9dc5a6990..24ecfda7fe 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java @@ -33,9 +33,9 @@ public record KubernetesClientProperties(Boolean trustCerts, String masterUrl, S String caCertFile, String caCertData, String clientCertFile, String clientCertData, String clientKeyFile, String clientKeyData, String clientKeyAlgo, String clientKeyPassphrase, String username, String password, Duration watchReconnectInterval, Duration watchReconnectLimit, Duration connectionTimeout, - Duration requestTimeout, @Deprecated(forRemoval = true) Duration rollingTimeout, Duration loggingInterval, - String httpProxy, String httpsProxy, String proxyUsername, String proxyPassword, String oauthToken, - String[] noProxy, @DefaultValue(SERVICE_ACCOUNT_NAMESPACE_PATH) String serviceAccountNamespacePath, + Duration requestTimeout, Duration loggingInterval, String httpProxy, String httpsProxy, String proxyUsername, + String proxyPassword, String oauthToken, String[] noProxy, + @DefaultValue(SERVICE_ACCOUNT_NAMESPACE_PATH) String serviceAccountNamespacePath, @DefaultValue(DEFAULT_USER_AGENT) String userAgent) { /** @@ -61,9 +61,9 @@ public KubernetesClientProperties withNamespace(String namespace) { this.caCertFile(), this.caCertData(), this.clientCertFile(), this.clientCertData(), this.clientKeyFile(), this.clientKeyData(), this.clientKeyAlgo(), this.clientKeyPassphrase(), this.username(), this.password(), this.watchReconnectInterval(), this.watchReconnectLimit(), - this.connectionTimeout(), this.requestTimeout(), this.rollingTimeout(), this.loggingInterval(), - this.httpProxy(), this.httpsProxy(), this.proxyUsername(), this.proxyPassword(), this.oauthToken(), - this.noProxy(), this.serviceAccountNamespacePath(), this.userAgent()); + this.connectionTimeout(), this.requestTimeout(), this.loggingInterval(), this.httpProxy(), + this.httpsProxy(), this.proxyUsername(), this.proxyPassword(), this.oauthToken(), this.noProxy(), + this.serviceAccountNamespacePath(), this.userAgent()); } } diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesClientPropertiesTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesClientPropertiesTests.java index c7b360456b..63c2446dcf 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesClientPropertiesTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesClientPropertiesTests.java @@ -54,7 +54,6 @@ void testDefaults() { assertThat(properties.watchReconnectLimit()).isNull(); assertThat(properties.connectionTimeout()).isNull(); assertThat(properties.requestTimeout()).isNull(); - assertThat(properties.rollingTimeout()).isNull(); assertThat(properties.loggingInterval()).isNull(); assertThat(properties.httpProxy()).isNull(); assertThat(properties.httpsProxy()).isNull(); @@ -87,7 +86,6 @@ void testNonDefaults() { "spring.cloud.kubernetes.client.watch-reconnect-limit=300ms", "spring.cloud.kubernetes.client.connection-timeout=400ms", "spring.cloud.kubernetes.client.request-timeout=500ms", - "spring.cloud.kubernetes.client.rolling-timeout=600ms", "spring.cloud.kubernetes.client.logging-interval=700ms", "spring.cloud.kubernetes.client.http-proxy=http-proxy", "spring.cloud.kubernetes.client.https-proxy=https-proxy", @@ -117,7 +115,6 @@ void testNonDefaults() { assertThat(properties.watchReconnectLimit()).isEqualTo(Duration.ofMillis(300)); assertThat(properties.connectionTimeout()).isEqualTo(Duration.ofMillis(400)); assertThat(properties.requestTimeout()).isEqualTo(Duration.ofMillis(500)); - assertThat(properties.rollingTimeout()).isEqualTo(Duration.ofMillis(600)); assertThat(properties.loggingInterval()).isEqualTo(Duration.ofMillis(700)); assertThat(properties.httpProxy()).isEqualTo("http-proxy"); assertThat(properties.httpsProxy()).isEqualTo("https-proxy"); @@ -151,7 +148,6 @@ void testCopyWithNamespaceConstructor() { "spring.cloud.kubernetes.client.watch-reconnect-limit=300ms", "spring.cloud.kubernetes.client.connection-timeout=400ms", "spring.cloud.kubernetes.client.request-timeout=500ms", - "spring.cloud.kubernetes.client.rolling-timeout=600ms", "spring.cloud.kubernetes.client.logging-interval=700ms", "spring.cloud.kubernetes.client.http-proxy=http-proxy", "spring.cloud.kubernetes.client.https-proxy=https-proxy", @@ -182,7 +178,6 @@ void testCopyWithNamespaceConstructor() { assertThat(properties.watchReconnectLimit()).isEqualTo(Duration.ofMillis(300)); assertThat(properties.connectionTimeout()).isEqualTo(Duration.ofMillis(400)); assertThat(properties.requestTimeout()).isEqualTo(Duration.ofMillis(500)); - assertThat(properties.rollingTimeout()).isEqualTo(Duration.ofMillis(600)); assertThat(properties.loggingInterval()).isEqualTo(Duration.ofMillis(700)); assertThat(properties.httpProxy()).isEqualTo("http-proxy"); assertThat(properties.httpsProxy()).isEqualTo("https-proxy"); diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLocationResolverTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLocationResolverTests.java index 3bad5ad2bf..5b8be9b103 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLocationResolverTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLocationResolverTests.java @@ -154,7 +154,7 @@ void testResolveProfileSpecificTwo() { DefaultBootstrapContext context = new DefaultBootstrapContext(); KubernetesClientProperties properties = new KubernetesClientProperties(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, - null, null, null, "user-agent"); + null, null, "user-agent"); context.register(KubernetesClientProperties.class, BootstrapRegistry.InstanceSupplier.of(properties)); Mockito.when(RESOLVER_CONTEXT.getBinder()).thenReturn(binder); diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java index 1403d54a17..43e5c25d80 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java @@ -52,10 +52,6 @@ private static Integer orDurationInt(Duration left, Integer right) { return left != null ? (int) left.toMillis() : right; } - private static Long orDurationLong(Duration left, Long right) { - return left != null ? left.toMillis() : right; - } - @Bean @ConditionalOnMissingBean(Config.class) public Config kubernetesClientConfig(KubernetesClientProperties kubernetesClientProperties) { From f66cc8401e106b1a7f86d4d0fbe2a8c2b527f426 Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 31 Jan 2024 18:33:39 +0200 Subject: [PATCH 10/25] Merge branch '3.0.x' into fix-1457 From 0993a10ade16e47d49a549d555c76b3c4a466a17 Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 1 Feb 2024 15:28:56 +0200 Subject: [PATCH 11/25] fix tests --- .../Fabric8ConfigMapPropertySourceLocatorTests.java | 4 ++++ .../config/Fabric8ConfigMapPropertySourceTests.java | 4 ++++ .../config/Fabric8SecretsPropertySourceLocatorTests.java | 4 ++++ .../config/Fabric8SecretsPropertySourceMockTests.java | 4 ++++ .../retry/secrets_enabled/SecretsRetryEnabled.java | 2 ++ .../BootstrapCoreTestClientViaSystemPropertiesTest.java} | 9 +++------ ...ConfigDataCoreTestClientViaSystemPropertiesTest.java} | 5 +++-- .../CoreTestClientViaSystemProperties.java | 8 +++++--- .../src/test/resources/logback-test.xml | 1 + 9 files changed, 30 insertions(+), 11 deletions(-) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/{BootstrapCoreTestClientViaSystemProperties.java => system_properties/BootstrapCoreTestClientViaSystemPropertiesTest.java} (77%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/{ConfigDataCoreTestClientViaSystemProperties.java => system_properties/ConfigDataCoreTestClientViaSystemPropertiesTest.java} (83%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/{ => system_properties}/CoreTestClientViaSystemProperties.java (77%) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java index 72c6923a7d..fe3a382950 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceLocatorTests.java @@ -44,6 +44,10 @@ class Fabric8ConfigMapPropertySourceLocatorTests { @Test void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() { + + mockClient.getConfiguration().setRequestRetryBackoffLimit(0); + mockClient.getConfiguration().setRequestRetryBackoffInterval(0); + String name = "my-config"; String namespace = "default"; String path = "/api/v1/namespaces/default/configmaps"; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java index 2f1983254e..6b6a02b338 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapPropertySourceTests.java @@ -49,6 +49,10 @@ void afterEach() { @Test void constructorShouldThrowExceptionOnFailureWhenFailFastIsEnabled() { + + mockClient.getConfiguration().setRequestRetryBackoffLimit(0); + mockClient.getConfiguration().setRequestRetryBackoffInterval(0); + String name = "my-config"; String namespace = "default"; String path = String.format("/api/v1/namespaces/%s/configmaps", namespace); diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java index 871cea4f67..d5a34a81f2 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceLocatorTests.java @@ -44,6 +44,10 @@ class Fabric8SecretsPropertySourceLocatorTests { @Test void locateShouldThrowExceptionOnFailureWhenFailFastIsEnabled() { + + mockClient.getConfiguration().setRequestRetryBackoffLimit(0); + mockClient.getConfiguration().setRequestRetryBackoffInterval(0); + String name = "my-secret"; String namespace = "default"; String path = "/api/v1/namespaces/default/secrets"; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java index 74de092266..322d5fd5eb 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsPropertySourceMockTests.java @@ -60,6 +60,10 @@ void namedStrategyShouldThrowExceptionOnFailureWhenFailFastIsEnabled() { @Test void labeledStrategyShouldThrowExceptionOnFailureWhenFailFastIsEnabled() { + + client.getConfiguration().setRequestRetryBackoffInterval(0); + client.getConfiguration().setRequestRetryBackoffLimit(0); + final String namespace = "default"; final Map labels = Collections.singletonMap("a", "b"); final String path = String.format("/api/v1/namespaces/%s/secrets", namespace); diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java index a655dbc48f..64ff93e99f 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java @@ -61,6 +61,8 @@ static void setup(KubernetesClient mockClient, KubernetesMockServer mockServer) System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFLIMIT_SYSTEM_PROPERTY, "0"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFINTERVAL_SYSTEM_PROPERTY, "0"); // return empty secret list to not fail context creation mockServer.expect().withPath(LIST_API).andReturn(200, new SecretListBuilder().build()).once(); diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/BootstrapCoreTestClientViaSystemProperties.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/system_properties/BootstrapCoreTestClientViaSystemPropertiesTest.java similarity index 77% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/BootstrapCoreTestClientViaSystemProperties.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/system_properties/BootstrapCoreTestClientViaSystemPropertiesTest.java index 3b50cb2bf4..69f9dafc07 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/BootstrapCoreTestClientViaSystemProperties.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/system_properties/BootstrapCoreTestClientViaSystemPropertiesTest.java @@ -14,19 +14,16 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config; - -import org.junit.jupiter.api.extension.ExtendWith; +package org.springframework.cloud.kubernetes.fabric8.config.system_properties; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; -@ExtendWith(SpringExtension.class) @SpringBootTest(classes = TestApplication.class, properties = { "spring.main.cloud-platform=KUBERNETES", "spring.application.name=testapp", "spring.cloud.kubernetes.client.namespace=testns", "spring.cloud.kubernetes.client.trustCerts=true", "spring.cloud.kubernetes.config.namespace=testns", "spring.cloud.kubernetes.secrets.enableApi=true", "spring.cloud.bootstrap.enabled=true" }) -public class BootstrapCoreTestClientViaSystemProperties extends CoreTestClientViaSystemProperties { +class BootstrapCoreTestClientViaSystemPropertiesTest extends CoreTestClientViaSystemProperties { } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigDataCoreTestClientViaSystemProperties.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/system_properties/ConfigDataCoreTestClientViaSystemPropertiesTest.java similarity index 83% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigDataCoreTestClientViaSystemProperties.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/system_properties/ConfigDataCoreTestClientViaSystemPropertiesTest.java index ed344d81e6..0dcb6647df 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/ConfigDataCoreTestClientViaSystemProperties.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/system_properties/ConfigDataCoreTestClientViaSystemPropertiesTest.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config; +package org.springframework.cloud.kubernetes.fabric8.config.system_properties; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; import org.springframework.test.context.junit.jupiter.SpringExtension; @ExtendWith(SpringExtension.class) @@ -27,6 +28,6 @@ "spring.cloud.kubernetes.client.namespace=testns", "spring.cloud.kubernetes.client.trustCerts=true", "spring.cloud.kubernetes.config.namespace=testns", "spring.cloud.kubernetes.secrets.enableApi=true", "spring.config.import=kubernetes:" }) -public class ConfigDataCoreTestClientViaSystemProperties extends CoreTestClientViaSystemProperties { +class ConfigDataCoreTestClientViaSystemPropertiesTest extends CoreTestClientViaSystemProperties { } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTestClientViaSystemProperties.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/system_properties/CoreTestClientViaSystemProperties.java similarity index 77% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTestClientViaSystemProperties.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/system_properties/CoreTestClientViaSystemProperties.java index 2b922b65e8..852c32c362 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/CoreTestClientViaSystemProperties.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/system_properties/CoreTestClientViaSystemProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config; +package org.springframework.cloud.kubernetes.fabric8.config.system_properties; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; @@ -31,12 +31,14 @@ abstract class CoreTestClientViaSystemProperties { private KubernetesClient client; @BeforeAll - public static void setUpBeforeClass() { + static void setUpBeforeClass() { System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, "masterURL"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFLIMIT_SYSTEM_PROPERTY, "0"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFINTERVAL_SYSTEM_PROPERTY, "0"); } @Test - public void kubernetesClientBeanShouldBeConfigurableViaSystemProperties() { + void kubernetesClientBeanShouldBeConfigurableViaSystemProperties() { assertThat(client).isNotNull(); assertThat(client.getConfiguration().getMasterUrl()).isEqualTo("http://masterURL/"); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-fabric8-config/src/test/resources/logback-test.xml index 60fab6fb97..c7c1ca6194 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-fabric8-config/src/test/resources/logback-test.xml @@ -6,4 +6,5 @@ + From 9e13bb687ecac81e5c96cb54e4bdb079b2677f66 Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 1 Feb 2024 15:53:47 +0200 Subject: [PATCH 12/25] fix tests --- ...figRetryEnabled.java => BoostrapConfigRetryEnabledTest.java} | 2 +- ...gRetryEnabled.java => ConfigDataConfigRetryEnabledTest.java} | 2 +- .../locator_retry/config_retry_enabled/ConfigRetryEnabled.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/{BoostrapConfigRetryEnabled.java => BoostrapConfigRetryEnabledTest.java} (96%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/{ConfigDataConfigRetryEnabled.java => ConfigDataConfigRetryEnabledTest.java} (97%) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/BoostrapConfigRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/BoostrapConfigRetryEnabledTest.java similarity index 96% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/BoostrapConfigRetryEnabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/BoostrapConfigRetryEnabledTest.java index efe5f6ede7..dffb08a636 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/BoostrapConfigRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/BoostrapConfigRetryEnabledTest.java @@ -36,7 +36,7 @@ "spring.main.cloud-platform=KUBERNETES", "spring.cloud.bootstrap.enabled=true" }, classes = Application.class) @EnableKubernetesMockClient -class BoostrapConfigRetryEnabled extends ConfigRetryEnabled { +class BoostrapConfigRetryEnabledTest extends ConfigRetryEnabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigDataConfigRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigDataConfigRetryEnabledTest.java similarity index 97% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigDataConfigRetryEnabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigDataConfigRetryEnabledTest.java index 68300666ca..09e84d8ddf 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigDataConfigRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigDataConfigRetryEnabledTest.java @@ -41,7 +41,7 @@ "spring.config.import=kubernetes:" }, classes = Application.class) @EnableKubernetesMockClient -class ConfigDataConfigRetryEnabled extends ConfigRetryEnabled { +class ConfigDataConfigRetryEnabledTest extends ConfigRetryEnabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigRetryEnabled.java index 27ecd4e670..63359c78f6 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigRetryEnabled.java @@ -61,6 +61,8 @@ static void setup(KubernetesClient mockClient, KubernetesMockServer mockServer) System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFLIMIT_SYSTEM_PROPERTY, "0"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFINTERVAL_SYSTEM_PROPERTY, "0"); // needed so that initial call, before our test method kicks in, succeeds mockServer.expect().withPath(API).andReturn(200, new ConfigMapListBuilder().build()).once(); From 1dc28fdb4e5a135f40b729da7bd9429b8a083e49 Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 2 Feb 2024 10:18:12 +0200 Subject: [PATCH 13/25] merge --- .../tests/commons/fabric8_client/Util.java | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java index 738870119a..a2417c3f6d 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java @@ -42,6 +42,7 @@ import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.dsl.base.PatchContext; import io.fabric8.kubernetes.client.dsl.base.PatchType; +import io.fabric8.kubernetes.client.utils.Serialization; import jakarta.annotation.Nullable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -115,8 +116,8 @@ public void createAndWait(String namespace, String name, @Nullable Deployment de public void busybox(String namespace, Phase phase) { InputStream deploymentStream = inputStream("busybox/deployment.yaml"); InputStream serviceStream = inputStream("busybox/service.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).item(); - Service service = client.services().load(serviceStream).item(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); if (phase.equals(Phase.CREATE)) { createAndWait(namespace, "busybox", deployment, service, null, false); @@ -192,19 +193,19 @@ public void setUpClusterWide(String serviceAccountNamespace, Set namespa InputStream serviceAccountAsStream = inputStream("cluster/service-account.yaml"); InputStream roleBindingAsStream = inputStream("cluster/role-binding.yaml"); - ClusterRole clusterRole = client.rbac().clusterRoles().load(clusterRoleBindingAsStream).item(); + ClusterRole clusterRole = Serialization.unmarshal(clusterRoleBindingAsStream, ClusterRole.class); if (client.rbac().clusterRoles().withName(clusterRole.getMetadata().getName()).get() == null) { client.rbac().clusterRoles().resource(clusterRole).create(); } - ServiceAccount serviceAccountFromStream = client.serviceAccounts().load(serviceAccountAsStream).item(); + ServiceAccount serviceAccountFromStream = Serialization.unmarshal(serviceAccountAsStream, ServiceAccount.class); serviceAccountFromStream.getMetadata().setNamespace(serviceAccountNamespace); if (client.serviceAccounts().inNamespace(serviceAccountNamespace) .withName(serviceAccountFromStream.getMetadata().getName()).get() == null) { client.serviceAccounts().inNamespace(serviceAccountNamespace).resource(serviceAccountFromStream).create(); } - RoleBinding roleBindingFromStream = client.rbac().roleBindings().load(roleBindingAsStream).item(); + RoleBinding roleBindingFromStream = Serialization.unmarshal(roleBindingAsStream, RoleBinding.class); namespaces.forEach(namespace -> { roleBindingFromStream.getMetadata().setNamespace(namespace); @@ -269,14 +270,14 @@ public void wiremock(String namespace, String path, Phase phase, boolean withIng InputStream serviceStream = inputStream("wiremock/wiremock-service.yaml"); InputStream ingressStream = inputStream("wiremock/wiremock-ingress.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).item(); - Service service = client.services().load(serviceStream).item(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); Ingress ingress = null; if (phase.equals(Phase.CREATE)) { if (withIngress) { - ingress = client.network().v1().ingresses().load(ingressStream).get(); + ingress = Serialization.unmarshal(ingressStream, Ingress.class); ingress.getMetadata().setNamespace(namespace); ingress.getSpec().getRules().get(0).getHttp().getPaths().get(0).setPath(path); } @@ -288,7 +289,7 @@ public void wiremock(String namespace, String path, Phase phase, boolean withIng else { if (withIngress) { - ingress = client.network().v1().ingresses().load(ingressStream).get(); + ingress = Serialization.unmarshal(ingressStream, Ingress.class); } deleteAndWait(namespace, deployment, service, ingress); @@ -432,24 +433,21 @@ private boolean isDeploymentReadyAfterPatch(String deploymentName, String namesp private void innerSetup(String namespace, InputStream serviceAccountAsStream, InputStream roleBindingAsStream, InputStream roleAsStream) { - ServiceAccount serviceAccountFromStream = client.serviceAccounts().inNamespace(namespace) - .load(serviceAccountAsStream).item(); - if (client.serviceAccounts().inNamespace(namespace).withName(serviceAccountFromStream.getMetadata().getName()) + ServiceAccount serviceAccount = Serialization.unmarshal(serviceAccountAsStream, ServiceAccount.class); + if (client.serviceAccounts().inNamespace(namespace).withName(serviceAccount.getMetadata().getName()) .get() == null) { - client.serviceAccounts().inNamespace(namespace).resource(serviceAccountFromStream).create(); + client.serviceAccounts().inNamespace(namespace).resource(serviceAccount).create(); } - RoleBinding roleBindingFromStream = client.rbac().roleBindings().inNamespace(namespace) - .load(roleBindingAsStream).item(); - if (client.rbac().roleBindings().inNamespace(namespace).withName(roleBindingFromStream.getMetadata().getName()) + RoleBinding roleBinding = Serialization.unmarshal(roleBindingAsStream, RoleBinding.class); + if (client.rbac().roleBindings().inNamespace(namespace).withName(roleBinding.getMetadata().getName()) .get() == null) { - client.rbac().roleBindings().inNamespace(namespace).resource(roleBindingFromStream).create(); + client.rbac().roleBindings().inNamespace(namespace).resource(roleBinding).create(); } - Role roleFromStream = client.rbac().roles().inNamespace(namespace).load(roleAsStream).item(); - if (client.rbac().roles().inNamespace(namespace).withName(roleFromStream.getMetadata().getName()) - .get() == null) { - client.rbac().roles().inNamespace(namespace).resource(roleFromStream).create(); + Role role = Serialization.unmarshal(roleAsStream, Role.class); + if (client.rbac().roles().inNamespace(namespace).withName(role.getMetadata().getName()).get() == null) { + client.rbac().roles().inNamespace(namespace).resource(role).create(); } } From decf07000757c7ae5bffbafc03b7b24bc7fcad67 Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 2 Feb 2024 11:26:55 +0200 Subject: [PATCH 14/25] merge --- .../fabric8/Fabric8UserAgentDefaultConfigurationTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java index 69002846ef..cf66994548 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java @@ -37,7 +37,7 @@ class Fabric8UserAgentDefaultConfigurationTests { @Test void testUserAgent() { String userAgent = client.getConfiguration().getUserAgent(); - assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.9.2"); + assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.10.0"); } } From c200bcbce425ecdd4408cbbd31e8edb80a4cfb50 Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 2 Feb 2024 12:02:06 +0200 Subject: [PATCH 15/25] fix test --- ...tstrapSecretsRetryDisabledButConfigRetryEnabledTest.java} | 4 ++-- ...igDataSecretsRetryDisabledButConfigRetryEnabledTest.java} | 4 ++-- .../SecretsRetryDisabledButConfigRetryEnabled.java | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/{BootstrapSecretsRetryDisabledButConfigRetryEnabled.java => secrets_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTest.java} (94%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/{ConfigDataSecretsRetryDisabledButConfigRetryEnabled.java => secrets_disabled_config_enabled/ConfigDataSecretsRetryDisabledButConfigRetryEnabledTest.java} (94%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/{ => secrets_disabled_config_enabled}/SecretsRetryDisabledButConfigRetryEnabled.java (94%) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/BootstrapSecretsRetryDisabledButConfigRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTest.java similarity index 94% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/BootstrapSecretsRetryDisabledButConfigRetryEnabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTest.java index 45cf342f76..3788c85be1 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/BootstrapSecretsRetryDisabledButConfigRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.retry; +package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_disabled_config_enabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -41,7 +41,7 @@ "spring.cloud.bootstrap.enabled=true" }, classes = Application.class) @EnableKubernetesMockClient -class BootstrapSecretsRetryDisabledButConfigRetryEnabled extends SecretsRetryDisabledButConfigRetryEnabled { +class BootstrapSecretsRetryDisabledButConfigRetryEnabledTest extends SecretsRetryDisabledButConfigRetryEnabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/ConfigDataSecretsRetryDisabledButConfigRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/ConfigDataSecretsRetryDisabledButConfigRetryEnabledTest.java similarity index 94% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/ConfigDataSecretsRetryDisabledButConfigRetryEnabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/ConfigDataSecretsRetryDisabledButConfigRetryEnabledTest.java index 829f355ad6..556e5f813d 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/ConfigDataSecretsRetryDisabledButConfigRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/ConfigDataSecretsRetryDisabledButConfigRetryEnabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.retry; +package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_disabled_config_enabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -42,7 +42,7 @@ "spring.config.import=kubernetes:" }, classes = Application.class) @EnableKubernetesMockClient -class ConfigDataSecretsRetryDisabledButConfigRetryEnabled extends SecretsRetryDisabledButConfigRetryEnabled { +class ConfigDataSecretsRetryDisabledButConfigRetryEnabledTest extends SecretsRetryDisabledButConfigRetryEnabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/SecretsRetryDisabledButConfigRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/SecretsRetryDisabledButConfigRetryEnabled.java similarity index 94% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/SecretsRetryDisabledButConfigRetryEnabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/SecretsRetryDisabledButConfigRetryEnabled.java index 322785ac5c..1ebf0ffb33 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/SecretsRetryDisabledButConfigRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/SecretsRetryDisabledButConfigRetryEnabled.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.retry; +package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_disabled_config_enabled; import io.fabric8.kubernetes.api.model.ConfigMapListBuilder; import io.fabric8.kubernetes.api.model.SecretListBuilder; @@ -60,6 +60,9 @@ protected static void setup(KubernetesClient mockClient, KubernetesMockServer mo System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFLIMIT_SYSTEM_PROPERTY, "0"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFINTERVAL_SYSTEM_PROPERTY, "0"); + // return empty secret list to not fail context creation mockServer.expect().withPath(SECRET_API).andReturn(200, new SecretListBuilder().build()).always(); mockServer.expect().withPath(CONFIG_MAP_API).andReturn(200, new ConfigMapListBuilder().build()).always(); From 6a23d37b5aa59a084e8a556e6ae61878756fd8f1 Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 2 Feb 2024 12:44:34 +0200 Subject: [PATCH 16/25] fix test --- ...BootstrapSecretsFailFastEnabledButRetryDisabledTest.java} | 4 ++-- ...onfigDataSecretsFailFastEnabledButRetryDisabledTest.java} | 4 ++-- .../SecretsFailFastEnabledButRetryDisabled.java | 5 ++++- .../BootstrapSecretsFailFastDisabledTest.java} | 4 ++-- .../ConfigDataSecretsFailFastDisabledTest.java} | 4 ++-- .../SecretsFailFastDisabled.java | 5 ++++- 6 files changed, 16 insertions(+), 10 deletions(-) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/{BootstrapSecretsFailFastEnabledButRetryDisabled.java => secrets_enabled_retry_disabled/BootstrapSecretsFailFastEnabledButRetryDisabledTest.java} (93%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/{ConfigDataSecretsFailFastEnabledButRetryDisabled.java => secrets_enabled_retry_disabled/ConfigDataSecretsFailFastEnabledButRetryDisabledTest.java} (94%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/{ => secrets_enabled_retry_disabled}/SecretsFailFastEnabledButRetryDisabled.java (93%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/{BootstrapSecretsFailFastDisabled.java => secrets_fail_fast_disabled/BootstrapSecretsFailFastDisabledTest.java} (95%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/{ConfigDataSecretsFailFastDisabled.java => secrets_fail_fast_disabled/ConfigDataSecretsFailFastDisabledTest.java} (95%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/{ => secrets_fail_fast_disabled}/SecretsFailFastDisabled.java (93%) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/BootstrapSecretsFailFastEnabledButRetryDisabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled_retry_disabled/BootstrapSecretsFailFastEnabledButRetryDisabledTest.java similarity index 93% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/BootstrapSecretsFailFastEnabledButRetryDisabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled_retry_disabled/BootstrapSecretsFailFastEnabledButRetryDisabledTest.java index 78d38dfa55..244ec85956 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/BootstrapSecretsFailFastEnabledButRetryDisabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled_retry_disabled/BootstrapSecretsFailFastEnabledButRetryDisabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.retry; +package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_enabled_retry_disabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -38,7 +38,7 @@ "spring.cloud.kubernetes.config.enabled=false" }, classes = Application.class) @EnableKubernetesMockClient -class BootstrapSecretsFailFastEnabledButRetryDisabled extends SecretsFailFastEnabledButRetryDisabled { +class BootstrapSecretsFailFastEnabledButRetryDisabledTest extends SecretsFailFastEnabledButRetryDisabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/ConfigDataSecretsFailFastEnabledButRetryDisabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled_retry_disabled/ConfigDataSecretsFailFastEnabledButRetryDisabledTest.java similarity index 94% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/ConfigDataSecretsFailFastEnabledButRetryDisabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled_retry_disabled/ConfigDataSecretsFailFastEnabledButRetryDisabledTest.java index 8b23556acf..0dedca9627 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/ConfigDataSecretsFailFastEnabledButRetryDisabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled_retry_disabled/ConfigDataSecretsFailFastEnabledButRetryDisabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.retry; +package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_enabled_retry_disabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -40,7 +40,7 @@ "spring.cloud.kubernetes.config.enabled=false" }, classes = Application.class) @EnableKubernetesMockClient -class ConfigDataSecretsFailFastEnabledButRetryDisabled extends SecretsFailFastEnabledButRetryDisabled { +class ConfigDataSecretsFailFastEnabledButRetryDisabledTest extends SecretsFailFastEnabledButRetryDisabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/SecretsFailFastEnabledButRetryDisabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled_retry_disabled/SecretsFailFastEnabledButRetryDisabled.java similarity index 93% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/SecretsFailFastEnabledButRetryDisabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled_retry_disabled/SecretsFailFastEnabledButRetryDisabled.java index 4ed82085be..74849874e3 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/SecretsFailFastEnabledButRetryDisabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled_retry_disabled/SecretsFailFastEnabledButRetryDisabled.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.retry; +package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_enabled_retry_disabled; import io.fabric8.kubernetes.api.model.SecretListBuilder; import io.fabric8.kubernetes.client.Config; @@ -58,6 +58,9 @@ static void setup(KubernetesClient mockClient, KubernetesMockServer mockServer) System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFLIMIT_SYSTEM_PROPERTY, "0"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFINTERVAL_SYSTEM_PROPERTY, "0"); + // return empty secret list to not fail context creation mockServer.expect().withPath(LIST_API).andReturn(200, new SecretListBuilder().build()).always(); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/BootstrapSecretsFailFastDisabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/BootstrapSecretsFailFastDisabledTest.java similarity index 95% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/BootstrapSecretsFailFastDisabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/BootstrapSecretsFailFastDisabledTest.java index f42dc5b39d..155b5ec501 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/BootstrapSecretsFailFastDisabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/BootstrapSecretsFailFastDisabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.retry; +package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_fail_fast_disabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -36,7 +36,7 @@ "spring.main.cloud-platform=KUBERNETES", "spring.cloud.bootstrap.enabled=true" }, classes = Application.class) @EnableKubernetesMockClient -class BootstrapSecretsFailFastDisabled extends SecretsFailFastDisabled { +class BootstrapSecretsFailFastDisabledTest extends SecretsFailFastDisabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/ConfigDataSecretsFailFastDisabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/ConfigDataSecretsFailFastDisabledTest.java similarity index 95% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/ConfigDataSecretsFailFastDisabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/ConfigDataSecretsFailFastDisabledTest.java index 64a25d7d91..cae4d94522 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/ConfigDataSecretsFailFastDisabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/ConfigDataSecretsFailFastDisabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.retry; +package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_fail_fast_disabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -38,7 +38,7 @@ "spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" }, classes = Application.class) @EnableKubernetesMockClient -class ConfigDataSecretsFailFastDisabled extends SecretsFailFastDisabled { +class ConfigDataSecretsFailFastDisabledTest extends SecretsFailFastDisabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/SecretsFailFastDisabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/SecretsFailFastDisabled.java similarity index 93% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/SecretsFailFastDisabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/SecretsFailFastDisabled.java index 1ce88b41d8..f1e005ce05 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/SecretsFailFastDisabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/SecretsFailFastDisabled.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.retry; +package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_fail_fast_disabled; import io.fabric8.kubernetes.api.model.SecretListBuilder; import io.fabric8.kubernetes.client.Config; @@ -57,6 +57,9 @@ static void setup(KubernetesClient mockClient, KubernetesMockServer mockServer) System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFLIMIT_SYSTEM_PROPERTY, "0"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFINTERVAL_SYSTEM_PROPERTY, "0"); + // return empty secret list to not fail context creation mockServer.expect().withPath(LIST_API).andReturn(200, new SecretListBuilder().build()).always(); } From 158c36f2f505ce0788dfcbaebb8d7f6f7528deb5 Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 2 Feb 2024 13:26:18 +0200 Subject: [PATCH 17/25] fix test --- ...ostrapConfigRetryDisabledButSecretsRetryEnabledTest.java} | 4 ++-- ...igDataConfigRetryDisabledButSecretsRetryEnabledTest.java} | 4 ++-- .../ConfigRetryDisabledButSecretsRetryEnabled.java | 5 ++++- .../BoostrapConfigFailFastDisabledTest.java} | 4 ++-- .../ConfigDataConfigFailFastDisabledTest.java} | 4 ++-- .../ConfigFailFastDisabled.java | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/{BoostrapConfigRetryDisabledButSecretsRetryEnabled.java => config_disabled_secrets_enabled/BoostrapConfigRetryDisabledButSecretsRetryEnabledTest.java} (92%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/{ConfigDataConfigRetryDisabledButSecretsRetryEnabled.java => config_disabled_secrets_enabled/ConfigDataConfigRetryDisabledButSecretsRetryEnabledTest.java} (93%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/{ => config_disabled_secrets_enabled}/ConfigRetryDisabledButSecretsRetryEnabled.java (94%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/{BoostrapConfigFailFastDisabled.java => config_fail_fast_disabled/BoostrapConfigFailFastDisabledTest.java} (93%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/{ConfigDataConfigFailFastDisabled.java => config_fail_fast_disabled/ConfigDataConfigFailFastDisabledTest.java} (93%) rename spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/{ => config_fail_fast_disabled}/ConfigFailFastDisabled.java (98%) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/BoostrapConfigRetryDisabledButSecretsRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_disabled_secrets_enabled/BoostrapConfigRetryDisabledButSecretsRetryEnabledTest.java similarity index 92% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/BoostrapConfigRetryDisabledButSecretsRetryEnabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_disabled_secrets_enabled/BoostrapConfigRetryDisabledButSecretsRetryEnabledTest.java index cb482ea690..98a212e989 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/BoostrapConfigRetryDisabledButSecretsRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_disabled_secrets_enabled/BoostrapConfigRetryDisabledButSecretsRetryEnabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.locator_retry; +package org.springframework.cloud.kubernetes.fabric8.config.locator_retry.config_disabled_secrets_enabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -37,7 +37,7 @@ "spring.cloud.bootstrap.enabled=true" }, classes = Application.class) @EnableKubernetesMockClient -class BoostrapConfigRetryDisabledButSecretsRetryEnabled extends ConfigRetryDisabledButSecretsRetryEnabled { +class BoostrapConfigRetryDisabledButSecretsRetryEnabledTest extends ConfigRetryDisabledButSecretsRetryEnabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigDataConfigRetryDisabledButSecretsRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_disabled_secrets_enabled/ConfigDataConfigRetryDisabledButSecretsRetryEnabledTest.java similarity index 93% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigDataConfigRetryDisabledButSecretsRetryEnabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_disabled_secrets_enabled/ConfigDataConfigRetryDisabledButSecretsRetryEnabledTest.java index 0832b42f81..ea95cff00a 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigDataConfigRetryDisabledButSecretsRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_disabled_secrets_enabled/ConfigDataConfigRetryDisabledButSecretsRetryEnabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.locator_retry; +package org.springframework.cloud.kubernetes.fabric8.config.locator_retry.config_disabled_secrets_enabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -38,7 +38,7 @@ "spring.config.import=kubernetes:" }, classes = Application.class) @EnableKubernetesMockClient -class ConfigDataConfigRetryDisabledButSecretsRetryEnabled extends ConfigRetryDisabledButSecretsRetryEnabled { +class ConfigDataConfigRetryDisabledButSecretsRetryEnabledTest extends ConfigRetryDisabledButSecretsRetryEnabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigRetryDisabledButSecretsRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_disabled_secrets_enabled/ConfigRetryDisabledButSecretsRetryEnabled.java similarity index 94% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigRetryDisabledButSecretsRetryEnabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_disabled_secrets_enabled/ConfigRetryDisabledButSecretsRetryEnabled.java index 39335f317b..954260da04 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigRetryDisabledButSecretsRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_disabled_secrets_enabled/ConfigRetryDisabledButSecretsRetryEnabled.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.locator_retry; +package org.springframework.cloud.kubernetes.fabric8.config.locator_retry.config_disabled_secrets_enabled; import io.fabric8.kubernetes.api.model.ConfigMapListBuilder; import io.fabric8.kubernetes.client.Config; @@ -57,6 +57,9 @@ static void setup(KubernetesClient mockClient, KubernetesMockServer mockServer) System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFLIMIT_SYSTEM_PROPERTY, "0"); + System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFINTERVAL_SYSTEM_PROPERTY, "0"); + // return empty secret list to not fail context creation mockServer.expect().withPath(API).andReturn(200, new ConfigMapListBuilder().build()).always(); } diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/BoostrapConfigFailFastDisabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/BoostrapConfigFailFastDisabledTest.java similarity index 93% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/BoostrapConfigFailFastDisabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/BoostrapConfigFailFastDisabledTest.java index d9f4071ad5..d253069880 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/BoostrapConfigFailFastDisabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/BoostrapConfigFailFastDisabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.locator_retry; +package org.springframework.cloud.kubernetes.fabric8.config.locator_retry.config_fail_fast_disabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -32,7 +32,7 @@ "spring.cloud.bootstrap.enabled=true" }, classes = Application.class) @EnableKubernetesMockClient -class BoostrapConfigFailFastDisabled extends ConfigFailFastDisabled { +class BoostrapConfigFailFastDisabledTest extends ConfigFailFastDisabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigDataConfigFailFastDisabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/ConfigDataConfigFailFastDisabledTest.java similarity index 93% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigDataConfigFailFastDisabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/ConfigDataConfigFailFastDisabledTest.java index becc6a23d2..30d70eb51f 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigDataConfigFailFastDisabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/ConfigDataConfigFailFastDisabledTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.locator_retry; +package org.springframework.cloud.kubernetes.fabric8.config.locator_retry.config_fail_fast_disabled; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; @@ -32,7 +32,7 @@ "spring.config.import=kubernetes:" }, classes = Application.class) @EnableKubernetesMockClient -class ConfigDataConfigFailFastDisabled extends ConfigFailFastDisabled { +class ConfigDataConfigFailFastDisabledTest extends ConfigFailFastDisabled { private static KubernetesMockServer mockServer; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigFailFastDisabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/ConfigFailFastDisabled.java similarity index 98% rename from spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigFailFastDisabled.java rename to spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/ConfigFailFastDisabled.java index 2e1c754b1b..20a7633424 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/ConfigFailFastDisabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_fail_fast_disabled/ConfigFailFastDisabled.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.config.locator_retry; +package org.springframework.cloud.kubernetes.fabric8.config.locator_retry.config_fail_fast_disabled; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClient; From 92acb274fe96d8c47dc4c05340f330d9784ff776 Mon Sep 17 00:00:00 2001 From: wind57 Date: Mon, 8 Apr 2024 11:11:29 +0300 Subject: [PATCH 18/25] placeholder commit From 29f1efec269a743d62b619caa1daf7416c3abcc3 Mon Sep 17 00:00:00 2001 From: wind57 Date: Mon, 8 Apr 2024 12:16:43 +0300 Subject: [PATCH 19/25] placeholder commit From 3915f03848d3e9323452b9b97b807b3277825049 Mon Sep 17 00:00:00 2001 From: wind57 Date: Fri, 6 Sep 2024 09:44:03 +0300 Subject: [PATCH 20/25] formatting --- .../KubernetesClientPropertiesTests.java | 240 +++++++++--------- .../tests/commons/fabric8_client/Util.java | 13 +- 2 files changed, 132 insertions(+), 121 deletions(-) diff --git a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesClientPropertiesTests.java b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesClientPropertiesTests.java index f25efc4b86..9732997caf 100644 --- a/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesClientPropertiesTests.java +++ b/spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesClientPropertiesTests.java @@ -69,127 +69,133 @@ void testDefaults() { @Test void testNonDefaults() { - new ApplicationContextRunner().withUserConfiguration(Config.class).withPropertyValues( - "spring.cloud.kubernetes.client.trust-certs=true", - "spring.cloud.kubernetes.client.master-url=master-url", "spring.cloud.kubernetes.client.api-version=1", - "spring.cloud.kubernetes.client.namespace=namespace", - "spring.cloud.kubernetes.client.ca-cert-file=ca-cert-file", - "spring.cloud.kubernetes.client.ca-cert-data=ca-cert-data", - "spring.cloud.kubernetes.client.client-cert-file=client-cert-file", - "spring.cloud.kubernetes.client.client-cert-data=client-cert-data", - "spring.cloud.kubernetes.client.client-key-file=client-key-file", - "spring.cloud.kubernetes.client.client-key-data=client-key-data", - "spring.cloud.kubernetes.client.client-key-algo=client-key-algo", - "spring.cloud.kubernetes.client.client-key-passphrase=client-key-passphrase", - "spring.cloud.kubernetes.client.username=username", "spring.cloud.kubernetes.client.password=password", - "spring.cloud.kubernetes.client.watch-reconnect-interval=200ms", - "spring.cloud.kubernetes.client.watch-reconnect-limit=300ms", - "spring.cloud.kubernetes.client.connection-timeout=400ms", - "spring.cloud.kubernetes.client.request-timeout=500ms", - "spring.cloud.kubernetes.client.logging-interval=700ms", - "spring.cloud.kubernetes.client.http-proxy=http-proxy", - "spring.cloud.kubernetes.client.https-proxy=https-proxy", - "spring.cloud.kubernetes.client.proxy-username=proxy-username", - "spring.cloud.kubernetes.client.proxy-password=proxy-password", - "spring.cloud.kubernetes.client.oauth-token=oauth-token", - "spring.cloud.kubernetes.client.no-proxy[0]=a", "spring.cloud.kubernetes.client.no-proxy[1]=b", - "spring.cloud.kubernetes.client.service-account-namespace-path=path", - "spring.cloud.kubernetes.client.user-agent=user-agent").run(context -> { - KubernetesClientProperties properties = context.getBean(KubernetesClientProperties.class); - assertThat(properties).isNotNull(); - assertThat(properties.trustCerts()).isTrue(); - assertThat(properties.masterUrl()).isEqualTo("master-url"); - assertThat(properties.apiVersion()).isEqualTo("1"); - assertThat(properties.namespace()).isEqualTo("namespace"); - assertThat(properties.caCertFile()).isEqualTo("ca-cert-file"); - assertThat(properties.caCertData()).isEqualTo("ca-cert-data"); - assertThat(properties.clientCertFile()).isEqualTo("client-cert-file"); - assertThat(properties.clientCertData()).isEqualTo("client-cert-data"); - assertThat(properties.clientKeyFile()).isEqualTo("client-key-file"); - assertThat(properties.clientKeyData()).isEqualTo("client-key-data"); - assertThat(properties.clientKeyAlgo()).isEqualTo("client-key-algo"); - assertThat(properties.clientKeyPassphrase()).isEqualTo("client-key-passphrase"); - assertThat(properties.username()).isEqualTo("username"); - assertThat(properties.password()).isEqualTo("password"); - assertThat(properties.watchReconnectInterval()).isEqualTo(Duration.ofMillis(200)); - assertThat(properties.watchReconnectLimit()).isEqualTo(Duration.ofMillis(300)); - assertThat(properties.connectionTimeout()).isEqualTo(Duration.ofMillis(400)); - assertThat(properties.requestTimeout()).isEqualTo(Duration.ofMillis(500)); - assertThat(properties.loggingInterval()).isEqualTo(Duration.ofMillis(700)); - assertThat(properties.httpProxy()).isEqualTo("http-proxy"); - assertThat(properties.httpsProxy()).isEqualTo("https-proxy"); - assertThat(properties.proxyUsername()).isEqualTo("proxy-username"); - assertThat(properties.proxyPassword()).isEqualTo("proxy-password"); - assertThat(properties.oauthToken()).isEqualTo("oauth-token"); - assertThat(properties.noProxy().length).isEqualTo(2); - assertThat(properties.noProxy()[0]).isEqualTo("a"); - assertThat(properties.noProxy()[1]).isEqualTo("b"); - assertThat(properties.serviceAccountNamespacePath()).isEqualTo("path"); - assertThat(properties.userAgent()).isEqualTo("user-agent"); - }); + new ApplicationContextRunner().withUserConfiguration(Config.class) + .withPropertyValues("spring.cloud.kubernetes.client.trust-certs=true", + "spring.cloud.kubernetes.client.master-url=master-url", + "spring.cloud.kubernetes.client.api-version=1", + "spring.cloud.kubernetes.client.namespace=namespace", + "spring.cloud.kubernetes.client.ca-cert-file=ca-cert-file", + "spring.cloud.kubernetes.client.ca-cert-data=ca-cert-data", + "spring.cloud.kubernetes.client.client-cert-file=client-cert-file", + "spring.cloud.kubernetes.client.client-cert-data=client-cert-data", + "spring.cloud.kubernetes.client.client-key-file=client-key-file", + "spring.cloud.kubernetes.client.client-key-data=client-key-data", + "spring.cloud.kubernetes.client.client-key-algo=client-key-algo", + "spring.cloud.kubernetes.client.client-key-passphrase=client-key-passphrase", + "spring.cloud.kubernetes.client.username=username", + "spring.cloud.kubernetes.client.password=password", + "spring.cloud.kubernetes.client.watch-reconnect-interval=200ms", + "spring.cloud.kubernetes.client.watch-reconnect-limit=300ms", + "spring.cloud.kubernetes.client.connection-timeout=400ms", + "spring.cloud.kubernetes.client.request-timeout=500ms", + "spring.cloud.kubernetes.client.logging-interval=700ms", + "spring.cloud.kubernetes.client.http-proxy=http-proxy", + "spring.cloud.kubernetes.client.https-proxy=https-proxy", + "spring.cloud.kubernetes.client.proxy-username=proxy-username", + "spring.cloud.kubernetes.client.proxy-password=proxy-password", + "spring.cloud.kubernetes.client.oauth-token=oauth-token", + "spring.cloud.kubernetes.client.no-proxy[0]=a", "spring.cloud.kubernetes.client.no-proxy[1]=b", + "spring.cloud.kubernetes.client.service-account-namespace-path=path", + "spring.cloud.kubernetes.client.user-agent=user-agent") + .run(context -> { + KubernetesClientProperties properties = context.getBean(KubernetesClientProperties.class); + assertThat(properties).isNotNull(); + assertThat(properties.trustCerts()).isTrue(); + assertThat(properties.masterUrl()).isEqualTo("master-url"); + assertThat(properties.apiVersion()).isEqualTo("1"); + assertThat(properties.namespace()).isEqualTo("namespace"); + assertThat(properties.caCertFile()).isEqualTo("ca-cert-file"); + assertThat(properties.caCertData()).isEqualTo("ca-cert-data"); + assertThat(properties.clientCertFile()).isEqualTo("client-cert-file"); + assertThat(properties.clientCertData()).isEqualTo("client-cert-data"); + assertThat(properties.clientKeyFile()).isEqualTo("client-key-file"); + assertThat(properties.clientKeyData()).isEqualTo("client-key-data"); + assertThat(properties.clientKeyAlgo()).isEqualTo("client-key-algo"); + assertThat(properties.clientKeyPassphrase()).isEqualTo("client-key-passphrase"); + assertThat(properties.username()).isEqualTo("username"); + assertThat(properties.password()).isEqualTo("password"); + assertThat(properties.watchReconnectInterval()).isEqualTo(Duration.ofMillis(200)); + assertThat(properties.watchReconnectLimit()).isEqualTo(Duration.ofMillis(300)); + assertThat(properties.connectionTimeout()).isEqualTo(Duration.ofMillis(400)); + assertThat(properties.requestTimeout()).isEqualTo(Duration.ofMillis(500)); + assertThat(properties.loggingInterval()).isEqualTo(Duration.ofMillis(700)); + assertThat(properties.httpProxy()).isEqualTo("http-proxy"); + assertThat(properties.httpsProxy()).isEqualTo("https-proxy"); + assertThat(properties.proxyUsername()).isEqualTo("proxy-username"); + assertThat(properties.proxyPassword()).isEqualTo("proxy-password"); + assertThat(properties.oauthToken()).isEqualTo("oauth-token"); + assertThat(properties.noProxy().length).isEqualTo(2); + assertThat(properties.noProxy()[0]).isEqualTo("a"); + assertThat(properties.noProxy()[1]).isEqualTo("b"); + assertThat(properties.serviceAccountNamespacePath()).isEqualTo("path"); + assertThat(properties.userAgent()).isEqualTo("user-agent"); + }); } @Test void testCopyWithNamespaceConstructor() { - new ApplicationContextRunner().withUserConfiguration(Config.class).withPropertyValues( - "spring.cloud.kubernetes.client.trust-certs=true", - "spring.cloud.kubernetes.client.master-url=master-url", "spring.cloud.kubernetes.client.api-version=1", - "spring.cloud.kubernetes.client.namespace=namespace", - "spring.cloud.kubernetes.client.ca-cert-file=ca-cert-file", - "spring.cloud.kubernetes.client.ca-cert-data=ca-cert-data", - "spring.cloud.kubernetes.client.client-cert-file=client-cert-file", - "spring.cloud.kubernetes.client.client-cert-data=client-cert-data", - "spring.cloud.kubernetes.client.client-key-file=client-key-file", - "spring.cloud.kubernetes.client.client-key-data=client-key-data", - "spring.cloud.kubernetes.client.client-key-algo=client-key-algo", - "spring.cloud.kubernetes.client.client-key-passphrase=client-key-passphrase", - "spring.cloud.kubernetes.client.username=username", "spring.cloud.kubernetes.client.password=password", - "spring.cloud.kubernetes.client.watch-reconnect-interval=200ms", - "spring.cloud.kubernetes.client.watch-reconnect-limit=300ms", - "spring.cloud.kubernetes.client.connection-timeout=400ms", - "spring.cloud.kubernetes.client.request-timeout=500ms", - "spring.cloud.kubernetes.client.logging-interval=700ms", - "spring.cloud.kubernetes.client.http-proxy=http-proxy", - "spring.cloud.kubernetes.client.https-proxy=https-proxy", - "spring.cloud.kubernetes.client.proxy-username=proxy-username", - "spring.cloud.kubernetes.client.proxy-password=proxy-password", - "spring.cloud.kubernetes.client.oauth-token=oauth-token", - "spring.cloud.kubernetes.client.no-proxy[0]=a", "spring.cloud.kubernetes.client.no-proxy[1]=b", - "spring.cloud.kubernetes.client.service-account-namespace-path=path", - "spring.cloud.kubernetes.client.user-agent=user-agent").run(context -> { - KubernetesClientProperties properties = context.getBean(KubernetesClientProperties.class) - .withNamespace("non-default"); - assertThat(properties).isNotNull(); - assertThat(properties.trustCerts()).isTrue(); - assertThat(properties.masterUrl()).isEqualTo("master-url"); - assertThat(properties.apiVersion()).isEqualTo("1"); - assertThat(properties.namespace()).isEqualTo("non-default"); - assertThat(properties.caCertFile()).isEqualTo("ca-cert-file"); - assertThat(properties.caCertData()).isEqualTo("ca-cert-data"); - assertThat(properties.clientCertFile()).isEqualTo("client-cert-file"); - assertThat(properties.clientCertData()).isEqualTo("client-cert-data"); - assertThat(properties.clientKeyFile()).isEqualTo("client-key-file"); - assertThat(properties.clientKeyData()).isEqualTo("client-key-data"); - assertThat(properties.clientKeyAlgo()).isEqualTo("client-key-algo"); - assertThat(properties.clientKeyPassphrase()).isEqualTo("client-key-passphrase"); - assertThat(properties.username()).isEqualTo("username"); - assertThat(properties.password()).isEqualTo("password"); - assertThat(properties.watchReconnectInterval()).isEqualTo(Duration.ofMillis(200)); - assertThat(properties.watchReconnectLimit()).isEqualTo(Duration.ofMillis(300)); - assertThat(properties.connectionTimeout()).isEqualTo(Duration.ofMillis(400)); - assertThat(properties.requestTimeout()).isEqualTo(Duration.ofMillis(500)); - assertThat(properties.loggingInterval()).isEqualTo(Duration.ofMillis(700)); - assertThat(properties.httpProxy()).isEqualTo("http-proxy"); - assertThat(properties.httpsProxy()).isEqualTo("https-proxy"); - assertThat(properties.proxyUsername()).isEqualTo("proxy-username"); - assertThat(properties.proxyPassword()).isEqualTo("proxy-password"); - assertThat(properties.oauthToken()).isEqualTo("oauth-token"); - assertThat(properties.noProxy().length).isEqualTo(2); - assertThat(properties.noProxy()[0]).isEqualTo("a"); - assertThat(properties.noProxy()[1]).isEqualTo("b"); - assertThat(properties.serviceAccountNamespacePath()).isEqualTo("path"); - assertThat(properties.userAgent()).isEqualTo("user-agent"); - }); + new ApplicationContextRunner().withUserConfiguration(Config.class) + .withPropertyValues("spring.cloud.kubernetes.client.trust-certs=true", + "spring.cloud.kubernetes.client.master-url=master-url", + "spring.cloud.kubernetes.client.api-version=1", + "spring.cloud.kubernetes.client.namespace=namespace", + "spring.cloud.kubernetes.client.ca-cert-file=ca-cert-file", + "spring.cloud.kubernetes.client.ca-cert-data=ca-cert-data", + "spring.cloud.kubernetes.client.client-cert-file=client-cert-file", + "spring.cloud.kubernetes.client.client-cert-data=client-cert-data", + "spring.cloud.kubernetes.client.client-key-file=client-key-file", + "spring.cloud.kubernetes.client.client-key-data=client-key-data", + "spring.cloud.kubernetes.client.client-key-algo=client-key-algo", + "spring.cloud.kubernetes.client.client-key-passphrase=client-key-passphrase", + "spring.cloud.kubernetes.client.username=username", + "spring.cloud.kubernetes.client.password=password", + "spring.cloud.kubernetes.client.watch-reconnect-interval=200ms", + "spring.cloud.kubernetes.client.watch-reconnect-limit=300ms", + "spring.cloud.kubernetes.client.connection-timeout=400ms", + "spring.cloud.kubernetes.client.request-timeout=500ms", + "spring.cloud.kubernetes.client.logging-interval=700ms", + "spring.cloud.kubernetes.client.http-proxy=http-proxy", + "spring.cloud.kubernetes.client.https-proxy=https-proxy", + "spring.cloud.kubernetes.client.proxy-username=proxy-username", + "spring.cloud.kubernetes.client.proxy-password=proxy-password", + "spring.cloud.kubernetes.client.oauth-token=oauth-token", + "spring.cloud.kubernetes.client.no-proxy[0]=a", "spring.cloud.kubernetes.client.no-proxy[1]=b", + "spring.cloud.kubernetes.client.service-account-namespace-path=path", + "spring.cloud.kubernetes.client.user-agent=user-agent") + .run(context -> { + KubernetesClientProperties properties = context.getBean(KubernetesClientProperties.class) + .withNamespace("non-default"); + assertThat(properties).isNotNull(); + assertThat(properties.trustCerts()).isTrue(); + assertThat(properties.masterUrl()).isEqualTo("master-url"); + assertThat(properties.apiVersion()).isEqualTo("1"); + assertThat(properties.namespace()).isEqualTo("non-default"); + assertThat(properties.caCertFile()).isEqualTo("ca-cert-file"); + assertThat(properties.caCertData()).isEqualTo("ca-cert-data"); + assertThat(properties.clientCertFile()).isEqualTo("client-cert-file"); + assertThat(properties.clientCertData()).isEqualTo("client-cert-data"); + assertThat(properties.clientKeyFile()).isEqualTo("client-key-file"); + assertThat(properties.clientKeyData()).isEqualTo("client-key-data"); + assertThat(properties.clientKeyAlgo()).isEqualTo("client-key-algo"); + assertThat(properties.clientKeyPassphrase()).isEqualTo("client-key-passphrase"); + assertThat(properties.username()).isEqualTo("username"); + assertThat(properties.password()).isEqualTo("password"); + assertThat(properties.watchReconnectInterval()).isEqualTo(Duration.ofMillis(200)); + assertThat(properties.watchReconnectLimit()).isEqualTo(Duration.ofMillis(300)); + assertThat(properties.connectionTimeout()).isEqualTo(Duration.ofMillis(400)); + assertThat(properties.requestTimeout()).isEqualTo(Duration.ofMillis(500)); + assertThat(properties.loggingInterval()).isEqualTo(Duration.ofMillis(700)); + assertThat(properties.httpProxy()).isEqualTo("http-proxy"); + assertThat(properties.httpsProxy()).isEqualTo("https-proxy"); + assertThat(properties.proxyUsername()).isEqualTo("proxy-username"); + assertThat(properties.proxyPassword()).isEqualTo("proxy-password"); + assertThat(properties.oauthToken()).isEqualTo("oauth-token"); + assertThat(properties.noProxy().length).isEqualTo(2); + assertThat(properties.noProxy()[0]).isEqualTo("a"); + assertThat(properties.noProxy()[1]).isEqualTo("b"); + assertThat(properties.serviceAccountNamespacePath()).isEqualTo("path"); + assertThat(properties.userAgent()).isEqualTo("user-agent"); + }); } @EnableConfigurationProperties(KubernetesClientProperties.class) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java index 13a1eb33f6..17235ef7cd 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java @@ -515,14 +515,19 @@ private boolean isDeploymentReadyAfterPatch(String deploymentName, String namesp private void innerSetup(String namespace, InputStream serviceAccountAsStream, InputStream roleBindingAsStream, InputStream roleAsStream) { ServiceAccount serviceAccount = Serialization.unmarshal(serviceAccountAsStream, ServiceAccount.class); - if (client.serviceAccounts().inNamespace(namespace).withName(serviceAccount.getMetadata().getName()) - .get() == null) { + if (client.serviceAccounts() + .inNamespace(namespace) + .withName(serviceAccount.getMetadata().getName()) + .get() == null) { client.serviceAccounts().inNamespace(namespace).resource(serviceAccount).create(); } RoleBinding roleBinding = Serialization.unmarshal(roleBindingAsStream, RoleBinding.class); - if (client.rbac().roleBindings().inNamespace(namespace).withName(roleBinding.getMetadata().getName()) - .get() == null) { + if (client.rbac() + .roleBindings() + .inNamespace(namespace) + .withName(roleBinding.getMetadata().getName()) + .get() == null) { client.rbac().roleBindings().inNamespace(namespace).resource(roleBinding).create(); } From 2886a09da3a8e53ac80beeca2366f4ae7b74b973 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 8 Sep 2024 19:34:09 +0300 Subject: [PATCH 21/25] fix --- ...tryDisabledButConfigRetryEnabledTests.java | 62 ----------- ...tryDisabledButConfigRetryEnabledTests.java | 65 ----------- ...etsRetryDisabledButConfigRetryEnabled.java | 103 ------------------ .../secrets_enabled/SecretsRetryEnabled.java | 4 +- 4 files changed, 2 insertions(+), 232 deletions(-) delete mode 100644 spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTests.java delete mode 100644 spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/ConfigDataSecretsRetryDisabledButConfigRetryEnabledTests.java delete mode 100644 spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/SecretsRetryDisabledButConfigRetryEnabled.java diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTests.java deleted file mode 100644 index 6818866d79..0000000000 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTests.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2013-2022 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_disabled_config_enabled; - -import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; - -import org.springframework.boot.test.mock.mockito.SpyBean; -import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator; -import org.springframework.context.ApplicationContext; -import org.springframework.test.context.TestPropertySource; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author Isik Erhan - */ -@TestPropertySource(properties = { "spring.cloud.bootstrap.enabled=true" }) -@EnableKubernetesMockClient -class BootstrapSecretsRetryDisabledButConfigRetryEnabledTests extends SecretsRetryDisabledButConfigRetryEnabled { - - private static KubernetesMockServer mockServer; - - private static KubernetesClient mockClient; - - @BeforeAll - static void setup() { - setup(mockClient, mockServer); - } - - @SpyBean - private Fabric8SecretsPropertySourceLocator propertySourceLocator; - - @BeforeEach - void beforeEach() { - psl = propertySourceLocator; - verifiablePsl = propertySourceLocator; - } - - @Override - protected void assertRetryBean(ApplicationContext context) { - assertThat(context.containsBean("kubernetesSecretsRetryInterceptor")).isTrue(); - } - -} diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/ConfigDataSecretsRetryDisabledButConfigRetryEnabledTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/ConfigDataSecretsRetryDisabledButConfigRetryEnabledTests.java deleted file mode 100644 index d6f5a96456..0000000000 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/ConfigDataSecretsRetryDisabledButConfigRetryEnabledTests.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2013-2022 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_disabled_config_enabled; - -import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator; -import org.springframework.context.ApplicationContext; -import org.springframework.test.context.TestPropertySource; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.spy; - -/** - * @author Isik Erhan - */ -@TestPropertySource(properties = { "spring.config.import=kubernetes:" }) -@EnableKubernetesMockClient -class ConfigDataSecretsRetryDisabledButConfigRetryEnabledTests extends SecretsRetryDisabledButConfigRetryEnabled { - - private static KubernetesMockServer mockServer; - - private static KubernetesClient mockClient; - - @Autowired - private Fabric8SecretsPropertySourceLocator secretsPropertySourceLocator; - - @BeforeAll - static void setup() { - setup(mockClient, mockServer); - } - - @BeforeEach - public void beforeEach() { - psl = spy(secretsPropertySourceLocator); - verifiablePsl = psl; - } - - @Override - protected void assertRetryBean(ApplicationContext context) { - assertThat(context.containsBean("configDataSecretsPropertySourceLocator")).isTrue(); - assertThat(context.getBean("configDataSecretsPropertySourceLocator")) - .isInstanceOf(Fabric8SecretsPropertySourceLocator.class); - } - -} diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/SecretsRetryDisabledButConfigRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/SecretsRetryDisabledButConfigRetryEnabled.java deleted file mode 100644 index 2292c6895b..0000000000 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_disabled_config_enabled/SecretsRetryDisabledButConfigRetryEnabled.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2013-2022 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.kubernetes.fabric8.config.retry.secrets_disabled_config_enabled; - -import io.fabric8.kubernetes.api.model.ConfigMapListBuilder; -import io.fabric8.kubernetes.api.model.SecretListBuilder; -import io.fabric8.kubernetes.client.Config; -import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; -import org.junit.jupiter.api.Test; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySourceLocator; -import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; -import org.springframework.context.ApplicationContext; -import org.springframework.mock.env.MockEnvironment; - -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - -/** - * @author Isik Erhan - */ -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, - properties = { "spring.cloud.kubernetes.client.namespace=default", - "spring.cloud.kubernetes.secrets.fail-fast=true", "spring.cloud.kubernetes.secrets.retry.enabled=false", - "spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.secrets.name=my-secret", - "spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES" }, - classes = TestApplication.class) -abstract class SecretsRetryDisabledButConfigRetryEnabled { - - private static final String SECRET_API = "/api/v1/namespaces/default/secrets"; - - private static final String CONFIG_MAP_API = "/api/v1/namespaces/default/configmaps"; - - private static KubernetesMockServer mockServer; - - private static KubernetesClient mockClient; - - protected SecretsPropertySourceLocator psl; - - protected SecretsPropertySourceLocator verifiablePsl; - - protected static void setup(KubernetesClient mockClient, KubernetesMockServer mockServer) { - SecretsRetryDisabledButConfigRetryEnabled.mockClient = mockClient; - SecretsRetryDisabledButConfigRetryEnabled.mockServer = mockServer; - // Configure the kubernetes master url to point to the mock server - System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, mockClient.getConfiguration().getMasterUrl()); - System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true"); - System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false"); - System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true"); - - System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFLIMIT_SYSTEM_PROPERTY, "0"); - System.setProperty(Config.KUBERNETES_REQUEST_RETRY_BACKOFFINTERVAL_SYSTEM_PROPERTY, "0"); - - // return empty secret list to not fail context creation - mockServer.expect().withPath(SECRET_API).andReturn(200, new SecretListBuilder().build()).always(); - mockServer.expect().withPath(CONFIG_MAP_API).andReturn(200, new ConfigMapListBuilder().build()).always(); - } - - @Autowired - private ApplicationContext context; - - @Test - void locateShouldFailWithoutRetrying() { - /* - * Enabling config retry causes Spring Retry to be enabled and a - * RetryOperationsInterceptor bean with NeverRetryPolicy for secrets to be - * defined. SecretsPropertySourceLocator should not retry even Spring Retry is - * enabled. - */ - mockServer.clearExpectations(); - mockServer.expect().withPath(SECRET_API).andReturn(500, "Internal Server Error").once(); - - assertRetryBean(context); - assertThatThrownBy(() -> psl.locate(new MockEnvironment())).isInstanceOf(IllegalStateException.class) - .hasMessageContaining("v1/namespaces/default/secrets. Message: Internal Server Error"); - - // verify that propertySourceLocator.locate is called only once - verify(verifiablePsl, times(1)).locate(any()); - } - - protected abstract void assertRetryBean(ApplicationContext context); - -} diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java index e4d5ecb7ff..5e9a90d84b 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java @@ -101,7 +101,7 @@ void locateShouldNotRetryWhenThereIsNoFailure() { assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1"); } - @Test + //@Test void locateShouldRetryAndRecover() { Map data = new HashMap<>(); data.put("some.sensitive.prop", Base64.getEncoder().encodeToString("theSensitiveValue".getBytes())); @@ -127,7 +127,7 @@ void locateShouldRetryAndRecover() { assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1"); } - @Test + //@Test void locateShouldRetryAndFail() { // fail all the 5 requests mockServer.expect().withPath(API).andReturn(500, "Internal Server Error").times(5); From f04b470702536ee64d10acfefc497137dc06cc72 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 8 Sep 2024 19:35:52 +0300 Subject: [PATCH 22/25] checkstyle --- .../config/retry/secrets_enabled/SecretsRetryEnabled.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java index 5e9a90d84b..ce198a9af0 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java @@ -101,7 +101,7 @@ void locateShouldNotRetryWhenThereIsNoFailure() { assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1"); } - //@Test + // @Test void locateShouldRetryAndRecover() { Map data = new HashMap<>(); data.put("some.sensitive.prop", Base64.getEncoder().encodeToString("theSensitiveValue".getBytes())); @@ -127,7 +127,7 @@ void locateShouldRetryAndRecover() { assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1"); } - //@Test + // @Test void locateShouldRetryAndFail() { // fail all the 5 requests mockServer.expect().withPath(API).andReturn(500, "Internal Server Error").times(5); From 6573b4685ba07cf7694602e6707e133fcda17089 Mon Sep 17 00:00:00 2001 From: wind57 Date: Sun, 8 Sep 2024 19:36:44 +0300 Subject: [PATCH 23/25] fix --- .../config/retry/secrets_enabled/SecretsRetryEnabled.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java index ce198a9af0..e4d5ecb7ff 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/SecretsRetryEnabled.java @@ -101,7 +101,7 @@ void locateShouldNotRetryWhenThereIsNoFailure() { assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1"); } - // @Test + @Test void locateShouldRetryAndRecover() { Map data = new HashMap<>(); data.put("some.sensitive.prop", Base64.getEncoder().encodeToString("theSensitiveValue".getBytes())); @@ -127,7 +127,7 @@ void locateShouldRetryAndRecover() { assertThat(propertySource.getProperty("some.sensitive.number")).isEqualTo("1"); } - // @Test + @Test void locateShouldRetryAndFail() { // fail all the 5 requests mockServer.expect().withPath(API).andReturn(500, "Internal Server Error").times(5); From f08cb59bda8dc6d9b3bd9f1b72725729a0f21b1e Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 2 Oct 2024 13:46:00 +0300 Subject: [PATCH 24/25] placeholder commit From ce52b9069afb521108a7a65ba5a5bb6fc7d409b9 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 14 Jan 2025 20:34:37 +0200 Subject: [PATCH 25/25] placeholder commit