Skip to content

Commit e886480

Browse files
authored
Merge pull request #5658 from microsoft/fix-function-creation
Fix function creation issue with multi subscription
2 parents e74e3c5 + b95274c commit e886480

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/function/FunctionAppService.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ public IFunctionApp createFunctionApp(final FunctionAppConfig config) {
9292
// get/create ai instances only if user didn't specify ai connection string in app settings
9393
AzureTelemetry.getActionContext().setProperty(DISABLE_APP_INSIGHTS, String.valueOf(config.getMonitorConfig().getApplicationInsightsConfig() == null));
9494
bindApplicationInsights(appSettings, config);
95-
final IFunctionApp result = Azure.az(AzureAppService.class).functionApp(resourceGroup.getName(), config.getName()).create()
95+
final IFunctionApp result = Azure.az(AzureAppService.class).subscription(config.getSubscription())
96+
.functionApp(resourceGroup.getName(), config.getName()).create()
9697
.withName(config.getName())
9798
.withResourceGroup(resourceGroup.getName())
9899
.withPlan(appServicePlan.id())
@@ -129,11 +130,12 @@ private void setDefaultAppSetting(final Map<String, String> result, String setti
129130

130131
private ResourceGroup getOrCreateResourceGroup(final FunctionAppConfig config) {
131132
try {
132-
return Azure.az(AzureGroup.class).getByName(config.getResourceGroup().getName());
133+
return Azure.az(AzureGroup.class).subscription(config.getSubscription()).getByName(config.getResourceGroup().getName());
133134
} catch (final ManagementException e) {
134135
AzureMessager.getMessager().info(String.format(CREATE_RESOURCE_GROUP, config.getResourceGroup().getName(), config.getRegion().getName()));
135136
AzureTelemetry.getActionContext().setProperty(CREATE_NEW_RESOURCE_GROUP, String.valueOf(true));
136-
final ResourceGroup result = Azure.az(AzureGroup.class).create(config.getResourceGroup().getName(), config.getRegion().getName());
137+
final ResourceGroup result = Azure.az(AzureGroup.class).subscription(config.getSubscription())
138+
.create(config.getResourceGroup().getName(), config.getRegion().getName());
137139
AzureMessager.getMessager().info(String.format(CREATE_RESOURCE_GROUP_DONE, result.getName()));
138140
return result;
139141
}

0 commit comments

Comments
 (0)