From ba4bee2f11de54024b0253982eab3fc9dcb378e9 Mon Sep 17 00:00:00 2001 From: Navy Aziz Date: Tue, 18 Jul 2023 00:58:37 -0700 Subject: [PATCH] Fix s-cloud breaks for 'az webapp show' and 'az appservice plan show' commands --- src/azure-cli/azure/cli/command_modules/appservice/custom.py | 2 +- src/azure-cli/azure/cli/command_modules/appservice/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/appservice/custom.py b/src/azure-cli/azure/cli/command_modules/appservice/custom.py index 847f8962565..509c02d7a92 100644 --- a/src/azure-cli/azure/cli/command_modules/appservice/custom.py +++ b/src/azure-cli/azure/cli/command_modules/appservice/custom.py @@ -2178,7 +2178,7 @@ def update_app_service_plan(instance, sku=None, number_of_workers=None, elastic_ def show_plan(cmd, resource_group_name, name): from azure.cli.core.commands.client_factory import get_subscription_id client = web_client_factory(cmd.cli_ctx) - serverfarm_url_base = 'subscriptions/{}/resourceGroups/{}/providers/Microsoft.Web/serverfarms/{}?api-version={}' + serverfarm_url_base = '/subscriptions/{}/resourceGroups/{}/providers/Microsoft.Web/serverfarms/{}?api-version={}' subscription_id = get_subscription_id(cmd.cli_ctx) serverfarm_url = serverfarm_url_base.format(subscription_id, resource_group_name, name, client.DEFAULT_API_VERSION) request_url = cmd.cli_ctx.cloud.endpoints.resource_manager + serverfarm_url diff --git a/src/azure-cli/azure/cli/command_modules/appservice/utils.py b/src/azure-cli/azure/cli/command_modules/appservice/utils.py index 83b1ffc4a07..71e355d3835 100644 --- a/src/azure-cli/azure/cli/command_modules/appservice/utils.py +++ b/src/azure-cli/azure/cli/command_modules/appservice/utils.py @@ -163,7 +163,7 @@ def _get_location_from_resource_group(cli_ctx, resource_group_name): def show_raw_functionapp(cmd, resource_group_name, name): client = web_client_factory(cmd.cli_ctx) - site_url_base = 'subscriptions/{}/resourceGroups/{}/providers/Microsoft.Web/sites/{}?api-version={}' + site_url_base = '/subscriptions/{}/resourceGroups/{}/providers/Microsoft.Web/sites/{}?api-version={}' subscription_id = get_subscription_id(cmd.cli_ctx) site_url = site_url_base.format(subscription_id, resource_group_name, name, client.DEFAULT_API_VERSION) request_url = cmd.cli_ctx.cloud.endpoints.resource_manager + site_url