{appservice_kube} Remove msrestazure dependency (#8149)

* Remove msrestazure dependency

* record the test case again

---------

Co-authored-by: layliu <[email protected]>

src/appservice-kube/HISTORY.rst

@@ -2,6 +2,10 @@
 
 Release History
 ===============
+0.1.11
+++++++
+* Remove msrestazure dependency
+
 0.1.10
 ++++++
 * Add command `az webapp list-runtimes --is-kube` for arc enabled app service

src/appservice-kube/azext_appservice_kube/_utils.py

@@ -70,13 +70,13 @@ def get_sku_name(tier):  # pylint: disable=too-many-return-statements
 
 
 def validate_subnet_id(cli_ctx, subnet, vnet_name, resource_group_name):
-    from msrestazure.tools import is_valid_resource_id
+    from azure.mgmt.core.tools import is_valid_resource_id
     subnet_is_id = is_valid_resource_id(subnet)
 
     if subnet_is_id and not vnet_name:
         return subnet
     if subnet and not subnet_is_id and vnet_name:
-        from msrestazure.tools import resource_id
+        from azure.mgmt.core.tools import resource_id
         from azure.cli.core.commands.client_factory import get_subscription_id
         return resource_id(
             subscription=get_subscription_id(cli_ctx),
@@ -90,13 +90,13 @@ def validate_subnet_id(cli_ctx, subnet, vnet_name, resource_group_name):
 
 
 def validate_aks_id(cli_ctx, aks, resource_group_name):
-    from msrestazure.tools import is_valid_resource_id
+    from azure.mgmt.core.tools import is_valid_resource_id
     aks_is_id = is_valid_resource_id(aks)
 
     if aks_is_id:
         return aks
     if aks and not aks_is_id:
-        from msrestazure.tools import resource_id
+        from azure.mgmt.core.tools import resource_id
         from azure.cli.core.commands.client_factory import get_subscription_id
         return resource_id(
             subscription=get_subscription_id(cli_ctx),

src/appservice-kube/azext_appservice_kube/azext_metadata.json

@@ -1,4 +1,4 @@
 {
     "azext.isPreview": true,
-    "azext.minCliCoreVersion": "2.34.1"
+    "azext.minCliCoreVersion": "2.60.0"
 }

src/appservice-kube/azext_appservice_kube/custom.py

@@ -57,7 +57,7 @@
 from azure.cli.core.azclierror import (ResourceNotFoundError, RequiredArgumentMissingError, ValidationError,
                                        ArgumentUsageError, MutuallyExclusiveArgumentError)
 
-from msrestazure.tools import is_valid_resource_id, parse_resource_id
+from azure.mgmt.core.tools import is_valid_resource_id, parse_resource_id
 
 from ._constants import (KUBE_DEFAULT_SKU, KUBE_ASP_KIND, KUBE_APP_KIND, KUBE_FUNCTION_APP_KIND,
                          KUBE_FUNCTION_CONTAINER_APP_KIND, KUBE_CONTAINER_APP_KIND)
@@ -680,7 +680,7 @@ def _is_webapp_kube(custom_location, plan_info, SkuDescription):
 
 
 def _get_custom_location_id(cmd, custom_location, resource_group_name):
-    from msrestazure.tools import resource_id
+    from azure.mgmt.core.tools import resource_id
 
     if custom_location is None:
         return None
@@ -905,7 +905,7 @@ def create_webapp(cmd, resource_group_name, name, plan=None, runtime=None, custo
     if deployment_container_image_name:
         update_container_settings(cmd, resource_group_name, name, docker_registry_server_url,
                                   deployment_container_image_name, docker_registry_server_user,
-                                  docker_registry_server_password=docker_registry_server_password)
+                                  container_registry_password=docker_registry_server_password)
 
     if is_kube:
         return webapp
@@ -1457,7 +1457,7 @@ def _resolve_kube_environment_id(cli_ctx, kube_environment, resource_group_name)
     if is_valid_resource_id(kube_environment):
         return kube_environment
 
-    from msrestazure.tools import resource_id
+    from azure.mgmt.core.tools import resource_id
     return resource_id(
         subscription=get_subscription_id(cli_ctx),
         resource_group=resource_group_name,

src/appservice-kube/azext_appservice_kube/tests/latest/test_appservice_kube_scenario.py

@@ -15,9 +15,10 @@
 
 # not lima-specific
 class WebappBasicE2EKubeTest(ScenarioTest):
-    @ResourceGroupPreparer(location='canadacentral')
+    @ResourceGroupPreparer(location='eastus')
     @live_only()
     def test_linux_webapp_quick_create_kube(self, resource_group):
+        location_name = ""
         webapp_name = self.create_random_name(
             prefix='webapp-quick-linux', length=24)
         plan = self.create_random_name(prefix='plan-quick-linux', length=24)
@@ -26,10 +27,6 @@ def test_linux_webapp_quick_create_kube(self, resource_group):
             'appservice plan create -g {} -n {} --is-linux'.format(resource_group, plan))
         self.cmd('webapp create -g {} -n {} --plan {} -i patle/ruby-hello'.format(
             resource_group, webapp_name, plan))
-        r = requests.get(
-            'http://{}.azurewebsites.net'.format(webapp_name), timeout=240)
-        # verify the web page
-        self.assertTrue('Ruby on Rails in Web Apps on Linux' in str(r.content))
         # verify app settings
         self.cmd('webapp config appsettings list -g {} -n {}'.format(resource_group, webapp_name), checks=[
             JMESPathCheck('[0].name', 'WEBSITES_ENABLE_APP_SERVICE_STORAGE'),