Initial code to add support for --managed-instance-enabled

Author: joslinmicrosoft

src/azure-cli/azure/cli/command_modules/appservice/_params.py

@@ -102,6 +102,8 @@ def load_arguments(self, _):
                    help='get regions which support hosting web apps on Windows Container workers')
         c.argument('linux_workers_enabled', action='store_true',
                    help='get regions which support hosting web apps on Linux workers')
+        c.argument('managed_instance_enabled', action='store_true',
+                   help='get regions which support hosting web apps on Managed Instance workers')
         c.argument('sku', arg_type=sku_arg_type)
 
     with self.argument_context('appservice plan') as c:

src/azure-cli/azure/cli/command_modules/appservice/custom.py

@@ -74,7 +74,8 @@
                     get_resource_if_exists, repo_url_to_name, get_token,
                     app_service_plan_exists, is_centauri_functionapp, is_flex_functionapp,
                     _remove_list_duplicates, get_raw_functionapp,
-                    register_app_provider)
+                    register_app_provider,
+                    is_sku_tier_enabled_for_managed_instance)
 from ._create_util import (zip_contents_from_dir, get_runtime_version_details, create_resource_group, get_app_details,
                            check_resource_group_exists, set_location, get_site_availability,
                            get_regional_site_availability, get_profile_username,
@@ -8125,13 +8126,19 @@ def list_flexconsumption_zone_redundant_locations(cmd):
     return [{'name': x.name.lower().replace(' ', '')} for x in regions]
 
 
-def list_locations(cmd, sku, linux_workers_enabled=None, hyperv_workers_enabled=None):
+def list_locations(cmd, sku, linux_workers_enabled=None, hyperv_workers_enabled=None, managed_instance_enabled=None):
     web_client = web_client_factory(cmd.cli_ctx)
     full_sku = get_sku_tier(sku)
-    # Temporary fix due to regression in this specific API with 2021-03-01, should be removed with the next SDK update
-    web_client_geo_regions = web_client.list_geo_regions(sku=full_sku,
-                                                         linux_workers_enabled=linux_workers_enabled,
-                                                         xenon_workers_enabled=hyperv_workers_enabled)
+
+    if managed_instance_enabled:
+        # managed_instance_enabled needs to be specially handled due to requiring version 2025-03-01
+        # and due to additional validation needed for SKU
+        web_client_geo_regions = _list_managed_instance_locations(cmd, full_sku)
+    else:
+        # Temporary fix due to regression in this specific API with 2021-03-01, should be removed with the next SDK update
+        web_client_geo_regions = web_client.list_geo_regions(sku=full_sku,
+                                                             linux_workers_enabled=linux_workers_enabled,
+                                                             xenon_workers_enabled=hyperv_workers_enabled)
 
     providers_client = providers_client_factory(cmd.cli_ctx)
     providers_client_locations_list = getattr(providers_client.get('Microsoft.Web'), 'resource_types', [])
@@ -8143,6 +8150,11 @@ def list_locations(cmd, sku, linux_workers_enabled=None, hyperv_workers_enabled=
     return [geo_region for geo_region in web_client_geo_regions if geo_region.name in providers_client_locations_list]
 
 
+def _list_managed_instance_locations(cmd, sku_tier):
+    if not is_sku_tier_enabled_for_managed_instance(sku_tier):
+        return []
+
+
 def _check_zip_deployment_status(cmd, rg_name, name, deployment_status_url, slot, timeout=None):
     import requests
     from azure.cli.core.util import should_disable_connection_verify

src/azure-cli/azure/cli/command_modules/appservice/utils.py

@@ -109,6 +109,12 @@ def get_sku_name(tier):
     return get_sku_tier(name=tier)
 
 
+def is_sku_tier_enabled_for_managed_instance(sku_tier):
+    sku_tier = sku_tier.upper()
+    enabled_skus = ['PREMIUMV4', 'PREMIUMMV4']
+    return sku_tier in enabled_skus
+
+
 # resource is client.web_apps for webapps, client.app_service_plans for ASPs, etc.
 def get_resource_if_exists(resource, **kwargs):
     from azure.core.exceptions import ResourceNotFoundError as R