Adjusted helper methods to the new Premium tier service app plans (Azure#1179)

Tholdrim · web-flow · commit 9eb0f12e3289 · 2020-12-07T10:54:41.000+08:00
diff --git a/src/ResourceManagement/AppService/FunctionAppImpl.cs b/src/ResourceManagement/AppService/FunctionAppImpl.cs
@@ -64,7 +64,7 @@ private FunctionAppImpl AutoSetAlwaysOn(PricingTier pricingTier)
             SkuDescription description = pricingTier.SkuDescription;
             if (description.Tier.Equals("Basic", StringComparison.OrdinalIgnoreCase)
                 || description.Tier.Equals("Standard", StringComparison.OrdinalIgnoreCase)
-                || description.Tier.Equals("Premium", StringComparison.OrdinalIgnoreCase))
+                || description.Tier.StartsWith("Premium", StringComparison.OrdinalIgnoreCase))
             {
                 return WithWebAppAlwaysOn(true);
             }
@@ -181,9 +181,7 @@ private bool IsConsumptionAppServicePlan(PricingTier pricingTier)
             }
 
             SkuDescription description = pricingTier.SkuDescription;
-            return !(description.Tier.Equals("Basic", StringComparison.OrdinalIgnoreCase)
-                || description.Tier.Equals("Standard", StringComparison.OrdinalIgnoreCase)
-                || description.Tier.Equals("Premium", StringComparison.OrdinalIgnoreCase));
+            return description.Tier.Equals("Dynamic", StringComparison.OrdinalIgnoreCase);
         }
 
         public override async Task<IFunctionApp> CreateAsync(CancellationToken cancellationToken = default(CancellationToken), bool multiThreaded = true)

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private FunctionAppImpl AutoSetAlwaysOn(PricingTier pricingTier)`
`64`	`64`	`SkuDescription description = pricingTier.SkuDescription;`
`65`	`65`	`if (description.Tier.Equals("Basic", StringComparison.OrdinalIgnoreCase)`
`66`	`66`	`\|\| description.Tier.Equals("Standard", StringComparison.OrdinalIgnoreCase)`
`67`		`- \|\| description.Tier.Equals("Premium", StringComparison.OrdinalIgnoreCase))`
	`67`	`+ \|\| description.Tier.StartsWith("Premium", StringComparison.OrdinalIgnoreCase))`
`68`	`68`	`{`
`69`	`69`	`return WithWebAppAlwaysOn(true);`
`70`	`70`	`}`
`@@ -181,9 +181,7 @@ private bool IsConsumptionAppServicePlan(PricingTier pricingTier)`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`SkuDescription description = pricingTier.SkuDescription;`
`184`		`- return !(description.Tier.Equals("Basic", StringComparison.OrdinalIgnoreCase)`
`185`		`- \|\| description.Tier.Equals("Standard", StringComparison.OrdinalIgnoreCase)`
`186`		`- \|\| description.Tier.Equals("Premium", StringComparison.OrdinalIgnoreCase));`
	`184`	`+ return description.Tier.Equals("Dynamic", StringComparison.OrdinalIgnoreCase);`
`187`	`185`	`}`
`188`	`186`
`189`	`187`	`public override async Task<IFunctionApp> CreateAsync(CancellationToken cancellationToken = default(CancellationToken), bool multiThreaded = true)`