Use more precise variables to detect Azure App Service

See gh-27819
spring-projects · Sep 6, 2021 · 69b2347 · 69b2347
1 parent b82da0a
commit 69b2347
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/...-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java b/...-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java
@@ -140,12 +140,17 @@ private boolean isAutoDetected(EnumerablePropertySource<?> environmentPropertySo
 
 		private static final String WEBSITE_SITE_NAME = "WEBSITE_SITE_NAME";
 
-		private static final String WEBSITES_ENABLE_APP_SERVICE_STORAGE = "WEBSITES_ENABLE_APP_SERVICE_STORAGE";
+		private static final String WEBSITE_INSTANCE_ID = "WEBSITE_INSTANCE_ID";
+
+		private static final String WEBSITE_RESOURCE_GROUP = "WEBSITE_RESOURCE_GROUP";
+
+		private static final String WEBSITE_SKU = "WEBSITE_SKU";
 
 		@Override
 		public boolean isDetected(Environment environment) {
-			return environment.containsProperty(WEBSITE_SITE_NAME)
-					&& environment.containsProperty(WEBSITES_ENABLE_APP_SERVICE_STORAGE);
+			return environment.containsProperty(WEBSITE_SITE_NAME) && environment.containsProperty(WEBSITE_INSTANCE_ID)
+					&& environment.containsProperty(WEBSITE_RESOURCE_GROUP)
+					&& environment.containsProperty(WEBSITE_SKU);
 		}
 
 	};

diff --git a/...-project/spring-boot/src/test/java/org/springframework/boot/cloud/CloudPlatformTests.java b/...-project/spring-boot/src/test/java/org/springframework/boot/cloud/CloudPlatformTests.java
@@ -136,7 +136,9 @@ void getActiveWhenHasServiceHostAndNoServicePortShouldNotReturnKubernetes() {
 	void getActiveWhenHasWebsiteSiteNameAndWebsitesEnableAppServiceStorageShouldReturnAzureAppService() {
 		Map<String, Object> envVars = new HashMap<>();
 		envVars.put("WEBSITE_SITE_NAME", "---");
-		envVars.put("WEBSITES_ENABLE_APP_SERVICE_STORAGE", "false");
+		envVars.put("WEBSITE_INSTANCE_ID", "1234");
+		envVars.put("WEBSITE_RESOURCE_GROUP", "test");
+		envVars.put("WEBSITE_SKU", "1234");
 		Environment environment = getEnvironmentWithEnvVariables(envVars);
 		CloudPlatform platform = CloudPlatform.getActive(environment);
 		assertThat(platform).isEqualTo(CloudPlatform.AZURE_APP_SERVICE);