[App Service] BREAKING CHANGE: az webapp list-runtimes: Use new stacks APIs

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

@@ -11,6 +11,8 @@
 NODE_RUNTIME_NAME = "node"
 PYTHON_RUNTIME_NAME = "python"
 OS_DEFAULT = "Windows"
+LINUX_OS_NAME = "linux"
+WINDOWS_OS_NAME = "windows"
 STATIC_RUNTIME_NAME = "static"  # not an official supported runtime but used for CLI logic
 LINUX_SKU_DEFAULT = "P1V2"
 FUNCTIONS_VERSIONS = ['2', '3', '4']

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

@@ -16,7 +16,9 @@
 from azure.mgmt.web.models import DatabaseType, ConnectionStringType, BuiltInAuthenticationProvider, AzureStorageType
 
 from ._completers import get_hostname_completion_list
-from ._constants import FUNCTIONS_VERSIONS, FUNCTIONS_STACKS_API_JSON_PATHS, FUNCTIONS_STACKS_API_KEYS
+from ._constants import (FUNCTIONS_VERSIONS, FUNCTIONS_STACKS_API_JSON_PATHS, FUNCTIONS_STACKS_API_KEYS,
+                         WINDOWS_OS_NAME, LINUX_OS_NAME)
+
 from ._validators import (validate_timeout_value, validate_site_create, validate_asp_create,
                           validate_add_vnet, validate_front_end_scale_factor, validate_ase_create, validate_ip_address,
                           validate_service_tag, validate_public_cloud)
@@ -170,8 +172,8 @@ def load_arguments(self, _):
         c.argument('slot', options_list=['--slot', '-s'], help='Name of the web app slot. Default to the productions slot if not specified.')
 
     with self.argument_context('webapp list-runtimes') as c:
-        c.argument('linux', options_list=['--linux', '-l'], action='store_true', help='list runtime stacks for linux based web apps')
-        c.argument('windows', options_list=['--windows', '-w'], action='store_true', help='list runtime stacks for windows based web apps')
+        c.argument('linux', action='store_true', help='list runtime stacks for linux based web apps. Use "--os-type linux" instead', deprecate_info=c.deprecate())
+        c.argument('os_type', options_list=["--os", "--os-type"], help="limit the output to just windows or linux runtimes", arg_type=get_enum_type([LINUX_OS_NAME, WINDOWS_OS_NAME]))
 
     with self.argument_context('webapp deleted list') as c:
         c.argument('name', arg_type=webapp_name_arg_type, id_part=None)

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

@@ -73,7 +73,8 @@
                          FUNCTIONS_LINUX_RUNTIME_VERSION_REGEX, FUNCTIONS_WINDOWS_RUNTIME_VERSION_REGEX,
                          RUNTIME_STACKS, FUNCTIONS_NO_V2_REGIONS, PUBLIC_CLOUD,
                          LINUX_GITHUB_ACTIONS_WORKFLOW_TEMPLATE_PATH, WINDOWS_GITHUB_ACTIONS_WORKFLOW_TEMPLATE_PATH,
-                         DOTNET_RUNTIME_NAME, NETCORE_RUNTIME_NAME, ASPDOTNET_RUNTIME_NAME)
+                         DOTNET_RUNTIME_NAME, NETCORE_RUNTIME_NAME, ASPDOTNET_RUNTIME_NAME, LINUX_OS_NAME,
+                         WINDOWS_OS_NAME)
 from ._github_oauth import (get_github_access_token)
 from ._validators import validate_and_convert_to_int, validate_range_of_int_flag
 
@@ -1094,10 +1095,22 @@ def list_instances(cmd, resource_group_name, name, slot=None):
     return _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'list_instance_identifiers', slot)
 
 
-def list_runtimes(cmd, linux=False, windows=False):
-    if not linux and not windows:  # show both linux and windows stacks by default
+def list_runtimes(cmd, os_type=None, linux=False):
+    if os_type is not None and linux:
+        raise MutuallyExclusiveArgumentError("Cannot use both --os-type and --linux")
+
+    if linux:
+        linux = True
+        windows = False
+    else:
+        # show both linux and windows stacks by default
         linux = True
         windows = True
+        if os_type == WINDOWS_OS_NAME:
+            linux = False
+        if os_type == LINUX_OS_NAME:
+            windows = False
+
     runtime_helper = _StackRuntimeHelper(cmd=cmd, linux=linux, windows=windows)
     return runtime_helper.get_stack_names_only()
 
@@ -4053,11 +4066,9 @@ def webapp_up(cmd, name=None, resource_group_name=None, plan=None, location=None
         runtime = helper.remove_delimiters(runtime)
         match = helper.resolve(runtime, _is_linux)
         if not match:
-            if _is_linux:
-                raise ValidationError("Linux runtime '{}' is not supported."
-                                      " Please invoke 'az webapp list-runtimes --linux' to cross check".format(runtime))
-            raise ValidationError("Windows runtime '{}' is not supported."
-                                  " Please invoke 'az webapp list-runtimes --windows' to cross check".format(runtime))
+            os_name = WINDOWS_OS_NAME if not _is_linux else LINUX_OS_NAME
+            raise ValidationError("{0} runtime '{1}' is not supported. Please check supported runtimes with: "
+                                  "'az webapp list-runtimes --os {0}'".format(os_name, runtime))
 
         language = runtime.split('|')[0]
         version_used_create = '|'.join(runtime.split('|')[1:])