Merge branch '2.6.x' into 2.7.x

Closes gh-29584
spring-projects · Jan 27, 2022 · 81bbd29 · 81bbd29
2 parents c1ca40b + 0597c68
commit 81bbd29
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 13 deletions.
diff --git a/...org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfiguration.java b/...org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfiguration.java
@@ -54,7 +54,7 @@ public CachesEndpoint cachesEndpoint(Map<String, CacheManager> cacheManagers) {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnBean(CachesEndpoint.class)
-	@ConditionalOnAvailableEndpoint(exposure = EndpointExposure.WEB)
+	@ConditionalOnAvailableEndpoint(exposure = { EndpointExposure.WEB, EndpointExposure.CLOUD_FOUNDRY })
 	public CachesEndpointWebExtension cachesEndpointWebExtension(CachesEndpoint cachesEndpoint) {
 		return new CachesEndpointWebExtension(cachesEndpoint);
 	}

diff --git a/...oconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfiguration.java b/...oconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfiguration.java
@@ -63,7 +63,7 @@ public ConfigurationPropertiesReportEndpoint configurationPropertiesReportEndpoi
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnBean(ConfigurationPropertiesReportEndpoint.class)
-	@ConditionalOnAvailableEndpoint(exposure = EndpointExposure.WEB)
+	@ConditionalOnAvailableEndpoint(exposure = { EndpointExposure.WEB, EndpointExposure.CLOUD_FOUNDRY })
 	public ConfigurationPropertiesReportEndpointWebExtension configurationPropertiesReportEndpointWebExtension(
 			ConfigurationPropertiesReportEndpoint configurationPropertiesReportEndpoint) {
 		return new ConfigurationPropertiesReportEndpointWebExtension(configurationPropertiesReportEndpoint);

diff --git a/...framework/boot/actuate/autoconfigure/endpoint/condition/OnAvailableEndpointCondition.java b/...framework/boot/actuate/autoconfigure/endpoint/condition/OnAvailableEndpointCondition.java
@@ -113,9 +113,6 @@ private ConditionOutcome getMatchOutcome(Environment environment,
 		if (!enablementOutcome.isMatch()) {
 			return enablementOutcome;
 		}
-		if (CloudPlatform.CLOUD_FOUNDRY.isActive(environment)) {
-			return ConditionOutcome.match(message.because("application is running on Cloud Foundry"));
-		}
 		Set<EndpointExposure> exposuresToCheck = getExposuresToCheck(conditionAnnotation);
 		Set<ExposureFilter> exposureFilters = getExposureFilters(environment);
 		for (ExposureFilter exposureFilter : exposureFilters) {
@@ -168,6 +165,9 @@ private Set<ExposureFilter> getExposureFilters(Environment environment) {
 			if (environment.getProperty(JMX_ENABLED_KEY, Boolean.class, false)) {
 				exposureFilters.add(new ExposureFilter(environment, EndpointExposure.JMX));
 			}
+			if (CloudPlatform.CLOUD_FOUNDRY.isActive(environment)) {
+				exposureFilters.add(new ExposureFilter(environment, EndpointExposure.CLOUD_FOUNDRY));
+			}
 			exposureFilters.add(new ExposureFilter(environment, EndpointExposure.WEB));
 			exposureFiltersCache.put(environment, exposureFilters);
 		}
@@ -181,9 +181,16 @@ static final class ExposureFilter extends IncludeExcludeEndpointFilter<Exposable
 		@SuppressWarnings({ "unchecked", "rawtypes" })
 		private ExposureFilter(Environment environment, EndpointExposure exposure) {
 			super((Class) ExposableEndpoint.class, environment,
-					"management.endpoints." + exposure.name().toLowerCase() + ".exposure",
-					exposure.getDefaultIncludes());
+					"management.endpoints." + getCanonicalName(exposure) + ".exposure", exposure.getDefaultIncludes());
 			this.exposure = exposure;
+
+		}
+
+		private static String getCanonicalName(EndpointExposure exposure) {
+			if (EndpointExposure.CLOUD_FOUNDRY.equals(exposure)) {
+				return "cloud-foundry";
+			}
+			return exposure.name().toLowerCase();
 		}
 
 		EndpointExposure getExposure() {

diff --git a/...java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java b/...java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java
@@ -32,7 +32,13 @@ public enum EndpointExposure {
 	/**
 	 * Exposed via a web endpoint.
 	 */
-	WEB("health");
+	WEB("health"),
+
+	/**
+	 * Exposed on Cloud Foundry via `/cloudfoundryapplication`.
+	 * @since 2.6.4
+	 */
+	CLOUD_FOUNDRY("*");
 
 	private final String[] defaultIncludes;
 

diff --git a/.../springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfiguration.java b/.../springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfiguration.java
@@ -61,7 +61,7 @@ public EnvironmentEndpoint environmentEndpoint(Environment environment, Environm
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnBean(EnvironmentEndpoint.class)
-	@ConditionalOnAvailableEndpoint(exposure = EndpointExposure.WEB)
+	@ConditionalOnAvailableEndpoint(exposure = { EndpointExposure.WEB, EndpointExposure.CLOUD_FOUNDRY })
 	public EnvironmentEndpointWebExtension environmentEndpointWebExtension(EnvironmentEndpoint environmentEndpoint) {
 		return new EnvironmentEndpointWebExtension(environmentEndpoint);
 	}

diff --git a/...rk/boot/actuate/autoconfigure/health/HealthEndpointReactiveWebExtensionConfiguration.java b/...rk/boot/actuate/autoconfigure/health/HealthEndpointReactiveWebExtensionConfiguration.java
@@ -45,7 +45,8 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication(type = Type.REACTIVE)
-@ConditionalOnAvailableEndpoint(endpoint = HealthEndpoint.class, exposure = EndpointExposure.WEB)
+@ConditionalOnAvailableEndpoint(endpoint = HealthEndpoint.class,
+		exposure = { EndpointExposure.WEB, EndpointExposure.CLOUD_FOUNDRY })
 class HealthEndpointReactiveWebExtensionConfiguration {
 
 	@Bean
@@ -57,6 +58,7 @@ ReactiveHealthEndpointWebExtension reactiveHealthEndpointWebExtension(
 	}
 
 	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnAvailableEndpoint(endpoint = HealthEndpoint.class, exposure = EndpointExposure.WEB)
 	static class WebFluxAdditionalHealthEndpointPathsConfiguration {
 
 		@Bean

diff --git a/...gframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java b/...gframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java
@@ -65,7 +65,8 @@
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @ConditionalOnBean(HealthEndpoint.class)
-@ConditionalOnAvailableEndpoint(endpoint = HealthEndpoint.class, exposure = EndpointExposure.WEB)
+@ConditionalOnAvailableEndpoint(endpoint = HealthEndpoint.class,
+		exposure = { EndpointExposure.WEB, EndpointExposure.CLOUD_FOUNDRY })
 class HealthEndpointWebExtensionConfiguration {
 
 	@Bean
@@ -82,6 +83,7 @@ private static ExposableWebEndpoint getHealthEndpoint(WebEndpointsSupplier webEn
 	}
 
 	@ConditionalOnBean(DispatcherServlet.class)
+	@ConditionalOnAvailableEndpoint(endpoint = HealthEndpoint.class, exposure = EndpointExposure.WEB)
 	static class MvcAdditionalHealthEndpointPathsConfiguration {
 
 		@Bean
@@ -97,6 +99,7 @@ AdditionalHealthEndpointPathsWebMvcHandlerMapping healthEndpointWebMvcHandlerMap
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(ResourceConfig.class)
 	@ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet")
+	@ConditionalOnAvailableEndpoint(endpoint = HealthEndpoint.class, exposure = EndpointExposure.WEB)
 	static class JerseyAdditionalHealthEndpointPathsConfiguration {
 
 		@Bean

diff --git a/...rg/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointAutoConfiguration.java b/...rg/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointAutoConfiguration.java
@@ -54,7 +54,7 @@ public QuartzEndpoint quartzEndpoint(Scheduler scheduler) {
 	@Bean
 	@ConditionalOnBean(QuartzEndpoint.class)
 	@ConditionalOnMissingBean
-	@ConditionalOnAvailableEndpoint(exposure = EndpointExposure.WEB)
+	@ConditionalOnAvailableEndpoint(exposure = { EndpointExposure.WEB, EndpointExposure.CLOUD_FOUNDRY })
 	public QuartzEndpointWebExtension quartzEndpointWebExtension(QuartzEndpoint endpoint) {
 		return new QuartzEndpointWebExtension(endpoint);
 	}

diff --git a/...rk/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnAvailableEndpointTests.java b/...rk/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnAvailableEndpointTests.java
@@ -327,7 +327,8 @@ DashedEndpoint dashedEndpoint() {
 	static class ExposureEndpointConfiguration {
 
 		@Bean
-		@ConditionalOnAvailableEndpoint(endpoint = TestEndpoint.class, exposure = EndpointExposure.WEB)
+		@ConditionalOnAvailableEndpoint(endpoint = TestEndpoint.class,
+				exposure = { EndpointExposure.WEB, EndpointExposure.CLOUD_FOUNDRY })
 		String unexposed() {
 			return "unexposed";
 		}

diff --git a/...e/autoconfigure/integrationtest/AbstractHealthEndpointAdditionalPathIntegrationTests.java b/...e/autoconfigure/integrationtest/AbstractHealthEndpointAdditionalPathIntegrationTests.java
@@ -91,6 +91,30 @@ void groupsAreNotConfiguredWhenHealthEndpointIsNotExposed() {
 						.exchange().expectStatus().isNotFound(), "local.server.port"));
 	}
 
+	@Test
+	void groupsAreNotConfiguredWhenHealthEndpointIsNotExposedAndCloudFoundryPlatform() {
+		this.runner.withPropertyValues("spring.jmx.enabled=true", "management.endpoints.web.exposure.exclude=health",
+				"spring.main.cloud-platform=cloud_foundry", "management.endpoint.health.group.live.include=diskSpace",
+				"management.endpoint.health.group.live.additional-path=server:healthz",
+				"management.endpoint.health.group.live.show-components=always")
+				.withInitializer(new ConditionEvaluationReportLoggingListener())
+				.run(withWebTestClient((client) -> client.get().uri("/healthz").accept(MediaType.APPLICATION_JSON)
+						.exchange().expectStatus().isNotFound(), "local.server.port"));
+	}
+
+	@Test
+	void groupsAreNotConfiguredWhenHealthEndpointIsNotExposedWithDifferentManagementPortAndCloudFoundryPlatform() {
+		this.runner
+				.withPropertyValues("spring.jmx.enabled=true", "management.endpoints.web.exposure.exclude=health",
+						"spring.main.cloud-platform=cloud_foundry", "management.server.port=0",
+						"management.endpoint.health.group.live.include=diskSpace",
+						"management.endpoint.health.group.live.additional-path=server:healthz",
+						"management.endpoint.health.group.live.show-components=always")
+				.withInitializer(new ConditionEvaluationReportLoggingListener())
+				.run(withWebTestClient((client) -> client.get().uri("/healthz").accept(MediaType.APPLICATION_JSON)
+						.exchange().expectStatus().isNotFound(), "local.server.port"));
+	}
+
 	private void testResponse(WebTestClient client) {
 		client.get().uri("/healthz").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk().expectBody()
 				.jsonPath("status").isEqualTo("UP").jsonPath("components.diskSpace").exists();