spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47482 from vpavic

Browse Source 
* pr/47482:
  Add AWS ECS to cloud platforms

Closes gh-47482
This commit is contained in:
Stéphane Nicoll
2025-10-15 08:19:44 +02:00
parent 41b522dbd2 c6397305bb
commit a043867ae1
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java
+14
View File
@@ -164,6 +164,20 @@ public enum CloudPlatform {
return this.azureEnvVariables.stream().allMatch(environment::containsProperty);
}
},
/**
* Amazon Web Services (AWS) Elastic Container Service (ECS) platform.
* @since 4.0.0
*/
AWS_ECS {
@Override
public boolean isDetected(Environment environment) {
String awsExecutionEnv = environment.getProperty("AWS_EXECUTION_ENV");
return (awsExecutionEnv != null) && awsExecutionEnv.startsWith("AWS_ECS");
}
};
private static final String PROPERTY_NAME = "spring.main.cloud-platform";
core/spring-boot/src/test/java/org/springframework/boot/cloud/CloudPlatformTests.java
+20
View File
@@ -22,6 +22,8 @@ import java.util.Map;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.MockConfigurationPropertySource;
@@ -205,6 +207,24 @@ class CloudPlatformTests {
assertThat(platform).isNull();
}
@ParameterizedTest
@ValueSource(strings = { "AWS_ECS_FARGATE", "AWS_ECS_EC2" })
void getActiveWhenHasAwsExecutionEnvEcsShouldReturnAwsEcs(String awsExecutionEnv) {
Map<String, Object> envVars = Map.of("AWS_EXECUTION_ENV", awsExecutionEnv);
Environment environment = getEnvironmentWithEnvVariables(envVars);
CloudPlatform platform = CloudPlatform.getActive(environment);
assertThat(platform).isNotNull().isEqualTo(CloudPlatform.AWS_ECS);
assertThat(platform.isActive(environment)).isTrue();
}
@Test
void getActiveWhenHasAwsExecutionEnvLambdaShouldNotReturnAwsEcs() {
Map<String, Object> envVars = Map.of("AWS_EXECUTION_ENV", "AWS_Lambda_java8");
Environment environment = getEnvironmentWithEnvVariables(envVars);
CloudPlatform platform = CloudPlatform.getActive(environment);
assertThat(platform).isNull();
}
@Test
void getActiveWhenHasEnforcedCloudPlatform() {
Environment environment = getEnvironmentWithEnvVariables(