Merge branch '3.3.x'

Closes gh-41891
spring-projects · Aug 16, 2024 · f78ec43 · f78ec43
2 parents e3f4844 + d4762ec
commit f78ec43
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...va/org/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointAutoConfiguration.java b/...va/org/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointAutoConfiguration.java
@@ -55,7 +55,7 @@ SbomEndpoint sbomEndpoint(ResourceLoader resourceLoader) {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnBean(SbomEndpoint.class)
-	@ConditionalOnAvailableEndpoint(exposure = EndpointExposure.WEB)
+	@ConditionalOnAvailableEndpoint(exposure = { EndpointExposure.WEB, EndpointExposure.CLOUD_FOUNDRY })
 	SbomEndpointWebExtension sbomEndpointWebExtension(SbomEndpoint sbomEndpoint) {
 		return new SbomEndpointWebExtension(sbomEndpoint, this.properties);
 	}

diff --git a/...g/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointAutoConfigurationTests.java b/...g/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointAutoConfigurationTests.java
@@ -36,9 +36,19 @@ class SbomEndpointAutoConfigurationTests {
 		.withConfiguration(AutoConfigurations.of(SbomEndpointAutoConfiguration.class));
 
 	@Test
-	void runShouldHaveEndpointBean() {
+	void runWhenWebExposedShouldHaveEndpointBeanAndWebExtension() {
 		this.contextRunner.withPropertyValues("management.endpoints.web.exposure.include=sbom")
-			.run((context) -> assertThat(context).hasSingleBean(SbomEndpoint.class));
+			.run((context) -> assertThat(context).hasSingleBean(SbomEndpoint.class)
+				.hasSingleBean(SbomEndpointWebExtension.class));
+	}
+
+	@Test
+	void runWhenCloudFoundryExposedShouldHaveEndpointBeanAndWebExtension() {
+		this.contextRunner
+			.withPropertyValues("management.endpoints.cloud-foundry.exposure.include=sbom",
+					"spring.main.cloud-platform=cloud_foundry")
+			.run((context) -> assertThat(context).hasSingleBean(SbomEndpoint.class)
+				.hasSingleBean(SbomEndpointWebExtension.class));
 	}
 
 	@Test