diff --git a/src/appservice-kube/HISTORY.rst b/src/appservice-kube/HISTORY.rst index 3e3b15de4b6..e34bea6e3b5 100644 --- a/src/appservice-kube/HISTORY.rst +++ b/src/appservice-kube/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +0.1.5 +++++++ +* SSL bind bug fix + 0.1.4 ++++++ * Ensure compatibility of 'az webapp create' and 'az functionapp create' with CLI version 2.34.0 diff --git a/src/appservice-kube/azext_appservice_kube/_constants.py b/src/appservice-kube/azext_appservice_kube/_constants.py index ee8eed8f8d8..749ba74934f 100644 --- a/src/appservice-kube/azext_appservice_kube/_constants.py +++ b/src/appservice-kube/azext_appservice_kube/_constants.py @@ -3,9 +3,6 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import os - - KUBE_DEFAULT_SKU = "K1" KUBE_ASP_KIND = "linux,kubernetes" KUBE_APP_KIND = "linux,kubernetes,app" diff --git a/src/appservice-kube/azext_appservice_kube/custom.py b/src/appservice-kube/azext_appservice_kube/custom.py index 9a950bc4efd..15c4cfbe75b 100644 --- a/src/appservice-kube/azext_appservice_kube/custom.py +++ b/src/appservice-kube/azext_appservice_kube/custom.py @@ -18,7 +18,6 @@ update_container_settings, _rename_server_farm_props, get_site_configs, - get_webapp, _get_site_credential, _format_fx_version, _get_extension_version_functionapp, @@ -472,7 +471,9 @@ def _get_kube_env_from_custom_location(cmd, custom_location, resource_group): if kube.extended_location and kube.extended_location.type == "CustomLocation": parsed_custom_location_2 = parse_resource_id(kube.extended_location.name) - if parsed_custom_location_2["name"].lower() == custom_location_name.lower() and parsed_custom_location_2.get("resource_group").lower() == resource_group.lower(): + matched_name = parsed_custom_location_2["name"].lower() == custom_location_name.lower() + matched_rg = parsed_custom_location_2.get("resource_group").lower() == resource_group.lower() + if matched_name and matched_rg: kube_environment_id = kube.id break @@ -1727,9 +1728,10 @@ def _update_ssl_binding(cmd, resource_group_name, name, certificate_thumbprint, found_cert = webapp_cert if found_cert: if len(found_cert.host_names) == 1 and not found_cert.host_names[0].startswith('*'): - return _update_host_name_ssl_state(cmd, resource_group_name, name, webapp, - found_cert.host_names[0], ssl_type, - certificate_thumbprint, slot) + _update_host_name_ssl_state(cmd, resource_group_name, name, webapp, + found_cert.host_names[0], ssl_type, + certificate_thumbprint, slot) + return show_webapp(cmd, resource_group_name, name, slot) query_result = list_hostnames(cmd, resource_group_name, name, slot) hostnames_in_webapp = [x.name.split('/')[-1] for x in query_result] diff --git a/src/appservice-kube/setup.py b/src/appservice-kube/setup.py index 9ef132e72cc..54b1183843c 100644 --- a/src/appservice-kube/setup.py +++ b/src/appservice-kube/setup.py @@ -16,7 +16,7 @@ # TODO: Confirm this is the right version number you want and it matches your # HISTORY.rst entry. -VERSION = '0.1.4' +VERSION = '0.1.5' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers @@ -60,4 +60,4 @@ package_data={'azext_appservice_kube': ['azext_metadata.json', 'resources/LinuxFunctionsStacks.json', 'resources/WindowsFunctionsStacks.json']}, -) \ No newline at end of file +)