Skip to content

{appservice} Fix exception in functionapp ssl bind #21238

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

Closed
calvinsID wants to merge 1 commit into from
Closed

{appservice} Fix exception in functionapp ssl bind #21238

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
13 changes: 9 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 @@ -2741,7 +2741,7 @@ def _update_host_name_ssl_state(cmd, resource_group_name, webapp_name, webapp,
slot, updated_webapp)


def _update_ssl_binding(cmd, resource_group_name, name, certificate_thumbprint, ssl_type, slot=None):
def _update_ssl_binding(cmd, resource_group_name, name, certificate_thumbprint, ssl_type, slot=None, cmd_app_type="webapp"):
client = web_client_factory(cmd.cli_ctx)
webapp = client.web_apps.get(resource_group_name, name)
if not webapp:
Expand Down Expand Up @@ -2772,21 +2772,26 @@ def _update_ssl_binding(cmd, resource_group_name, name, certificate_thumbprint,
_update_host_name_ssl_state(cmd, resource_group_name, name, webapp,
h, ssl_type, certificate_thumbprint, slot)

return show_webapp(cmd, resource_group_name, name, slot)
if cmd_app_type == 'functionapp':
return show_functionapp(cmd, resource_group_name, name, slot)
else:
return show_webapp(cmd, resource_group_name, name, slot)

raise ResourceNotFoundError("Certificate for thumbprint '{}' not found.".format(certificate_thumbprint))


def bind_ssl_cert(cmd, resource_group_name, name, certificate_thumbprint, ssl_type, slot=None):
SslState = cmd.get_models('SslState')
app_type = 'functionapp' if cmd.name and 'functionapp' in cmd.name.lower() else 'webapp'
return _update_ssl_binding(cmd, resource_group_name, name, certificate_thumbprint,
SslState.sni_enabled if ssl_type == 'SNI' else SslState.ip_based_enabled, slot)
SslState.sni_enabled if ssl_type == 'SNI' else SslState.ip_based_enabled, slot, app_type)


def unbind_ssl_cert(cmd, resource_group_name, name, certificate_thumbprint, slot=None):
SslState = cmd.get_models('SslState')
app_type = 'functionapp' if cmd.name and 'functionapp' in cmd.name.lower() else 'webapp'
return _update_ssl_binding(cmd, resource_group_name, name,
certificate_thumbprint, SslState.disabled, slot)
certificate_thumbprint, SslState.disabled, slot, app_type)


def _match_host_names_from_cert(hostnames_from_cert, hostnames_in_webapp):
Expand Down