Fix CONTENT* setting logic for linux premium (#1700)

Author: ejizba

package-lock.json

@@ -1029,7 +1029,7 @@
         "ps-tree": "^1.1.1",
         "request-promise": "^4.2.4",
         "semver": "^5.7.1",
-        "vscode-azureappservice": "^0.52.0",
+        "vscode-azureappservice": "^0.52.1",
         "vscode-azureextensionui": "^0.28.4",
         "vscode-azurekudu": "^0.1.8",
         "vscode-nls": "^4.1.1",

package.json

@@ -113,17 +113,20 @@ export class FunctionAppCreateStep extends AzureWizardExecuteStep<IFunctionAppWi
             });
         }
 
-        if (context.newSiteOS === WebsiteOS.windows) {
-            if (runtimeWithoutVersion.toLowerCase() === 'node' && context.version !== FuncVersion.v1) {
-                // Linux doesn't need this because it uses linuxFxVersion
-                // v1 doesn't need this because it only supports one version of Node
-                appSettings.push({
-                    name: 'WEBSITE_NODE_DEFAULT_VERSION',
-                    value: '~' + getRuntimeVersion(runtime)
-                });
-            }
+        if (context.newSiteOS === WebsiteOS.windows && runtimeWithoutVersion.toLowerCase() === 'node' && context.version !== FuncVersion.v1) {
+            // Linux doesn't need this because it uses linuxFxVersion
+            // v1 doesn't need this because it only supports one version of Node
+            appSettings.push({
+                name: 'WEBSITE_NODE_DEFAULT_VERSION',
+                value: '~' + getRuntimeVersion(runtime)
+            });
+        }
 
-            // WEBSITE_CONTENT* settings only apply for Windows https://github.com/Microsoft/vscode-azurefunctions/issues/625
+        const isElasticPremium: boolean = !!(context.plan && context.plan.sku && context.plan.sku.family && context.plan.sku.family.toLowerCase() === 'ep');
+        if (context.newSiteOS === WebsiteOS.windows || isElasticPremium) {
+            // WEBSITE_CONTENT* settings only apply for the following scenarios:
+            // Windows: https://github.com/Microsoft/vscode-azurefunctions/issues/625
+            // Linux Elastic Premium: https://github.com/microsoft/vscode-azurefunctions/issues/1682
             appSettings.push({
                 name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING',
                 value: storageConnectionString
@@ -132,16 +135,16 @@ export class FunctionAppCreateStep extends AzureWizardExecuteStep<IFunctionAppWi
                 name: 'WEBSITE_CONTENTSHARE',
                 value: getNewFileShareName(nonNullProp(context, 'newSiteName'))
             });
+        }
 
-            // This setting is not required, but we will set it since it has many benefits https://docs.microsoft.com/en-us/azure/azure-functions/run-functions-from-deployment-package
-            // That being said, it doesn't work on v1 C# Script https://github.com/Microsoft/vscode-azurefunctions/issues/684
-            // It also doesn't apply for Linux
-            if (!(context.language === ProjectLanguage.CSharpScript && context.version === FuncVersion.v1)) {
-                appSettings.push({
-                    name: 'WEBSITE_RUN_FROM_PACKAGE',
-                    value: '1'
-                });
-            }
+        // This setting is not required, but we will set it since it has many benefits https://docs.microsoft.com/en-us/azure/azure-functions/run-functions-from-deployment-package
+        // That being said, it doesn't work on v1 C# Script https://github.com/Microsoft/vscode-azurefunctions/issues/684
+        // It also doesn't apply for Linux
+        if (context.newSiteOS === WebsiteOS.windows && !(context.language === ProjectLanguage.CSharpScript && context.version === FuncVersion.v1)) {
+            appSettings.push({
+                name: 'WEBSITE_RUN_FROM_PACKAGE',
+                value: '1'
+            });
         }
 
         if (context.appInsightsComponent) {

src/commands/createFunctionApp/FunctionAppCreateStep.ts

@@ -144,8 +144,7 @@ export abstract class SlotTreeItemBase extends AzureParentTreeItem<ISiteTreeRoot
         let result: boolean | undefined = this._cachedIsConsumption;
         if (result === undefined) {
             try {
-                const asp: WebSiteManagementModels.AppServicePlan | undefined = await this.root.client.getAppServicePlan();
-                result = !asp || !asp.sku || !asp.sku.tier || asp.sku.tier.toLowerCase() === 'dynamic';
+                result = await this.root.client.getIsConsumption();
             } catch {
                 // ignore and use default
                 result = true;