Add static methods and export AppServicePlanRedundancyStep (#1756)

microsoft · Jul 19, 2024 · f951f64 · f951f64
1 parent 682442f
commit f951f64
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/appservice/src/createAppService/AppServicePlanRedundancyStep.ts b/appservice/src/createAppService/AppServicePlanRedundancyStep.ts
@@ -26,7 +26,7 @@ export class AppServicePlanRedundancyStep extends AzureWizardPromptStep<IAppServ
     }
 
     // TODO(ccastrotrejo): This will be changed to use orgdomain with WI 12845265 once georegions API is updated with ANT78.
-    private isZoneRedundancyEnabled(location: string): boolean {
+    public static isZoneRedundancySupportedLocation(location: string): boolean {
         const zoneRedundancySupportedLocations = [
             'westus2',
             'westus3',
@@ -46,25 +46,37 @@ export class AppServicePlanRedundancyStep extends AzureWizardPromptStep<IAppServ
             'eastus2euap',
         ];
 
+        location = location.replace(/\s/, "").toLowerCase(); // Todo: Replace with LocationListStep's `generalizeLocationName` once exported and released
         return zoneRedundancySupportedLocations.includes(location);
     }
 
-    private isAllowedServicePlan(newPlanSku: SkuDescription): boolean {
-        const { family } = newPlanSku;
-        const allowedServicePlan = [
+    public static isZoneRedundancySupportedServicePlan(newPlanSkuOrFamily: SkuDescription | string): boolean {
+        const allowedServicePlans: string[] = [
             'Pv2',
             'Pv3',
             'WS',
         ];
 
-        return !!family && allowedServicePlan.includes(family);
+        let family: string;
+        if ((newPlanSkuOrFamily as SkuDescription)?.family) {
+            // Nullish coallescing operator should be logically unnecessary, but helps TS compiler understand that this value won't be undefined
+            family = (newPlanSkuOrFamily as SkuDescription).family ?? '';
+        } else {
+            family = newPlanSkuOrFamily as string;
+        }
+
+        return allowedServicePlans.includes(family);
+    }
+
+    public static isZoneRedundancySupported(location: string, newPlanSkuOrFamily: SkuDescription | string): boolean {
+        return this.isZoneRedundancySupportedLocation(location) && this.isZoneRedundancySupportedServicePlan(newPlanSkuOrFamily);
     }
 
     public shouldPrompt(context: AppServiceWizardContext): boolean {
         const { customLocation, _location, plan, newPlanSku } = context;
         const { name } = _location || {};
         if (plan === undefined && customLocation === undefined && name && newPlanSku) {
-            return this.isZoneRedundancyEnabled(name) && this.isAllowedServicePlan(newPlanSku);
+            return AppServicePlanRedundancyStep.isZoneRedundancySupported(name, newPlanSku);
         }
         return false;
     }

diff --git a/appservice/src/index.ts b/appservice/src/index.ts
@@ -12,6 +12,7 @@ export * from './createAppService/AppInsightsListStep';
 export { AppKind, WebsiteOS } from './createAppService/AppKind';
 export * from './createAppService/AppServicePlanCreateStep';
 export * from './createAppService/AppServicePlanListStep';
+export * from './createAppService/AppServicePlanRedundancyStep';
 export * from './createAppService/AppServicePlanSkuStep';
 export * from './createAppService/CustomLocationListStep';
 export * from './createAppService/IAppServiceWizardContext';
@@ -49,4 +50,3 @@ export * from './tree/LogFilesTreeItem';
 export * from './tree/SiteFilesTreeItem';
 export * from './tryGetSiteResource';
 export * from './utils/azureClients';
-