Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

Browse Source 
Closes gh-41891
This commit is contained in:
Andy Wilkinson
2024-08-16 13:30:49 +01:00
parent e3f4844001 d4762eca22
commit f78ec43dd6
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointAutoConfiguration.java
View File

@@ -55,7 +55,7 @@ public class SbomEndpointAutoConfiguration {
@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);
}

14
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointAutoConfigurationTests.java
View File

@@ -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