Skip to content

Commit

Permalink
Merge branch '3.1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryanjbaxter
ryanjbaxter committed Sep 6, 2024
2 parents 4ff8adf + 3149205 commit b4ffce1
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion ...rAutoConfigurationKubernetesDisabled.java → ...ConfigurationKubernetesDisabledTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = { "spring.profiles.include=kubernetes,kubernetesdisabled" },
classes = { KubernetesConfigServerApplication.class, MockConfig.class })
class ConfigServerAutoConfigurationKubernetesDisabled {
class ConfigServerAutoConfigurationKubernetesDisabledTests {

@Autowired
private ConfigurableApplicationContext context;
Expand Down
2 changes: 1 addition & 1 deletion ...bledProfileIncludedConfigApiDisabled.java → ...rofileIncludedConfigApiDisabledTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
classes = { KubernetesConfigServerApplication.class },
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.profiles.include=kubernetes",
"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.enableApi=false" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabled {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests {

@Autowired
private ConfigurableApplicationContext context;
Expand Down
2 changes: 1 addition & 1 deletion ...bledProfileIncludedConfigMapDisabled.java → ...rofileIncludedConfigMapDisabledTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { KubernetesConfigServerApplication.class }, properties = { "spring.main.cloud-platform=KUBERNETES",
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.config.enabled=false" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabled {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabledTests {

@Autowired
private ConfigurableApplicationContext context;
Expand Down
2 changes: 1 addition & 1 deletion ...ledProfileIncludedSecretsApiDisabled.java → ...ofileIncludedSecretsApiDisabledTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { KubernetesConfigServerApplication.class }, properties = { "spring.main.cloud-platform=KUBERNETES",
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.client.namespace=default" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabled {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabledTests {

@Autowired
private ConfigurableApplicationContext context;
Expand Down
2 changes: 1 addition & 1 deletion ...bledProfileIncludedSecretsApiEnabled.java → ...rofileIncludedSecretsApiEnabledTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
classes = { KubernetesConfigServerApplication.class },
properties = { "spring.profiles.include=kubernetes", "spring.main.cloud-platform=KUBERNETES",
"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.enableApi=true" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabled {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests {

@Autowired
private ConfigurableApplicationContext context;
Expand Down
2 changes: 1 addition & 1 deletion ...tionKubernetesEnabledProfileIncluded.java → ...ubernetesEnabledProfileIncludedTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { KubernetesConfigServerApplication.class }, properties = { "spring.main.cloud-platform=KUBERNETES",
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.client.namespace=default" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncluded {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedTests {

@Autowired
private ConfigurableApplicationContext context;
Expand Down
2 changes: 1 addition & 1 deletion ...onfigurationKubernetesProfileMissing.java → ...urationKubernetesProfileMissingTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { KubernetesConfigServerApplication.class, MockConfig.class },
properties = { "spring.profiles.include=kubernetes,kubernetesdisabled" })
class ConfigServerAutoConfigurationKubernetesProfileMissing {
class ConfigServerAutoConfigurationKubernetesProfileMissingTests {

@Autowired
private ConfigurableApplicationContext context;
Expand Down
2 changes: 1 addition & 1 deletion ...BootstrapConfigServerIntegrationTest.java → ...ootstrapConfigServerIntegrationTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true",
"spring.cloud.bootstrap.enabled=true" },
classes = { KubernetesConfigServerApplication.class })
class BootstrapConfigServerIntegrationTest extends ConfigServerIntegrationTest {
class BootstrapConfigServerIntegrationTests extends ConfigServerIntegration {

}
2 changes: 1 addition & 1 deletion ...onfigDataConfigServerIntegrationTest.java → ...nfigDataConfigServerIntegrationTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true" },
classes = { KubernetesConfigServerApplication.class, TestBootstrapConfig.class })
class ConfigDataConfigServerIntegrationTest extends ConfigServerIntegrationTest {
class ConfigDataConfigServerIntegrationTests extends ConfigServerIntegration {

private MockedStatic<KubernetesClientUtils> clientUtilsMock;

Expand Down
2 changes: 1 addition & 1 deletion ...erver/it/ConfigServerIntegrationTest.java → ...figserver/it/ConfigServerIntegration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
/**
* @author Ryan Baxter
*/
abstract class ConfigServerIntegrationTest {
abstract class ConfigServerIntegration {

@Autowired
private TestRestTemplate testRestTemplate;
Expand Down
4 changes: 2 additions & 2 deletions ...eryServerIntegrationAppsEndpointTest.java → ...ryServerIntegrationAppsEndpointTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
* @author wind57
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = DiscoveryServerIntegrationAppsEndpointTest.TestConfig.class,
classes = DiscoveryServerIntegrationAppsEndpointTests.TestConfig.class,
properties = { "management.health.livenessstate.enabled=true",
/* disable kubernetes from liveness and readiness */
"management.endpoint.health.group.liveness.include=livenessState",
"management.health.readinessstate.enabled=true",
"management.endpoint.health.group.readiness.include=readinessState" })
class DiscoveryServerIntegrationAppsEndpointTest {
class DiscoveryServerIntegrationAppsEndpointTests {

private static final String NAMESPACE = "namespace";

Expand Down
4 changes: 2 additions & 2 deletions ...erverIntegrationAppsNameEndpointTest.java → ...rverIntegrationAppsNameEndpointTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
* @author wind57
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = DiscoveryServerIntegrationAppsNameEndpointTest.TestConfig.class,
classes = DiscoveryServerIntegrationAppsNameEndpointTests.TestConfig.class,
properties = { "management.health.livenessstate.enabled=true",
/* disable kubernetes from liveness and readiness */
"management.endpoint.health.group.liveness.include=livenessState",
"management.health.readinessstate.enabled=true",
"management.endpoint.health.group.readiness.include=readinessState" })
class DiscoveryServerIntegrationAppsNameEndpointTest {
class DiscoveryServerIntegrationAppsNameEndpointTests {

private static final String NAMESPACE = "namespace";

Expand Down
4 changes: 2 additions & 2 deletions ...erverIntegrationInstanceEndpointTest.java → ...rverIntegrationInstanceEndpointTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
* @author wind57
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = DiscoveryServerIntegrationInstanceEndpointTest.TestConfig.class,
classes = DiscoveryServerIntegrationInstanceEndpointTests.TestConfig.class,
properties = { "management.health.livenessstate.enabled=true",
/* disable kubernetes from liveness and readiness */
"management.endpoint.health.group.liveness.include=livenessState",
"management.health.readinessstate.enabled=true",
"management.endpoint.health.group.readiness.include=readinessState" })
class DiscoveryServerIntegrationInstanceEndpointTest {
class DiscoveryServerIntegrationInstanceEndpointTests {

private static final String NAMESPACE = "namespace";

Expand Down
4 changes: 2 additions & 2 deletions ...rnetes/discoveryserver/HeartbeatTest.java → ...netes/discoveryserver/HeartbeatTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
/**
* @author wind57
*/
@SpringBootTest(classes = HeartbeatTest.TestConfig.class,
@SpringBootTest(classes = HeartbeatTests.TestConfig.class,
properties = { "spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true",
/* disable kubernetes from liveness and readiness */
"management.health.livenessstate.enabled=true",
"management.endpoint.health.group.liveness.include=livenessState",
"management.health.readinessstate.enabled=true",
"management.endpoint.health.group.readiness.include=readinessState" })
@AutoConfigureWebTestClient
class HeartbeatTest {
class HeartbeatTests {

@Autowired
private WebTestClient client;
Expand Down

0 comments on commit b4ffce1

Please sign in to comment.