Skip to content

[App Service] Fix #26445: az webapp deploy: Fix deployment failing with HTTP 400 #26452

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 4 commits into from
May 17, 2023
Merged

[App Service] Fix #26445: az webapp deploy: Fix deployment failing with HTTP 400 #26452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbf52de
fix onedeploy
StrawnSC May 16, 2023
e039f95
fix onedeploy
StrawnSC May 16, 2023
9a193df
merge
StrawnSC May 16, 2023
b50061d
rerecord tests
StrawnSC May 16, 2023
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
23 changes: 19 additions & 4 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 @@ -613,7 +613,7 @@ def enable_zip_deploy(cmd, resource_group_name, name, src, timeout=None, slot=No
# check the status of async deployment
if res.status_code == 202:
response = _check_zip_deployment_status(cmd, resource_group_name, name, deployment_status_url,
headers, timeout)
slot, timeout)
return response

# check if there's an ongoing process
Expand Down Expand Up @@ -4097,10 +4097,11 @@ def list_locations(cmd, sku, linux_workers_enabled=None):
return [geo_region for geo_region in web_client_geo_regions if geo_region.name in providers_client_locations_list]


def _check_zip_deployment_status(cmd, rg_name, name, deployment_status_url, headers, timeout=None):
def _check_zip_deployment_status(cmd, rg_name, name, deployment_status_url, slot, timeout=None):
import requests
from azure.cli.core.util import should_disable_connection_verify

headers = get_scm_site_headers(cmd.cli_ctx, name, rg_name, slot)
total_trials = (int(timeout) // 2) if timeout else 450
num_trials = 0
while num_trials < total_trials:
Expand Down Expand Up @@ -5031,6 +5032,20 @@ def _build_onedeploy_url(params):
return deploy_url


def _get_ondeploy_headers(params):
if params.src_path:
content_type = 'application/octet-stream'
elif params.src_url:
content_type = 'application/json'
else:
raise RequiredArgumentMissingError('Unable to determine source location of the artifact being deployed')

additional_headers = {"Content-Type": content_type, "Cache-Control": "no-cache"}

return get_scm_site_headers(params.cmd.cli_ctx, params.webapp_name, params.resource_group_name, params.slot,
additional_headers=additional_headers)


def _get_onedeploy_status_url(params):
scm_url = _get_scm_url(params.cmd, params.resource_group_name, params.webapp_name, params.slot)
return scm_url + '/api/deployments/latest'
Expand Down Expand Up @@ -5085,7 +5100,7 @@ def _make_onedeploy_request(params):
body = _get_onedeploy_request_body(params)
deploy_url = _build_onedeploy_url(params)
deployment_status_url = _get_onedeploy_status_url(params)
headers = get_scm_site_headers(params.cmd.cli_ctx, params.webapp_name, params.resource_group_name, params.slot)
headers = _get_ondeploy_headers(params)

logger.info("Deployment API: %s", deploy_url)
response = requests.post(deploy_url, data=body, headers=headers, verify=not should_disable_connection_verify())
Expand All @@ -5100,7 +5115,7 @@ def _make_onedeploy_request(params):
if poll_async_deployment_for_debugging:
logger.info('Polling the status of async deployment')
response_body = _check_zip_deployment_status(params.cmd, params.resource_group_name, params.webapp_name,
deployment_status_url, headers, params.timeout)
deployment_status_url, params.slot, params.timeout)
logger.info('Async deployment complete. Server response: %s', response_body)
return response_body

Expand Down
Loading