Skip to content

{App Service} Removing hard coded app service api-versions #24017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 1 commit into from
Sep 28, 2022
Merged

{App Service} Removing hard coded app service api-versions #24017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/azure-cli/azure/cli/command_modules/appservice/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3006,7 +3006,7 @@ def _match_host_names_from_cert(hostnames_from_cert, hostnames_in_webapp):
class _AbstractStackRuntimeHelper:
def __init__(self, cmd, linux=False, windows=False):
self._cmd = cmd
self._client = web_client_factory(cmd.cli_ctx, api_version="2021-01-15")
self._client = web_client_factory(cmd.cli_ctx)
self._linux = linux
self._windows = windows
self._stacks = []
Expand Down Expand Up @@ -3861,14 +3861,13 @@ def _validate_and_get_connection_string(cli_ctx, resource_group_name, storage_ac


def list_consumption_locations(cmd):
# Temporary fix due to regression in this specific API with 2021-03-01, should be removed with the next SDK update
client = web_client_factory(cmd.cli_ctx, api_version='2020-09-01')
client = web_client_factory(cmd.cli_ctx)
regions = client.list_geo_regions(sku='Dynamic')
return [{'name': x.name.lower().replace(' ', '')} for x in regions]


def list_locations(cmd, sku, linux_workers_enabled=None):
web_client = web_client_factory(cmd.cli_ctx, api_version="2020-09-01")
web_client = web_client_factory(cmd.cli_ctx)
full_sku = get_sku_tier(sku)
# Temporary fix due to regression in this specific API with 2021-03-01, should be removed with the next SDK update
web_client_geo_regions = web_client.list_geo_regions(sku=full_sku, linux_workers_enabled=linux_workers_enabled)
Expand Down Expand Up @@ -4340,7 +4339,7 @@ def _add_vnet_integration(cmd, name, resource_group_name, vnet, subnet, slot=Non
resource_group_name=resource_group_name,
subnet=subnet,
vnet=vnet)
client = web_client_factory(cmd.cli_ctx, api_version="2021-01-01")
client = web_client_factory(cmd.cli_ctx)

app = _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'get', slot, client=client)

Expand Down
443 changes: 203 additions & 240 deletions .../cli/command_modules/appservice/tests/latest/recordings/test_acr_create_function_app.yaml
View file
Open in desktop

Large diffs are not rendered by default.

398 changes: 185 additions & 213 deletions .../command_modules/appservice/tests/latest/recordings/test_acr_deployment_function_app.yaml
View file
Open in desktop

Large diffs are not rendered by default.

471 changes: 236 additions & 235 deletions ...li/azure/cli/command_modules/appservice/tests/latest/recordings/test_acr_integration.yaml
View file
Open in desktop

Large diffs are not rendered by default.

496 changes: 230 additions & 266 deletions ...command_modules/appservice/tests/latest/recordings/test_acr_integration_function_app.yaml
View file
Open in desktop

Large diffs are not rendered by default.

130 changes: 65 additions & 65 deletions ...cli/azure/cli/command_modules/appservice/tests/latest/recordings/test_asp_ws1_create.yaml
View file
Open in desktop

Large diffs are not rendered by default.

130 changes: 65 additions & 65 deletions ...cli/azure/cli/command_modules/appservice/tests/latest/recordings/test_asp_ws2_create.yaml
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions ...cli/azure/cli/command_modules/appservice/tests/latest/recordings/test_asp_ws3_create.yaml
View file
Open in desktop

Large diffs are not rendered by default.

296 changes: 149 additions & 147 deletions ...i/azure/cli/command_modules/appservice/tests/latest/recordings/test_auto_delete_plan.yaml
View file
Open in desktop

Large diffs are not rendered by default.

156 changes: 78 additions & 78 deletions .../command_modules/appservice/tests/latest/recordings/test_autocreate_asp_for_logicapp.yaml
View file
Open in desktop

Large diffs are not rendered by default.

526 changes: 273 additions & 253 deletions ...i/azure/cli/command_modules/appservice/tests/latest/recordings/test_backup_with_name.yaml
View file
Open in desktop

Large diffs are not rendered by default.

807 changes: 209 additions & 598 deletions ...re/cli/command_modules/appservice/tests/latest/recordings/test_config_backup_restore.yaml
View file
Open in desktop

Large diffs are not rendered by default.

145 changes: 68 additions & 77 deletions ...d_modules/appservice/tests/latest/recordings/test_container_webapp_docker_image_name.yaml
View file
Open in desktop

Large diffs are not rendered by default.

323 changes: 66 additions & 257 deletions ...and_modules/appservice/tests/latest/recordings/test_container_webapp_long_server_url.yaml
View file
Open in desktop

Large diffs are not rendered by default.

297 changes: 147 additions & 150 deletions ...li/command_modules/appservice/tests/latest/recordings/test_create_in_different_group.yaml
View file
Open in desktop

Large diffs are not rendered by default.

556 changes: 192 additions & 364 deletions ...mmand_modules/appservice/tests/latest/recordings/test_create_in_different_group_name.yaml
View file
Open in desktop

Large diffs are not rendered by default.

444 changes: 174 additions & 270 deletions ...ure-cli/azure/cli/command_modules/appservice/tests/latest/recordings/test_deploy_zip.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,067 changes: 536 additions & 531 deletions ...ure/cli/command_modules/appservice/tests/latest/recordings/test_download_win_web_log.yaml
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions ...azure/cli/command_modules/appservice/tests/latest/recordings/test_elastic_scale_plan.yaml
View file
Open in desktop

Large diffs are not rendered by default.

149 changes: 71 additions & 78 deletions ...d_modules/appservice/tests/latest/recordings/test_functionapp_access_restriction_add.yaml
View file
Open in desktop

Large diffs are not rendered by default.

168 changes: 79 additions & 89 deletions ...ests/latest/recordings/test_functionapp_access_restriction_add_ip_address_validation.yaml
View file
Open in desktop

Large diffs are not rendered by default.

157 changes: 75 additions & 82 deletions ...dules/appservice/tests/latest/recordings/test_functionapp_access_restriction_add_scm.yaml
View file
Open in desktop

Large diffs are not rendered by default.

247 changes: 115 additions & 132 deletions ...ice/tests/latest/recordings/test_functionapp_access_restriction_add_service_endpoint.yaml
View file
Open in desktop

Large diffs are not rendered by default.

167 changes: 79 additions & 88 deletions ...odules/appservice/tests/latest/recordings/test_functionapp_access_restriction_remove.yaml
View file
Open in desktop

Large diffs are not rendered by default.

169 changes: 80 additions & 89 deletions ...es/appservice/tests/latest/recordings/test_functionapp_access_restriction_remove_scm.yaml
View file
Open in desktop

Large diffs are not rendered by default.

164 changes: 78 additions & 86 deletions ...s/appservice/tests/latest/recordings/test_functionapp_access_restriction_set_complex.yaml
View file
Open in desktop

Large diffs are not rendered by default.

144 changes: 69 additions & 75 deletions ...es/appservice/tests/latest/recordings/test_functionapp_access_restriction_set_simple.yaml
View file
Open in desktop

Large diffs are not rendered by default.

139 changes: 67 additions & 72 deletions ..._modules/appservice/tests/latest/recordings/test_functionapp_access_restriction_show.yaml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions ...command_modules/appservice/tests/latest/recordings/test_functionapp_app_service_plan.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ interactions:
ParameterSetName:
- -g -n --sku
User-Agent:
- AZURECLI/2.38.0 azsdk-python-azure-mgmt-resource/21.1.0b1 Python/3.8.13 (macOS-12.4-x86_64-i386-64bit)
- AZURECLI/2.40.0 azsdk-python-azure-mgmt-resource/21.1.0b1 Python/3.8.2 (macOS-10.16-x86_64-i386-64bit)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2021-04-01
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"francecentral","tags":{"product":"azurecli","cause":"automation","date":"2022-07-14T23:49:02Z"},"properties":{"provisioningState":"Succeeded"}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"francecentral","tags":{"product":"azurecli","cause":"automation","date":"2022-09-26T22:39:27Z"},"properties":{"provisioningState":"Succeeded"}}'
headers:
cache-control:
- no-cache
Expand All @@ -27,7 +27,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Thu, 14 Jul 2022 23:49:05 GMT
- Mon, 26 Sep 2022 22:39:29 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -60,24 +60,24 @@ interactions:
ParameterSetName:
- -g -n --sku
User-Agent:
- AZURECLI/2.38.0 azsdk-python-azure-mgmt-web/7.0.0 Python/3.8.13 (macOS-12.4-x86_64-i386-64bit)
- AZURECLI/2.40.0 azsdk-python-azure-mgmt-web/7.0.0 Python/3.8.2 (macOS-10.16-x86_64-i386-64bit)
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/funcappplan000002?api-version=2022-03-01
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/funcappplan000002","name":"funcappplan000002","type":"Microsoft.Web/serverfarms","kind":"app","location":"francecentral","properties":{"serverFarmId":10828,"name":"funcappplan000002","sku":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1},"workerSize":"Default","workerSizeId":0,"workerTierName":null,"numberOfWorkers":1,"currentWorkerSize":"Default","currentWorkerSizeId":0,"currentNumberOfWorkers":1,"status":"Ready","webSpace":"clitest.rg000001-FranceCentralwebspace","subscription":"2edc29f4-b81f-494b-a624-cc619903b837","adminSiteName":null,"hostingEnvironment":null,"hostingEnvironmentProfile":null,"maximumNumberOfWorkers":0,"planName":"VirtualDedicatedPlan","adminRuntimeSiteName":null,"computeMode":"Dedicated","siteMode":null,"geoRegion":"France
Central","perSiteScaling":false,"elasticScaleEnabled":false,"maximumElasticWorkerCount":1,"numberOfSites":0,"hostingEnvironmentId":null,"isSpot":false,"spotExpirationTime":null,"freeOfferExpirationTime":null,"tags":null,"kind":"app","resourceGroup":"clitest.rg000001","reserved":false,"isXenon":false,"hyperV":false,"mdmId":"waws-prod-par-025_10828","targetWorkerCount":0,"targetWorkerSizeId":0,"provisioningState":"Succeeded","webSiteId":null,"existingServerFarmIds":null,"kubeEnvironmentProfile":null,"zoneRedundant":false},"sku":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/funcappplan000002","name":"funcappplan000002","type":"Microsoft.Web/serverfarms","kind":"app","location":"francecentral","properties":{"serverFarmId":2271,"name":"funcappplan000002","sku":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1},"workerSize":"Default","workerSizeId":0,"workerTierName":null,"numberOfWorkers":1,"currentWorkerSize":"Default","currentWorkerSizeId":0,"currentNumberOfWorkers":1,"status":"Ready","webSpace":"clitest.rg000001-FranceCentralwebspace","subscription":"e483435e-282d-4ac1-92b5-d6123f2aa360","adminSiteName":null,"hostingEnvironment":null,"hostingEnvironmentProfile":null,"maximumNumberOfWorkers":0,"planName":"VirtualDedicatedPlan","adminRuntimeSiteName":null,"computeMode":"Dedicated","siteMode":null,"geoRegion":"France
Central","perSiteScaling":false,"elasticScaleEnabled":false,"maximumElasticWorkerCount":1,"numberOfSites":0,"hostingEnvironmentId":null,"isSpot":false,"spotExpirationTime":null,"freeOfferExpirationTime":null,"tags":null,"kind":"app","resourceGroup":"clitest.rg000001","reserved":false,"isXenon":false,"hyperV":false,"mdmId":"waws-prod-par-027_2271","targetWorkerCount":0,"targetWorkerSizeId":0,"provisioningState":"Succeeded","webSiteId":null,"existingServerFarmIds":null,"kubeEnvironmentProfile":null,"zoneRedundant":false},"sku":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}}'
headers:
cache-control:
- no-cache
content-length:
- '1505'
- '1503'
content-type:
- application/json
date:
- Thu, 14 Jul 2022 23:49:16 GMT
- Mon, 26 Sep 2022 22:39:39 GMT
etag:
- '"1D897DC5339EA15"'
- '"1D8D1F8DC01DAF5"'
expires:
- '-1'
pragma:
Expand All @@ -95,7 +95,7 @@ interactions:
x-content-type-options:
- nosniff
x-ms-ratelimit-remaining-subscription-writes:
- '1198'
- '1196'
x-powered-by:
- ASP.NET
status:
Expand Down
18 changes: 9 additions & 9 deletions ...d_modules/appservice/tests/latest/recordings/test_functionapp_app_service_plan_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ interactions:
ParameterSetName:
- -g -n --sku --is-linux
User-Agent:
- AZURECLI/2.38.0 azsdk-python-azure-mgmt-resource/21.1.0b1 Python/3.8.13 (macOS-12.4-x86_64-i386-64bit)
- AZURECLI/2.40.0 azsdk-python-azure-mgmt-resource/21.1.0b1 Python/3.8.2 (macOS-10.16-x86_64-i386-64bit)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2021-04-01
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"ukwest","tags":{"product":"azurecli","cause":"automation","date":"2022-07-14T23:49:54Z"},"properties":{"provisioningState":"Succeeded"}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"ukwest","tags":{"product":"azurecli","cause":"automation","date":"2022-09-26T22:41:05Z"},"properties":{"provisioningState":"Succeeded"}}'
headers:
cache-control:
- no-cache
Expand All @@ -27,7 +27,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Thu, 14 Jul 2022 23:49:56 GMT
- Mon, 26 Sep 2022 22:41:07 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -61,13 +61,13 @@ interactions:
ParameterSetName:
- -g -n --sku --is-linux
User-Agent:
- AZURECLI/2.38.0 azsdk-python-azure-mgmt-web/7.0.0 Python/3.8.13 (macOS-12.4-x86_64-i386-64bit)
- AZURECLI/2.40.0 azsdk-python-azure-mgmt-web/7.0.0 Python/3.8.2 (macOS-10.16-x86_64-i386-64bit)
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/funcappplan000002?api-version=2022-03-01
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/funcappplan000002","name":"funcappplan000002","type":"Microsoft.Web/serverfarms","kind":"linux","location":"ukwest","properties":{"serverFarmId":17868,"name":"funcappplan000002","sku":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1},"workerSize":"Default","workerSizeId":0,"workerTierName":null,"numberOfWorkers":1,"currentWorkerSize":"Default","currentWorkerSizeId":0,"currentNumberOfWorkers":1,"status":"Ready","webSpace":"clitest.rg000001-UKWestwebspace-Linux","subscription":"2edc29f4-b81f-494b-a624-cc619903b837","adminSiteName":null,"hostingEnvironment":null,"hostingEnvironmentProfile":null,"maximumNumberOfWorkers":0,"planName":"VirtualDedicatedPlan","adminRuntimeSiteName":null,"computeMode":"Dedicated","siteMode":null,"geoRegion":"UK
West","perSiteScaling":false,"elasticScaleEnabled":false,"maximumElasticWorkerCount":1,"numberOfSites":0,"hostingEnvironmentId":null,"isSpot":false,"spotExpirationTime":null,"freeOfferExpirationTime":null,"tags":null,"kind":"linux","resourceGroup":"clitest.rg000001","reserved":true,"isXenon":false,"hyperV":false,"mdmId":"waws-prod-cw1-021_17868","targetWorkerCount":0,"targetWorkerSizeId":0,"provisioningState":"Succeeded","webSiteId":null,"existingServerFarmIds":null,"kubeEnvironmentProfile":null,"zoneRedundant":false},"sku":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/funcappplan000002","name":"funcappplan000002","type":"Microsoft.Web/serverfarms","kind":"linux","location":"ukwest","properties":{"serverFarmId":27397,"name":"funcappplan000002","sku":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1},"workerSize":"Default","workerSizeId":0,"workerTierName":null,"numberOfWorkers":1,"currentWorkerSize":"Default","currentWorkerSizeId":0,"currentNumberOfWorkers":1,"status":"Ready","webSpace":"clitest.rg000001-UKWestwebspace-Linux","subscription":"e483435e-282d-4ac1-92b5-d6123f2aa360","adminSiteName":null,"hostingEnvironment":null,"hostingEnvironmentProfile":null,"maximumNumberOfWorkers":0,"planName":"VirtualDedicatedPlan","adminRuntimeSiteName":null,"computeMode":"Dedicated","siteMode":null,"geoRegion":"UK
West","perSiteScaling":false,"elasticScaleEnabled":false,"maximumElasticWorkerCount":1,"numberOfSites":0,"hostingEnvironmentId":null,"isSpot":false,"spotExpirationTime":null,"freeOfferExpirationTime":null,"tags":null,"kind":"linux","resourceGroup":"clitest.rg000001","reserved":true,"isXenon":false,"hyperV":false,"mdmId":"waws-prod-cw1-021_27397","targetWorkerCount":0,"targetWorkerSizeId":0,"provisioningState":"Succeeded","webSiteId":null,"existingServerFarmIds":null,"kubeEnvironmentProfile":null,"zoneRedundant":false},"sku":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}}'
headers:
cache-control:
- no-cache
Expand All @@ -76,9 +76,9 @@ interactions:
content-type:
- application/json
date:
- Thu, 14 Jul 2022 23:50:06 GMT
- Mon, 26 Sep 2022 22:41:16 GMT
etag:
- '"1D897DC718D9615"'
- '"1D8D1F916191235"'
expires:
- '-1'
pragma:
Expand All @@ -96,7 +96,7 @@ interactions:
x-content-type-options:
- nosniff
x-ms-ratelimit-remaining-subscription-writes:
- '1198'
- '1195'
x-powered-by:
- ASP.NET
status:
Expand Down
Loading