From 330fb04dbb1f2ab5d882539b616ea88720870f86 Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Wed, 13 Sep 2023 20:04:20 +0800 Subject: [PATCH 1/2] update --- src/appservice-kube/HISTORY.rst | 4 ++++ src/appservice-kube/azext_appservice_kube/_help.py | 2 +- src/appservice-kube/azext_appservice_kube/custom.py | 4 ++++ src/appservice-kube/setup.py | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/appservice-kube/HISTORY.rst b/src/appservice-kube/HISTORY.rst index f99aa0259dd..d50f8272a35 100644 --- a/src/appservice-kube/HISTORY.rst +++ b/src/appservice-kube/HISTORY.rst @@ -2,6 +2,10 @@ Release History =============== +0.1.9 +++++++ +* `az webapp scale`: Add validation to reject non-arc enabled app service + 0.1.8 ++++++ * Fix appservice kube - No module named 'azure.mgmt.web.v2021_01_01' diff --git a/src/appservice-kube/azext_appservice_kube/_help.py b/src/appservice-kube/azext_appservice_kube/_help.py index b63ecbac9d8..e030c3a8ca5 100644 --- a/src/appservice-kube/azext_appservice_kube/_help.py +++ b/src/appservice-kube/azext_appservice_kube/_help.py @@ -9,7 +9,7 @@ helps['webapp scale'] = """ type: command -short-summary: Modify the number of instances of a webapp. +short-summary: Modify the number of instances of a webapp on Arc enabled Kubernetes workloads . examples: - name: Change the number of instances of MyApp to 2. text: > diff --git a/src/appservice-kube/azext_appservice_kube/custom.py b/src/appservice-kube/azext_appservice_kube/custom.py index b1563b554d0..948c12ff897 100644 --- a/src/appservice-kube/azext_appservice_kube/custom.py +++ b/src/appservice-kube/azext_appservice_kube/custom.py @@ -981,6 +981,10 @@ def set_webapp(cmd, resource_group_name, name, slot=None, **kwargs): # pylint: def scale_webapp(cmd, resource_group_name, name, instance_count, slot=None): + client = web_client_factory(cmd.cli_ctx) + webapp = client.web_apps.get(resource_group_name, name) + if not webapp.extended_location: + raise ValidationError("The web app {} is not on Arc enabled Kubernetes. Please use `az appservice plan update` to scale for non-arc enabled app service.".format(name)) return update_site_configs(cmd, resource_group_name, name, number_of_workers=instance_count, slot=slot) diff --git a/src/appservice-kube/setup.py b/src/appservice-kube/setup.py index 520a0875d90..62587f81a88 100644 --- a/src/appservice-kube/setup.py +++ b/src/appservice-kube/setup.py @@ -16,7 +16,7 @@ # TODO: Confirm this is the right version number you want and it matches your # HISTORY.rst entry. -VERSION = '0.1.8' +VERSION = '0.1.9' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers From e7de20c29aff31f2b04b7c12d8e7e510591e3deb Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Wed, 13 Sep 2023 20:08:36 +0800 Subject: [PATCH 2/2] update code owner --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c59d1003879..e0875fb4a14 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -150,7 +150,7 @@ /src/kusto/ @ilayr @orhasban @astauben -/src/appservice-kube/ @ebencarek @calcha @StrawnSC +/src/appservice-kube/ @ebencarek @howang-ms @Juliehzl @LaylaLiu-gmail /src/custom-providers/ @jsntcy