Skip to content

Add detection of Azure App Service to CloudPlatform #25829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Add detection of Azure App Service to CloudPlatform #25829

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55f63b2
Add Azure platform support
jdubois Mar 30, 2021
aa684d4
Correct name of the test
jdubois Mar 31, 2021
3d6c992
Refactor "AZURE" to "AZURE_APP_SERVICE"
jdubois Mar 31, 2021
85e37ca
test a second environment variable for Azure App Service
jdubois Mar 31, 2021
26e5936
Fix formatting
jdubois Mar 31, 2021
ed3b04b
Revert imports following @wilkinsona review
jdubois Apr 1, 2021
b0a4009
Add unit tests following @wilkinsona review
jdubois Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions ...-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
package org.springframework.boot.cloud;

import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertySource;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.env.*;

/**
* Simple detection for well known cloud platforms. Detection can be forced using the
Expand All @@ -45,6 +41,23 @@ public boolean isDetected(Environment environment) {

},

/**
* Azure App Service platform.
*/
AZURE_APP_SERVICE {

private static final String WEBSITE_SITE_NAME = "WEBSITE_SITE_NAME";

private static final String WEBSITES_ENABLE_APP_SERVICE_STORAGE = "WEBSITES_ENABLE_APP_SERVICE_STORAGE";

@Override
public boolean isDetected(Environment environment) {
return environment.containsProperty(WEBSITE_SITE_NAME)
&& environment.containsProperty(WEBSITES_ENABLE_APP_SERVICE_STORAGE);
}

},

/**
* Cloud Foundry platform.
*/
Expand Down
10 changes: 10 additions & 0 deletions ...-project/spring-boot/src/test/java/org/springframework/boot/cloud/CloudPlatformTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,17 @@ void getActiveWhenNotInCloudShouldReturnNull() {
Environment environment = new MockEnvironment();
CloudPlatform platform = CloudPlatform.getActive(environment);
assertThat(platform).isNull();
}

@Test
void getActiveWhenHasWebsiteSiteNameShouldReturnAzureAppService() {
Map<String, Object> envVars = new HashMap<>();
envVars.put("WEBSITE_SITE_NAME", "---");
envVars.put("WEBSITES_ENABLE_APP_SERVICE_STORAGE", "false");
Environment environment = getEnvironmentWithEnvVariables(envVars);
CloudPlatform platform = CloudPlatform.getActive(environment);
assertThat(platform).isEqualTo(CloudPlatform.AZURE_APP_SERVICE);
assertThat(platform.isActive(environment)).isTrue();
}

@Test
Expand Down