Skip to content

[AppService] Bugfix: Handle if only single publish profile is returned #17495

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
qwordy merged 4 commits into from
Apr 7, 2021
Merged

[AppService] Bugfix: Handle if only single publish profile is returned #17495

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cffaae
Handle if only single publish profile is returned
calvinsID Mar 29, 2021
ce8fe56
Make cleaner
calvinsID Mar 29, 2021
e0071d1
Remove unused variable
calvinsID Apr 6, 2021
fba8740
Add linux_fx version if not windows
calvinsID Apr 6, 2021
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
14 changes: 11 additions & 3 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 @@ -1053,8 +1053,11 @@ def get_azure_storage_accounts(cmd, resource_group_name, name, slot=None):

def _fill_ftp_publishing_url(cmd, webapp, resource_group_name, name, slot=None):
profiles = list_publish_profiles(cmd, resource_group_name, name, slot)
url = next(p['publishUrl'] for p in profiles if p['publishMethod'] == 'FTP')
setattr(webapp, 'ftpPublishingUrl', url)
try:
url = next(p['publishUrl'] for p in profiles if p['publishMethod'] == 'FTP')
setattr(webapp, 'ftpPublishingUrl', url)
except StopIteration:
pass
return webapp


Expand All @@ -1080,7 +1083,7 @@ def _add_fx_version(cmd, resource_group_name, name, custom_image_name, slot=None
web_app = get_webapp(cmd, resource_group_name, name, slot)
if not web_app:
raise CLIError("'{}' app doesn't exist in resource group {}".format(name, resource_group_name))
linux_fx = fx_version if web_app.reserved else None
linux_fx = fx_version if (web_app.reserved or not web_app.is_xenon) else None
windows_fx = fx_version if web_app.is_xenon else None
return update_site_configs(cmd, resource_group_name, name,
linux_fx_version=linux_fx, windows_fx_version=windows_fx, slot=slot)
Expand Down Expand Up @@ -2009,13 +2012,18 @@ def list_publish_profiles(cmd, resource_group_name, name, slot=None, xml=False):
if not xml:
profiles = xmltodict.parse(full_xml, xml_attribs=True)['publishData']['publishProfile']
converted = []

if not isinstance(profiles, list):
profiles = [profiles]

for profile in profiles:
new = {}
for key in profile:
# strip the leading '@' xmltodict put in for attributes
new[key.lstrip('@')] = profile[key]
converted.append(new)
return converted

cmd.cli_ctx.invocation.data['output'] = 'tsv'
return full_xml

Expand Down