diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml index 8e51b1742d..55ea1172fb 100644 --- a/spring-cloud-kubernetes-client-autoconfig/pom.xml +++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml @@ -65,6 +65,11 @@ spring-cloud-kubernetes-test-support test + + org.springframework.boot + spring-boot-webtestclient + test + diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java index 5a053ccea8..0e5ed47c03 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorDisabledHealthTest.java @@ -22,7 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.health.registry.ReactiveHealthContributorRegistry; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -33,6 +34,7 @@ properties = { "management.health.kubernetes.enabled=false", "management.endpoint.health.show-details=always", "management.endpoint.health.show-components=always", "spring.main.cloud-platform=KUBERNETES", "management.endpoints.web.exposure.include=health" }) +@AutoConfigureWebTestClient class ActuatorDisabledHealthTest { @Autowired diff --git a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java index 6d9e4e276e..a138489cd3 100644 --- a/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java +++ b/spring-cloud-kubernetes-client-autoconfig/src/test/java/org/springframework/cloud/kubernetes/client/ActuatorEnabledHealthTest.java @@ -22,7 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.health.registry.HealthContributorRegistry; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -30,6 +31,7 @@ properties = { "management.health.kubernetes.enabled=true", "management.endpoint.health.show-details=always", "management.endpoint.health.show-components=always", "management.endpoints.web.exposure.include=health", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient class ActuatorEnabledHealthTest { @Autowired diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml index e50d1addd3..412f9113c6 100644 --- a/spring-cloud-kubernetes-client-config/pom.xml +++ b/spring-cloud-kubernetes-client-config/pom.xml @@ -114,6 +114,11 @@ spring-cloud-kubernetes-test-support test + + org.springframework.boot + spring-boot-webtestclient + test + diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixTests.java index d6bd63d81f..31efe63574 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_prefix/LabeledConfigMapWithPrefixTests.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -31,6 +32,7 @@ * * @author wind57 */ +@AutoConfigureWebTestClient abstract class LabeledConfigMapWithPrefixTests { @Autowired diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileTests.java index c60a88db4f..8998ce570c 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_config_map_with_profile/LabeledConfigMapWithProfileTests.java @@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.Blue; import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.Green; import org.springframework.cloud.kubernetes.client.config.applications.labeled_config_map_with_profile.properties.GreenK8s; @@ -38,6 +39,7 @@ * * @author wind57 */ +@AutoConfigureWebTestClient abstract class LabeledConfigMapWithProfileTests { @Autowired diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixTests.java index 846e9bf1b8..1113dba710 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/labeled_secret_with_prefix/LabeledSecretWithPrefixTests.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.client.config.bootstrap.stubs.LabeledSecretWithPrefixConfigurationStub; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.reactive.server.WebTestClient; @@ -33,6 +34,7 @@ * @author wind57 */ @TestPropertySource(properties = "spring.cloud.kubernetes.secrets.enabled=true") +@AutoConfigureWebTestClient abstract class LabeledSecretWithPrefixTests { @Autowired diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixTests.java index 5455bafdeb..ad98979a76 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_prefix/NamedConfigMapWithPrefixTests.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -31,6 +32,7 @@ * * @author wind57 */ +@AutoConfigureWebTestClient abstract class NamedConfigMapWithPrefixTests { @Autowired diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/NamedConfigMapWithProfileTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/NamedConfigMapWithProfileTests.java index 7529362b66..e1bb00df41 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/NamedConfigMapWithProfileTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_config_map_with_profile/NamedConfigMapWithProfileTests.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -31,6 +32,7 @@ * * @author wind57 */ +@AutoConfigureWebTestClient abstract class NamedConfigMapWithProfileTests { @Autowired diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixTests.java index 7cfbdd4613..f46aa8a393 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_prefix/NamedSecretWithPrefixTests.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.reactive.server.WebTestClient; @@ -33,6 +34,7 @@ * @author wind57 */ @TestPropertySource(properties = "spring.cloud.kubernetes.secrets.enabled=true") +@AutoConfigureWebTestClient abstract class NamedSecretWithPrefixTests { @Autowired diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileTests.java index 5df1b4325e..c94122b46a 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/named_secret_with_profile/NamedSecretWithProfileTests.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.reactive.server.WebTestClient; @@ -33,6 +34,7 @@ * @author wind57 */ @TestPropertySource(properties = "spring.cloud.kubernetes.secrets.enabled=true") +@AutoConfigureWebTestClient abstract class NamedSecretWithProfileTests { @Autowired diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesTests.java index 943de37dcd..1b49f8f243 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/single_source_multiple_files/SingleSourceMultipleFilesTests.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -34,6 +35,7 @@ * issue: https://github.com/spring-cloud/spring-cloud-kubernetes/issues/640 * */ +@AutoConfigureWebTestClient abstract class SingleSourceMultipleFilesTests { @Autowired diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/sources_order/ConfigDataRetryableSourcesOrderTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/sources_order/ConfigDataRetryableSourcesOrderTests.java index cbc901713b..de10c38628 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/sources_order/ConfigDataRetryableSourcesOrderTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/sources_order/ConfigDataRetryableSourcesOrderTests.java @@ -25,8 +25,8 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.client.KubernetesClientUtils; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/sources_order/SourcesOrderTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/sources_order/SourcesOrderTests.java index 54d4119af7..55f50312ae 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/sources_order/SourcesOrderTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/applications/sources_order/SourcesOrderTests.java @@ -30,8 +30,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.web.reactive.server.WebTestClient; diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/BootstrapKubernetesClientSanitizeConfigpropsEndpointTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/BootstrapKubernetesClientSanitizeConfigpropsEndpointTests.java index 66ef525325..18787f1637 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/BootstrapKubernetesClientSanitizeConfigpropsEndpointTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/BootstrapKubernetesClientSanitizeConfigpropsEndpointTests.java @@ -22,7 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.SanitizableData; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -36,6 +37,7 @@ class BootstrapKubernetesClientSanitizeConfigpropsEndpointTests { "management.endpoints.web.exposure.include=*", "spring.cloud.bootstrap.name=sanitize", "bootstrap.sanitize=true", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class DefaultSettingsTest { @@ -94,6 +96,7 @@ void test() { "management.endpoints.web.exposure.include=*", "spring.cloud.bootstrap.name=sanitize", "management.endpoint.configprops.show-values=NEVER", "bootstrap.sanitize=true", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class ExplicitNever { @@ -166,6 +169,7 @@ void test() { "management.endpoint.configprops.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=false", "bootstrap.sanitize=true", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class AlwaysWithoutSanitizingFunction { @@ -238,6 +242,7 @@ void test() { "management.endpoint.configprops.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=true", "bootstrap.sanitize=true", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class AlwaysWithSanitizingFunction { diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/BootstrapKubernetesClientSanitizeEnvEndpointTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/BootstrapKubernetesClientSanitizeEnvEndpointTests.java index 550226d609..d266dfb2bf 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/BootstrapKubernetesClientSanitizeEnvEndpointTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/BootstrapKubernetesClientSanitizeEnvEndpointTests.java @@ -22,7 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.SanitizableData; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -36,6 +37,7 @@ class BootstrapKubernetesClientSanitizeEnvEndpointTests { "management.endpoints.web.exposure.include=*", "spring.cloud.bootstrap.name=sanitize", "bootstrap.sanitize=true", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class DefaultSettingsTest { @@ -98,6 +100,7 @@ void test() { "management.endpoints.web.exposure.include=*", "spring.cloud.bootstrap.name=sanitize", "management.endpoint.env.show-values=NEVER", "bootstrap.sanitize=true", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class ExplicitNever { @@ -170,6 +173,7 @@ void test() { "management.endpoint.env.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=false", "bootstrap.sanitize=true", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class AlwaysWithoutSanitizingFunction { @@ -242,6 +246,7 @@ void test() { "management.endpoint.env.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=true", "bootstrap.sanitize=true", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class AlwaysWithSanitizingFunction { diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/ConfigDataFabric8ConfigpropsEndpointTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/ConfigDataFabric8ConfigpropsEndpointTests.java index bbdeda112f..b5dd4730e8 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/ConfigDataFabric8ConfigpropsEndpointTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/ConfigDataFabric8ConfigpropsEndpointTests.java @@ -22,7 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.SanitizableData; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -35,6 +36,7 @@ class ConfigDataFabric8ConfigpropsEndpointTests { properties = { "spring.main.cloud-platform=KUBERNETES", "management.endpoints.web.exposure.include=*", "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class DefaultSettingsTest extends ConfigDataSanitize { @@ -93,6 +95,7 @@ void test() { "management.endpoint.configprops.show-values=NEVER", "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class ExplicitNever extends ConfigDataSanitize { @@ -165,6 +168,7 @@ void test() { "spring.cloud.kubernetes.sanitize.secrets=false", "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class AlwaysWithoutSanitizingFunction extends ConfigDataSanitize { @@ -237,6 +241,7 @@ void test() { "spring.cloud.kubernetes.sanitize.secrets=true", "spring.config.import=kubernetes:,classpath:./sanitize-two.yaml", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class AlwaysWithSanitizingFunction extends ConfigDataSanitize { diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/ConfigDataKubernetesClientSanitizeEnvEndpointTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/ConfigDataKubernetesClientSanitizeEnvEndpointTests.java index 447e5c4aee..4ab79bce3a 100644 --- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/ConfigDataKubernetesClientSanitizeEnvEndpointTests.java +++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/sanitize_secrets/ConfigDataKubernetesClientSanitizeEnvEndpointTests.java @@ -22,7 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.SanitizableData; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -36,6 +37,7 @@ class ConfigDataKubernetesClientSanitizeEnvEndpointTests { "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "management.endpoints.web.exposure.include=*", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class DefaultSettingsTest extends ConfigDataSanitize { @@ -98,6 +100,7 @@ void test() { "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "management.endpoint.env.show-values=NEVER", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class ExplicitNever extends ConfigDataSanitize { @@ -169,6 +172,7 @@ void test() { "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "management.endpoint.env.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=false", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class AlwaysWithoutSanitizingFunction extends ConfigDataSanitize { @@ -240,6 +244,7 @@ void test() { "spring.config.import=kubernetes:,classpath:./sanitize-two.yaml", "management.endpoint.env.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=true", "spring.cloud.kubernetes.client.namespace=test", "spring.cloud.kubernetes.secrets.enabled=true" }) + @AutoConfigureWebTestClient @Nested class AlwaysWithSanitizingFunction extends ConfigDataSanitize { diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml index fb1191ab1e..aa17798a4e 100644 --- a/spring-cloud-kubernetes-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-client-discovery/pom.xml @@ -28,6 +28,11 @@ spring-boot-actuator true + + org.springframework.boot + spring-boot-actuator-autoconfigure + true + org.springframework.boot spring-boot-autoconfigure diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/conditionals/ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/conditionals/ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer.java index 20c37c0c08..d3241b96d9 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/conditionals/ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/conditionals/ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer.java @@ -36,7 +36,7 @@ @Documented @Inherited @ConditionalOnClass(name = { "org.springframework.boot.health.contributor.ReactiveHealthIndicator", - "org.springframework.boot.actuate.health.HealthEndpoint" }) + "org.springframework.boot.health.actuate.endpoint.HealthEndpoint" }) @ConditionalOnDiscoveryHealthIndicatorEnabled public @interface ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer { diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml index 40c056d9ab..5fa611edcc 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml @@ -56,6 +56,11 @@ spring-boot-restclient test + + org.springframework.boot + spring-boot-resttestclient + test + diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/CompositeKubernetesIntegrationTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/CompositeKubernetesIntegrationTests.java index 7d58d1ba93..7b9ff0004f 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/CompositeKubernetesIntegrationTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/CompositeKubernetesIntegrationTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.environment.PropertySource; import org.springframework.cloud.config.server.environment.NativeEnvironmentRepository; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegration.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegration.java index 57cc5b92a7..9113170e10 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegration.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegration.java @@ -33,7 +33,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.web.server.test.client.TestRestTemplate; +import org.springframework.boot.resttestclient.TestRestTemplate; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.cloud.config.environment.Environment; import org.springframework.cloud.config.environment.PropertySource; import org.springframework.test.context.TestPropertySource; @@ -47,6 +48,7 @@ * @author Ryan Baxter */ @TestPropertySource(properties = "spring.cloud.kubernetes.secrets.enabled=true") +@AutoConfigureTestRestTemplate abstract class ConfigServerIntegration { private static final String SOURCE_NAME = "test-cm"; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml index 69c649ba83..f68b199be8 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml @@ -50,6 +50,11 @@ spring-cloud-kubernetes-test-support test + + org.springframework.boot + spring-boot-webtestclient + test + diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java index c9cfd49a89..1479e5b94c 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java @@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.client.discovery.KubernetesClientInformerReactiveDiscoveryClient; import org.springframework.cloud.kubernetes.client.discovery.VisibleKubernetesClientInformerDiscoveryClient; import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; @@ -59,6 +60,7 @@ "management.endpoint.health.group.liveness.include=livenessState", "management.health.readinessstate.enabled=true", "management.endpoint.health.group.readiness.include=readinessState" }) +@AutoConfigureWebTestClient class DiscoveryServerIntegrationAppsEndpointTests { private static final String NAMESPACE = "namespace"; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java index 7ac0ee2559..3ddab5ad9a 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java @@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.client.discovery.KubernetesClientInformerReactiveDiscoveryClient; import org.springframework.cloud.kubernetes.client.discovery.VisibleKubernetesClientInformerDiscoveryClient; import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; @@ -59,6 +60,7 @@ "management.endpoint.health.group.liveness.include=livenessState", "management.health.readinessstate.enabled=true", "management.endpoint.health.group.readiness.include=readinessState" }) +@AutoConfigureWebTestClient class DiscoveryServerIntegrationAppsNameEndpointTests { private static final String NAMESPACE = "namespace"; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java index 19033e9d7f..2ff4eaa4a9 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java @@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.client.discovery.KubernetesClientInformerReactiveDiscoveryClient; import org.springframework.cloud.kubernetes.client.discovery.VisibleKubernetesClientInformerDiscoveryClient; import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; @@ -59,6 +60,7 @@ "management.endpoint.health.group.liveness.include=livenessState", "management.health.readinessstate.enabled=true", "management.endpoint.health.group.readiness.include=readinessState" }) +@AutoConfigureWebTestClient class DiscoveryServerIntegrationInstanceEndpointTests { private static final String NAMESPACE = "namespace"; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTests.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTests.java index ff0d6458af..50496d3ce2 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTests.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTests.java @@ -22,9 +22,9 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.client.discovery.event.HeartbeatEvent; import org.springframework.cloud.kubernetes.client.discovery.KubernetesClientInformerReactiveDiscoveryClient; import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace; diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml index 65057481b6..86cfe38e2d 100644 --- a/spring-cloud-kubernetes-discovery/pom.xml +++ b/spring-cloud-kubernetes-discovery/pom.xml @@ -40,6 +40,11 @@ spring-boot-actuator true + + org.springframework.boot + spring-boot-actuator-autoconfigure + true + org.springframework.boot spring-boot-autoconfigure diff --git a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java index 9f4b1c04c2..1e601903b4 100644 --- a/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfigurationTests.java @@ -109,7 +109,7 @@ void worksWithoutActuator() { contextRunner .withPropertyValues("spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.discovery.discovery-server-url=http://k8sdiscoveryserver") - .withClassLoader(new FilteredClassLoader("org.springframework.boot.actuate")) + .withClassLoader(new FilteredClassLoader("org.springframework.boot.health.actuate")) .run(context -> { assertThat(context).hasSingleBean(KubernetesReactiveDiscoveryClient.class); assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class); diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml index 0fa7a6ea23..f358492d04 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml +++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml @@ -156,7 +156,11 @@ spring-cloud-kubernetes-test-support test - + + org.springframework.boot + spring-boot-webtestclient + test + diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8HealthIndicatorDisabledTest.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8HealthIndicatorDisabledTest.java index 22eaf6b910..11f093b140 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8HealthIndicatorDisabledTest.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8HealthIndicatorDisabledTest.java @@ -24,13 +24,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = { "management.health.kubernetes.enabled=false" }) @EnableKubernetesMockClient(crud = true, https = false) +@AutoConfigureWebTestClient class Fabric8HealthIndicatorDisabledTest { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8InsideHealthIndicatorTest.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8InsideHealthIndicatorTest.java index a641249877..ced4fc1297 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8InsideHealthIndicatorTest.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8InsideHealthIndicatorTest.java @@ -27,7 +27,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.commons.PodUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -44,6 +45,7 @@ @Import(Fabric8InsideHealthIndicatorTest.KubernetesActuatorTestConfiguration.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = { "management.endpoint.health.show-details=always" }) +@AutoConfigureWebTestClient class Fabric8InsideHealthIndicatorTest { @Autowired diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8InsideInfoContributorTest.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8InsideInfoContributorTest.java index 98cbdb4ce7..1d473552d6 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8InsideInfoContributorTest.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8InsideInfoContributorTest.java @@ -25,7 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -41,6 +42,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = { "spring.main.cloud-platform=KUBERNETES", "management.endpoints.web.exposure.include=info", "management.endpoint.info.show-details=always", "management.info.kubernetes.enabled=true" }) +@AutoConfigureWebTestClient class Fabric8InsideInfoContributorTest { @Autowired diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8NotInsideHealthIndicatorTest.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8NotInsideHealthIndicatorTest.java index 7ad9e749bc..1f271822f6 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8NotInsideHealthIndicatorTest.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8NotInsideHealthIndicatorTest.java @@ -25,13 +25,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApp.class, properties = { "spring.main.cloud-platform=KUBERNETES", "management.endpoint.health.show-details=always" }) @EnableKubernetesMockClient(crud = true, https = false) +@AutoConfigureWebTestClient class Fabric8NotInsideHealthIndicatorTest { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8NotInsideInfoContributorTest.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8NotInsideInfoContributorTest.java index 88acdd5ab1..c5ef8b34f9 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8NotInsideInfoContributorTest.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8NotInsideInfoContributorTest.java @@ -22,7 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -30,6 +31,7 @@ properties = { "spring.main.cloud-platform=KUBERNETES", "management.endpoints.web.exposure.include=info", "management.endpoint.info.show-details=always", "management.info.kubernetes.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) +@AutoConfigureWebTestClient class Fabric8NotInsideInfoContributorTest { private static KubernetesClient client; diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml index 8ef8a36d4c..3a0abbeafe 100644 --- a/spring-cloud-kubernetes-fabric8-config/pom.xml +++ b/spring-cloud-kubernetes-fabric8-config/pom.xml @@ -155,7 +155,11 @@ spring-cloud-kubernetes-test-support test - + + org.springframework.boot + spring-boot-webtestclient + test + diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/HealthIndicatorTest.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/HealthIndicatorTest.java index 0e364febdf..f818c5b727 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/HealthIndicatorTest.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/HealthIndicatorTest.java @@ -24,13 +24,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApplication.class, properties = { "spring.main.cloud-platform=KUBERNETES", "management.endpoint.health.show-details=always" }) @EnableKubernetesMockClient(crud = true, https = false) +@AutoConfigureWebTestClient class HealthIndicatorTest { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/DisabledHealthTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/DisabledHealthTests.java index 403c4b21e8..be27248d7b 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/DisabledHealthTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/DisabledHealthTests.java @@ -22,7 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.health.registry.ReactiveHealthContributorRegistry; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -34,6 +35,7 @@ properties = { "management.health.kubernetes.enabled=false", "management.endpoint.health.show-details=always", "management.endpoint.health.show-components=always", "management.endpoints.web.exposure.include=health", "spring.cloud.kubernetes.client.namespace=default" }) +@AutoConfigureWebTestClient class DisabledHealthTests { @Autowired diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/EnabledHealthTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/EnabledHealthTests.java index 807d8e86bf..207b1346e8 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/EnabledHealthTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/actuator/EnabledHealthTests.java @@ -22,7 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.health.registry.HealthContributorRegistry; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -34,6 +35,7 @@ properties = { "management.health.kubernetes.enabled=true", "management.endpoint.health.show-details=always", "management.endpoint.health.show-components=always", "management.endpoints.web.exposure.include=health", "spring.cloud.kubernetes.client.namespace=default", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient class EnabledHealthTests { @Autowired diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/BootstrapMultipleYamlDocumentsDevActiveTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/BootstrapMultipleYamlDocumentsDevActiveTests.java index af2a75b1d6..a6633a6598 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/BootstrapMultipleYamlDocumentsDevActiveTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/BootstrapMultipleYamlDocumentsDevActiveTests.java @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.reactive.server.WebTestClient; @@ -34,6 +35,7 @@ */ @TestPropertySource(properties = { "spring.cloud.bootstrap.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) +@AutoConfigureWebTestClient @ActiveProfiles("dev") class BootstrapMultipleYamlDocumentsDevActiveTests extends ArrayWithProfiles { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/BootstrapMultipleYamlDocumentsNoActiveProfileTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/BootstrapMultipleYamlDocumentsNoActiveProfileTests.java index e43c1e6730..7cd417388e 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/BootstrapMultipleYamlDocumentsNoActiveProfileTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/BootstrapMultipleYamlDocumentsNoActiveProfileTests.java @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.reactive.server.WebTestClient; @@ -33,6 +34,7 @@ */ @TestPropertySource(properties = { "spring.cloud.bootstrap.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) +@AutoConfigureWebTestClient class BootstrapMultipleYamlDocumentsNoActiveProfileTests extends ArrayWithProfiles { @Autowired diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/ConfigDataMultipleYamlDocumentsDevActiveTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/ConfigDataMultipleYamlDocumentsDevActiveTests.java index 874da1571f..9f72bac13f 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/ConfigDataMultipleYamlDocumentsDevActiveTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/ConfigDataMultipleYamlDocumentsDevActiveTests.java @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.reactive.server.WebTestClient; @@ -35,6 +36,7 @@ @TestPropertySource(properties = { "spring.config.import=kubernetes:" }) @EnableKubernetesMockClient(crud = true, https = false) @ActiveProfiles("dev") +@AutoConfigureWebTestClient class ConfigDataMultipleYamlDocumentsDevActiveTests extends ArrayWithProfiles { @Autowired diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/ConfigDataMultipleYamlDocumentsNoActiveProfileTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/ConfigDataMultipleYamlDocumentsNoActiveProfileTests.java index 0ecea5a19a..b51c652a1b 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/ConfigDataMultipleYamlDocumentsNoActiveProfileTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/array_with_profiles/ConfigDataMultipleYamlDocumentsNoActiveProfileTests.java @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.reactive.server.WebTestClient; @@ -33,6 +34,7 @@ */ @TestPropertySource(properties = { "spring.config.import=kubernetes:" }) @EnableKubernetesMockClient(crud = true, https = false) +@AutoConfigureWebTestClient class ConfigDataMultipleYamlDocumentsNoActiveProfileTests extends ArrayWithProfiles { @Autowired diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_source/ConfigMapSource.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_source/ConfigMapSource.java index 9943e1a421..df5353fec4 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_source/ConfigMapSource.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_source/ConfigMapSource.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; import org.springframework.test.web.reactive.server.WebTestClient; @@ -37,6 +38,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApplication.class, properties = { "spring.application.name=configmap-example", "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient abstract class ConfigMapSource { private static final String APPLICATION_NAME = "configmap-example"; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_active_profile_no_profile/ConfigMapsWithProfilesNoActiveProfile.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_active_profile_no_profile/ConfigMapsWithProfilesNoActiveProfile.java index 32881020b8..8ee5efad52 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_active_profile_no_profile/ConfigMapsWithProfilesNoActiveProfile.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_active_profile_no_profile/ConfigMapsWithProfilesNoActiveProfile.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.commons.config.Constants; import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; import org.springframework.test.web.reactive.server.WebTestClient; @@ -37,6 +38,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApplication.class, properties = { "spring.application.name=configmap-with-profile-no-active-profiles-example", "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient abstract class ConfigMapsWithProfilesNoActiveProfile { private static final String APPLICATION_NAME = "configmap-with-profile-no-active-profiles-example"; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_profile_expression/ConfigMapsWithProfileExpression.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_profile_expression/ConfigMapsWithProfileExpression.java index 406cd991c7..0529104430 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_profile_expression/ConfigMapsWithProfileExpression.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_profile_expression/ConfigMapsWithProfileExpression.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.commons.config.Constants; import org.springframework.cloud.kubernetes.fabric8.config.ConfigMapTestUtil; import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; @@ -37,6 +38,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApplication.class, properties = { "spring.application.name=configmap-with-profile-example", "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient @ActiveProfiles({ "production", "us-east" }) abstract class ConfigMapsWithProfileExpression { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_profiles/ConfigMapsWithProfiles.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_profiles/ConfigMapsWithProfiles.java index 6ae18f90b3..dc75b9faf1 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_profiles/ConfigMapsWithProfiles.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_map_with_profiles/ConfigMapsWithProfiles.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.commons.config.Constants; import org.springframework.cloud.kubernetes.fabric8.config.ConfigMapTestUtil; import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; @@ -38,6 +39,7 @@ properties = { "spring.application.name=configmap-with-profile-example", "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) @ActiveProfiles("development") +@AutoConfigureWebTestClient abstract class ConfigMapsWithProfiles { private static final String APPLICATION_NAME = "configmap-with-profile-example"; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_mixed/ConfigMapsMixed.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_mixed/ConfigMapsMixed.java index 6541828a6f..ec2720a704 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_mixed/ConfigMapsMixed.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_mixed/ConfigMapsMixed.java @@ -26,12 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; import org.springframework.test.web.reactive.server.WebTestClient; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApplication.class, properties = { "spring.application.name=" + ConfigMapsMixed.APPLICATION_NAME, "spring.cloud.kubernetes.config.enabled=true", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient abstract class ConfigMapsMixed { protected static final String APPLICATION_NAME = "configmap-mixed-example"; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_with_active_profiles/ConfigMapsWithActiveProfilesName.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_with_active_profiles/ConfigMapsWithActiveProfilesName.java index bc7775f403..a5efc7005b 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_with_active_profiles/ConfigMapsWithActiveProfilesName.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_with_active_profiles/ConfigMapsWithActiveProfilesName.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.commons.config.Constants; import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; import org.springframework.test.context.ActiveProfiles; @@ -40,6 +41,7 @@ properties = { "spring.application.name=configmap-with-active-profile-name-example", "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) @ActiveProfiles("development") +@AutoConfigureWebTestClient abstract class ConfigMapsWithActiveProfilesName { private static final String APPLICATION_NAME = "configmap-with-active-profile-name-example"; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_without_profiles/ConfigMapsWithoutProfiles.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_without_profiles/ConfigMapsWithoutProfiles.java index 46362d107c..05e418e174 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_without_profiles/ConfigMapsWithoutProfiles.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_without_profiles/ConfigMapsWithoutProfiles.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.commons.config.Constants; import org.springframework.cloud.kubernetes.fabric8.config.ConfigMapTestUtil; import org.springframework.cloud.kubernetes.fabric8.config.TestApplication; @@ -34,6 +35,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApplication.class, properties = { "spring.application.name=configmap-without-profile-example", "spring.cloud.kubernetes.reload.enabled=false", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient @ActiveProfiles("development") abstract class ConfigMapsWithoutProfiles { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_config_map_with_prefix/LabeledConfigMapWithPrefix.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_config_map_with_prefix/LabeledConfigMapWithPrefix.java index 7fae212354..634a55a630 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_config_map_with_prefix/LabeledConfigMapWithPrefix.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_config_map_with_prefix/LabeledConfigMapWithPrefix.java @@ -27,14 +27,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** * @author wind57 */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = LabeledConfigMapWithPrefixApp.class, properties = { - "spring.application.name=labeled-configmap-with-prefix", "spring.main.cloud-platform=KUBERNETES" }) + classes = LabeledConfigMapWithPrefixApp.class, + properties = { "spring.application.name=labeled-configmap-with-prefix", + "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient abstract class LabeledConfigMapWithPrefix { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_secret_with_prefix/LabeledSecretWithPrefix.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_secret_with_prefix/LabeledSecretWithPrefix.java index 0e2b6fe627..f0f1c98bfc 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_secret_with_prefix/LabeledSecretWithPrefix.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/labeled_secret_with_prefix/LabeledSecretWithPrefix.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -37,6 +38,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = LabeledSecretWithPrefixApp.class, properties = { "spring.main.cloud-platform=KUBERNETES", "spring.application.name=labeled-secret-with-prefix", "spring.cloud.kubernetes.secrets.enabled=true", "spring.cloud.kubernetes.secrets.enabled=true" }) +@AutoConfigureWebTestClient abstract class LabeledSecretWithPrefix { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/multiple_configmaps_sources/MultipleConfigMapsSources.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/multiple_configmaps_sources/MultipleConfigMapsSources.java index b9e97da24a..a9b5db1274 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/multiple_configmaps_sources/MultipleConfigMapsSources.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/multiple_configmaps_sources/MultipleConfigMapsSources.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.fabric8.config.example2.ExampleApp; import org.springframework.test.web.reactive.server.WebTestClient; @@ -34,6 +35,7 @@ */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = ExampleApp.class, properties = { "spring.cloud.bootstrap.name=multiplecms", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient abstract class MultipleConfigMapsSources { @Autowired diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/multiple_secrets/MultipleSecrets.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/multiple_secrets/MultipleSecrets.java index fec4d27aea..6292fbaeaf 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/multiple_secrets/MultipleSecrets.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/multiple_secrets/MultipleSecrets.java @@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.cloud.kubernetes.fabric8.config.example3.MultiSecretsApp; import org.springframework.test.web.reactive.server.WebTestClient; @@ -36,6 +37,7 @@ */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = MultiSecretsApp.class, properties = { "spring.cloud.bootstrap.name=multiple-secrets", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient abstract class MultipleSecrets { private static final String DEFAULT_NAMESPACE = "ns1"; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_config_map_with_prefix/NamedConfigMapWithPrefix.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_config_map_with_prefix/NamedConfigMapWithPrefix.java index 07604a16a5..31bcb44b5e 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_config_map_with_prefix/NamedConfigMapWithPrefix.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_config_map_with_prefix/NamedConfigMapWithPrefix.java @@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -35,6 +36,7 @@ */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NamedConfigMapWithPrefixApp.class, properties = { "spring.main.cloud-platform=KUBERNETES", "spring.application.name=config-map-name-as-prefix" }) +@AutoConfigureWebTestClient abstract class NamedConfigMapWithPrefix { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_config_map_with_profile/NamedConfigMapWithProfile.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_config_map_with_profile/NamedConfigMapWithProfile.java index ddd71c7f2f..f7f0a833ca 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_config_map_with_profile/NamedConfigMapWithProfile.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_config_map_with_profile/NamedConfigMapWithProfile.java @@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.reactive.server.WebTestClient; @@ -35,8 +36,10 @@ */ @ActiveProfiles("k8s") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = NamedConfigMapWithProfileApp.class, properties = { "spring.main.cloud-platform=KUBERNETES", + classes = NamedConfigMapWithProfileApp.class, + properties = { "spring.main.cloud-platform=KUBERNETES", "spring.application.name=named-configmap-with-profile" }) +@AutoConfigureWebTestClient abstract class NamedConfigMapWithProfile { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_secret_with_prefix/NamedSecretWithPrefix.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_secret_with_prefix/NamedSecretWithPrefix.java index ceb300510c..cebc3d4050 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_secret_with_prefix/NamedSecretWithPrefix.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_secret_with_prefix/NamedSecretWithPrefix.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -37,6 +38,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NamedSecretWithPrefixApp.class, properties = { "spring.main.cloud-platform=KUBERNETES", "spring.application.name=named-secret-with-prefix", "spring.cloud.kubernetes.secrets.enabled=true", "spring.cloud.kubernetes.secrets.enabled=true" }) +@AutoConfigureWebTestClient abstract class NamedSecretWithPrefix { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_secret_with_profile/NamedSecretWithProfile.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_secret_with_profile/NamedSecretWithProfile.java index 6d379ac6a6..253904498f 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_secret_with_profile/NamedSecretWithProfile.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/named_secret_with_profile/NamedSecretWithProfile.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.reactive.server.WebTestClient; @@ -39,6 +40,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = NamedSecretWithProfileApp.class, properties = { "spring.application.name=named-secret-with-profile", "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.secrets.enabled=true" }) +@AutoConfigureWebTestClient abstract class NamedSecretWithProfile { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retryable_sources_order/RetryableSourcesOrder.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retryable_sources_order/RetryableSourcesOrder.java index 9e34fc3d62..d89102c94e 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retryable_sources_order/RetryableSourcesOrder.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retryable_sources_order/RetryableSourcesOrder.java @@ -30,10 +30,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RetryableSourcesOrderApp.class, properties = { "spring.application.name=sources-order", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient abstract class RetryableSourcesOrder { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/BootstrapFabric8SanitizeConfigpropsEndpointTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/BootstrapFabric8SanitizeConfigpropsEndpointTests.java index 2dfb9b4f0e..4e5013cc6e 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/BootstrapFabric8SanitizeConfigpropsEndpointTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/BootstrapFabric8SanitizeConfigpropsEndpointTests.java @@ -25,7 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.SanitizableData; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -39,6 +40,7 @@ class BootstrapFabric8SanitizeConfigpropsEndpointTests { "management.endpoints.web.exposure.include=*", "spring.cloud.bootstrap.name=sanitize", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class DefaultSettingsTest extends Fabric8SecretsSanitize { @@ -105,6 +107,7 @@ void test() { "management.endpoint.configprops.show-values=NEVER", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class ExplicitNever extends Fabric8SecretsSanitize { @@ -184,6 +187,7 @@ void test() { "management.endpoint.configprops.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=false", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class AlwaysWithoutSanitizingFunction extends Fabric8SecretsSanitize { @@ -263,6 +267,7 @@ void test() { "management.endpoint.configprops.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=true", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class AlwaysWithSanitizingFunction extends Fabric8SecretsSanitize { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/BootstrapFabric8SanitizeEnvEndpointTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/BootstrapFabric8SanitizeEnvEndpointTests.java index 836ab5cc7e..ff208533a0 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/BootstrapFabric8SanitizeEnvEndpointTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/BootstrapFabric8SanitizeEnvEndpointTests.java @@ -25,7 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.SanitizableData; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -39,6 +40,7 @@ class BootstrapFabric8SanitizeEnvEndpointTests { "management.endpoints.web.exposure.include=*", "spring.cloud.bootstrap.name=sanitize", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class DefaultSettingsTest extends Fabric8SecretsSanitize { @@ -108,6 +110,7 @@ void test() { "management.endpoints.web.exposure.include=*", "spring.cloud.bootstrap.name=sanitize", "management.endpoint.env.show-values=NEVER", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class ExplicitNever extends Fabric8SecretsSanitize { @@ -187,6 +190,7 @@ void test() { "management.endpoint.env.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=false", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class AlwaysWithoutSanitizingFunction extends Fabric8SecretsSanitize { @@ -266,6 +270,7 @@ void test() { "management.endpoint.env.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=true", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class AlwaysWithSanitizingFunction extends Fabric8SecretsSanitize { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/ConfigDataFabric8ConfigpropsEndpointTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/ConfigDataFabric8ConfigpropsEndpointTests.java index e3bb9ddc08..7a7ef20f53 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/ConfigDataFabric8ConfigpropsEndpointTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/ConfigDataFabric8ConfigpropsEndpointTests.java @@ -25,7 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.SanitizableData; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -39,6 +40,7 @@ class ConfigDataFabric8ConfigpropsEndpointTests { "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class DefaultSettingsTest extends Fabric8SecretsSanitize { @@ -105,6 +107,7 @@ void test() { "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class ExplicitNever extends Fabric8SecretsSanitize { @@ -185,6 +188,7 @@ void test() { "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class AlwaysWithoutSanitizingFunction extends Fabric8SecretsSanitize { @@ -265,6 +269,7 @@ void test() { "spring.config.import=kubernetes:,classpath:./sanitize-two.yaml", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class AlwaysWithSanitizingFunction extends Fabric8SecretsSanitize { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/ConfigDataFabric8SanitizeEnvEndpointTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/ConfigDataFabric8SanitizeEnvEndpointTests.java index 51c564b005..92d9a5dabf 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/ConfigDataFabric8SanitizeEnvEndpointTests.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sanitize_secrets/ConfigDataFabric8SanitizeEnvEndpointTests.java @@ -25,7 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.SanitizableData; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -39,6 +40,7 @@ class ConfigDataFabric8SanitizeEnvEndpointTests { "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "management.endpoints.web.exposure.include=*", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class DefaultSettingsTest extends Fabric8SecretsSanitize { @@ -108,6 +110,7 @@ void test() { "spring.config.import=kubernetes:,classpath:./sanitize.yaml", "management.endpoint.env.show-values=NEVER", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class ExplicitNever extends Fabric8SecretsSanitize { @@ -187,6 +190,7 @@ void test() { "management.endpoint.env.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=false", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class AlwaysWithoutSanitizingFunction extends Fabric8SecretsSanitize { @@ -266,6 +270,7 @@ void test() { "management.endpoint.env.show-values=ALWAYS", "spring.cloud.kubernetes.sanitize.secrets=true", "spring.cloud.kubernetes.secrets.enabled=true" }) @EnableKubernetesMockClient(crud = true, https = false) + @AutoConfigureWebTestClient @Nested class AlwaysWithSanitizingFunction extends Fabric8SecretsSanitize { diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabels.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabels.java index 2824bc40c5..3b509f3713 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabels.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/secrets_with_labels/SecretsWithLabels.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -37,6 +38,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = SecretsWithLabelsApp.class, properties = { "spring.application.name=secret-with-labels-config", "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.secrets.enabled=true" }) +@AutoConfigureWebTestClient abstract class SecretsWithLabels { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/single_source_multiple_files/SingleSourceMultipleFiles.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/single_source_multiple_files/SingleSourceMultipleFiles.java index 5c4af9c73c..a350a33d0a 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/single_source_multiple_files/SingleSourceMultipleFiles.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/single_source_multiple_files/SingleSourceMultipleFiles.java @@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.reactive.server.WebTestClient; @@ -38,6 +39,7 @@ @ActiveProfiles("color") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = SingleSourceMultipleFilesApp.class, properties = { "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient abstract class SingleSourceMultipleFiles { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sources_order/SourcesOrder.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sources_order/SourcesOrder.java index 2f56607806..cb23e0be66 100644 --- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sources_order/SourcesOrder.java +++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/sources_order/SourcesOrder.java @@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; /** @@ -37,6 +38,7 @@ */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = SourcesOrderApp.class, properties = { "spring.application.name=sources-order", "spring.main.cloud-platform=KUBERNETES" }) +@AutoConfigureWebTestClient abstract class SourcesOrder { private static KubernetesClient mockClient; diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml index b0b8ef8310..85e658bcad 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml +++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml @@ -29,6 +29,11 @@ spring-boot-actuator true + + org.springframework.boot + spring-boot-actuator-autoconfigure + true + org.springframework.boot spring-boot-starter-webflux diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml index ff1865d946..167d877bdb 100644 --- a/spring-cloud-kubernetes-fabric8-leader/pom.xml +++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml @@ -67,5 +67,10 @@ spring-cloud-kubernetes-test-support test + + org.springframework.boot + spring-boot-webtestclient + test + diff --git a/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderAutoConfigurationTests.java b/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderAutoConfigurationTests.java index 5b373801d4..49632688e5 100644 --- a/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderAutoConfigurationTests.java +++ b/spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderAutoConfigurationTests.java @@ -22,7 +22,8 @@ import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.boot.webtestclient.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -32,6 +33,7 @@ properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.leader.autoStartup=false", "management.endpoints.web.exposure.include=info", "management.endpoint.info.show-details=always", "management.info.kubernetes.enabled=true" }) +@AutoConfigureWebTestClient class Fabric8LeaderAutoConfigurationTests { @LocalManagementPort diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchEndpointSlicesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchEndpointSlicesIT.java index 723ff13ed4..206fb0790e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchEndpointSlicesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchEndpointSlicesIT.java @@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.web.server.test.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.integration.tests.commons.Images; import org.springframework.cloud.kubernetes.integration.tests.commons.Phase; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchEndpointsIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchEndpointsIT.java index 4ac8d059eb..a8db705736 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchEndpointsIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchEndpointsIT.java @@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.web.server.test.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.integration.tests.commons.Images; import org.springframework.cloud.kubernetes.integration.tests.commons.Phase; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBlockingIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBlockingIT.java index ace277e570..50c21a5e8f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBlockingIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryBlockingIT.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.kubernetes.integration.tests.commons.Images; import org.springframework.cloud.kubernetes.integration.tests.commons.Phase; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryReactiveIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryReactiveIT.java index 80818dfa22..2ec9b14442 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryReactiveIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryReactiveIT.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient; import org.springframework.cloud.kubernetes.integration.tests.commons.Images; import org.springframework.cloud.kubernetes.integration.tests.commons.Phase; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchEndpointSlicesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchEndpointSlicesIT.java index 94e118f6a8..a173fa4bb4 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchEndpointSlicesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchEndpointSlicesIT.java @@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.web.server.test.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.integration.tests.commons.Images; import org.springframework.cloud.kubernetes.integration.tests.commons.Phase; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchEndpointsIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchEndpointsIT.java index 552d8204cc..f78f8e76e2 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchEndpointsIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchEndpointsIT.java @@ -26,7 +26,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.web.server.test.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.integration.tests.commons.Images; import org.springframework.cloud.kubernetes.integration.tests.commons.Phase; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientBlockingIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientBlockingIT.java index 8f68f1c7b0..d44de0507d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientBlockingIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientBlockingIT.java @@ -27,7 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.integration.tests.commons.Images; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientReactiveIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientReactiveIT.java index e05eb79f55..c59a51bc53 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientReactiveIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientReactiveIT.java @@ -27,7 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.web.server.test.LocalManagementPort; +import org.springframework.boot.test.web.server.LocalManagementPort; import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.integration.tests.commons.Images; diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml index 8aa07d9dad..45df2af3c2 100644 --- a/spring-cloud-kubernetes-test-support/pom.xml +++ b/spring-cloud-kubernetes-test-support/pom.xml @@ -46,7 +46,7 @@ org.testcontainers - k3s + testcontainers-k3s