Adding new SKU helpers for CV2 (#9250)

Author: mathewc

src/WebJobs.Script/Environment/EnvironmentExtensions.cs

@@ -201,14 +201,26 @@ public static bool IsWindowsConsumption(this IEnvironment environment)
         }
 
         /// <summary>
-        /// Gets a value indicating whether the application is running in a Windows or Linux Consumption (dynamic)
+        /// Gets a value indicating whether the application is running in one of our consumption SKUs (e.g.  Windows or Linux Consumption (Dynamic),
+        /// or Flex Consumption).
         /// App Service environment.
         /// </summary>
         /// <param name="environment">The environment to verify.</param>
-        /// <returns><see cref="true"/> if running in a Windows or Linux Consumption App Service app; otherwise, false.</returns>
+        /// <returns><see cref="true"/> if running in one of our Consumption SKUs, false otherwise.</returns>
         public static bool IsConsumptionSku(this IEnvironment environment)
         {
-            return IsWindowsConsumption(environment) || IsAnyLinuxConsumption(environment);
+            return IsWindowsConsumption(environment) || IsAnyLinuxConsumption(environment) || IsFlexConsumptionSku(environment);
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the application is running in the Flex Consumption Sku.
+        /// </summary>
+        /// <param name="environment">The environment to verify.</param>
+        /// <returns><see cref="true"/> if running in the FlexConsumption Sku, false otherwise.</returns>
+        public static bool IsFlexConsumptionSku(this IEnvironment environment)
+        {
+            string value = environment.GetEnvironmentVariable(AzureWebsiteSku);
+            return string.Equals(value, ScriptConstants.FlexConsumptionSku, StringComparison.OrdinalIgnoreCase);
         }
 
         /// <summary>

src/WebJobs.Script/ScriptConstants.cs

@@ -108,6 +108,7 @@ public static class ScriptConstants
         public const string XIdentityHeader = "X-IDENTITY-HEADER";
         public const string ContainerInstanceHeader = "fx-current-instance";
         public const string DynamicSku = "Dynamic";
+        public const string FlexConsumptionSku = "FlexConsumption";
         public const string ElasticPremiumSku = "ElasticPremium";
         public const string DefaultProductionSlotName = "production";
 

test/WebJobs.Script.Tests/Extensions/EnvironmentExtensionsTests.cs

@@ -156,11 +156,12 @@ public void GetAntaresVersion_ReturnsExpectedResult(bool isLinuxConsumption, boo
         }
 
         [Theory]
-        [InlineData(true, false, true)]
-        [InlineData(false, true, true)]
-        [InlineData(false, false, false)]
-        [InlineData(true, true, true)]
-        public void IsConsumption_ReturnsExpectedResult(bool isLinuxConsumption, bool isWindowsConsumption, bool expectedValue)
+        [InlineData(true, false, false, true)]
+        [InlineData(false, false, true, true)]
+        [InlineData(false, true, false, true)]
+        [InlineData(false, false, false, false)]
+        [InlineData(true, true, false, true)]
+        public void IsConsumptionSku_ReturnsExpectedResult(bool isLinuxConsumption, bool isWindowsConsumption, bool isFlexConsumption, bool expectedValue)
         {
             IEnvironment env = new TestEnvironment();
             if (isLinuxConsumption)
@@ -173,9 +174,26 @@ public void IsConsumption_ReturnsExpectedResult(bool isLinuxConsumption, bool is
                 env.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteSku, ScriptConstants.DynamicSku);
             }
 
+            if (isFlexConsumption)
+            {
+                env.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteSku, ScriptConstants.FlexConsumptionSku);
+            }
+
             Assert.Equal(expectedValue, env.IsConsumptionSku());
         }
 
+        [Theory]
+        [InlineData("FlexConsumption", true)]
+        [InlineData("Dynamic", false)]
+        [InlineData("ElasticPremium", false)]
+        [InlineData("", false)]
+        public void IsFlexConsumptionSku_ReturnsExpectedResult(string sku, bool expected)
+        {
+            IEnvironment env = new TestEnvironment();
+            env.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteSku, sku);
+            Assert.Equal(expected, env.IsFlexConsumptionSku());
+        }
+
         [Theory]
         [InlineData(true, false, false, true)]
         [InlineData(false, true, false, true)]