[AppService] Fix #10476: Support appservice in 2019-03-01-hybrid profile

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -50,6 +50,7 @@ class ResourceType(Enum):  # pylint: disable=too-few-public-methods
     MGMT_MONITOR = ('azure.mgmt.monitor', 'MonitorManagementClient')
     DATA_KEYVAULT = ('azure.keyvault', 'KeyVaultClient')
     MGMT_EVENTHUB = ('azure.mgmt.eventhub', 'EventHubManagementClient')
+    MGMT_APPSERVICE = ('azure.mgmt.web', 'WebSiteManagementClient')
     # the "None" below will stay till a command module fills in the type so "get_mgmt_service_client"
     # can be provided with "ResourceType.XXX" to initialize the client object. This usually happens
     # when related commands start to support Multi-API
@@ -90,7 +91,6 @@ class ResourceType(Enum):  # pylint: disable=too-few-public-methods
     MGMT_SQLVM = ('azure.mgmt.sqlvirtualmachine', None)
     MGMT_MANAGEDSERVICES = ('azure.mgmt.managedservices', None)
     MGMT_NETAPPFILES = ('azure.mgmt.netappfiles', None)
-    MGMT_APPSERVICE = ('azure.mgmt.web', None)
 
     def __init__(self, import_prefix, client_name):
         """Constructor.
@@ -174,7 +174,8 @@ def default_api_version(self):
             'service_diagnostic_settings': '2016-09-01',
             'tenant_activity_logs': '2015-04-01',
             'vm_insights': '2018-11-27-preview'
-        })
+        }),
+        ResourceType.MGMT_APPSERVICE: '2019-08-01'
     },
     '2019-03-01-hybrid': {
         ResourceType.MGMT_STORAGE: '2017-10-01',
@@ -198,7 +199,11 @@ def default_api_version(self):
         }),
         ResourceType.DATA_KEYVAULT: '2016-10-01',
         ResourceType.DATA_STORAGE: '2017-11-09',
-        ResourceType.DATA_COSMOS_TABLE: '2017-04-17'
+        ResourceType.DATA_COSMOS_TABLE: '2017-04-17',
+        # Full MultiAPI support is not done in AppService, the line below is merely
+        # to have commands show up in the hybrid profile which happens to have the latest
+        # API versions
+        ResourceType.MGMT_APPSERVICE: '2018-02-01'
     },
     '2018-03-01-hybrid': {
         ResourceType.MGMT_STORAGE: '2016-01-01',

src/azure-cli/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+**AppService**
+
+* Azure Stack: surface commands under the profile of 2019-03-01-hybrid
+
 **IoT Central**
 
 * Support app creation/update with the new sku name ST0, ST1, ST2.
@@ -352,7 +356,6 @@ Release History
 * Add --runtime-version property to `az functionapp create`
 * az appservice vnet-integration add: Fixed so that subnet delegation is case insensitive and delegating subnets does not overwrite previous data.
 
-
 **ARM**
 
 * deployment/group deployment validate: Add --handle-extended-json-format parameter to support multiline and comments in json template when deployment.

src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/export_features_prop.json

@@ -1,4 +1,4 @@
-#Mon Dec 30 11:27:28 Pacific Standard Time 2019
+#Mon Jan 13 20:24:18 China Standard Time 2020
 Color=Red
 Region=West US
 feature-management.FalseFeature=false

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

@@ -30,9 +30,9 @@ def _polish_bad_errors(ex):
 
 
 def web_client_factory(cli_ctx, **_):
-    from azure.mgmt.web import WebSiteManagementClient
+    from azure.cli.core.profiles import ResourceType
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
-    return get_mgmt_service_client(cli_ctx, WebSiteManagementClient)
+    return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_APPSERVICE)
 
 
 def cf_plans(cli_ctx, _):

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

@@ -1516,6 +1516,15 @@
         az webapp deployment user set --user-name MyUserName
 """
 
+helps['webapp deployment user show'] = """
+type: command
+short-summary: Get deployment publishing user.
+examples:
+  - name: Get publishing user information.
+    text: >
+        az webapp deployment user show
+"""
+
 helps['webapp hybrid-connection'] = """
 type: group
 short-summary: methods that list, add and remove hybrid-connections from webapps

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

@@ -231,7 +231,7 @@ def load_arguments(self, _):
             c.argument('windows_fx_version', help="A docker image name used for your windows container web app, e.g., microsoft/nanoserver:ltsc2016", is_preview=True)
             if scope == 'functionapp':
                 c.ignore('windows_fx_version')
-            c.argument('reserved_instance_count', options_list=['--prewarmed-instance-count'], help="Number of pre-warmed instances a function app has")
+            c.argument('pre_warmed_instance_count', options_list=['--prewarmed-instance-count'], help="Number of pre-warmed instances a function app has")
             if scope == 'webapp':
                 c.ignore('reserved_instance_count')
             c.argument('java_version', help="The version used to run your web app if using Java, e.g., '1.7' for Java 7, '1.8' for Java 8")

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

@@ -59,7 +59,7 @@ def _polish_bad_errors(ex):
 # pylint: disable=too-many-statements
 def load_command_table(self, _):
     webclient_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.web.web_site_management_client#WebSiteManagementClient.{}',
+        operations_tmpl='azure.mgmt.web.operations#WebSiteManagementClientOperationsMixin.{}',
         client_factory=cf_web_client
     )
     appservice_plan_sdk = CliCommandType(
@@ -195,7 +195,7 @@ def load_command_table(self, _):
         g.custom_command('list-publishing-credentials', 'list_publishing_credentials')
 
     with self.command_group('webapp deployment user', webclient_sdk) as g:
-        g.show_command('show', 'get_publishing_user')
+        g.custom_show_command('show', 'get_publishing_user')
         g.custom_command('set', 'set_deployment_user', exception_handler=ex_handler_factory())
 
     with self.command_group('webapp deployment container') as g: