root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.4.x' 

Closes gh-26125
This commit is contained in:
Phillip Webb 2021-04-14 17:43:12 -07:00
parent b4c9bb0d5c 5b836f3aee
commit 282a8e09d0
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java
View File

@ -29,6 +29,7 @@ import org.springframework.core.env.StandardEnvironment;
*
* @author Phillip Webb
* @author Brian Clozel
* @author Nguyen Sach
* @since 1.3.0
*/
public enum CloudPlatform {
@ -157,7 +158,8 @@ public enum CloudPlatform {
* @return if the platform is active.
*/
public boolean isActive(Environment environment) {
return isEnforced(environment) || isDetected(environment);
String platformProperty = environment.getProperty(PROPERTY_NAME);
return isEnforced(platformProperty) || (platformProperty == null && isDetected(environment));
}
/**

12
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/cloud/CloudPlatformTests.java
View File

@ -19,6 +19,7 @@ package org.springframework.boot.cloud;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
@ -36,6 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link CloudPlatform}.
*
* @author Phillip Webb
* @author Nguyen Sach
*/
class CloudPlatformTests {
@ -202,6 +204,16 @@ class CloudPlatformTests {
assertThat(CloudPlatform.KUBERNETES.isEnforced(binder)).isFalse();
}
void isActiveWhenNoCloudPlatformIsEnforcedAndHasKubernetesServiceHostAndKubernetesServicePort() {
Map<String, Object> envVars = new HashMap<>();
envVars.put("EXAMPLE_SERVICE_HOST", "---");
envVars.put("EXAMPLE_SERVICE_PORT", "8080");
Environment environment = getEnvironmentWithEnvVariables(envVars);
((MockEnvironment) environment).setProperty("spring.main.cloud-platform", "none");
assertThat(Stream.of(CloudPlatform.values()).filter((platform) -> platform.isActive(environment)))
.containsExactly(CloudPlatform.NONE);
}
private Environment getEnvironmentWithEnvVariables(Map<String, Object> environmentVariables) {
MockEnvironment environment = new MockEnvironment();
PropertySource<?> propertySource = new SystemEnvironmentPropertySource(