Skip to content
Merged
Changes from all commits
Commits
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
28 changes: 15 additions & 13 deletions src/azure-cli/azure/cli/command_modules/appservice/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -463,19 +463,20 @@ def check_language_runtime(cmd, resource_group_name, name):
app = client.web_apps.get(resource_group_name, name)
is_linux = app.reserved
if is_functionapp(app):
is_flex = is_flex_functionapp(cmd.cli_ctx, resource_group_name, name)
runtime_info = _get_functionapp_runtime_info(cmd, resource_group_name, name, None, is_linux)
runtime = runtime_info['app_runtime']
runtime_version = runtime_info['app_runtime_version']
functions_version = runtime_info['functionapp_version']
try:
if not is_flex:
runtime_helper = _FunctionAppStackRuntimeHelper(cmd=cmd, linux=is_linux, windows=(not is_linux))
runtime_helper.resolve(runtime, runtime_version, functions_version, is_linux)
else:
location = app.location
runtime_helper = _FlexFunctionAppStackRuntimeHelper(cmd, location, runtime, runtime_version)
runtime_helper.resolve(runtime, runtime_version)
is_flex = is_flex_functionapp(cmd.cli_ctx, resource_group_name, name)
runtime_info = _get_functionapp_runtime_info(cmd, resource_group_name, name, None, is_linux)
runtime = runtime_info['app_runtime']
runtime_version = runtime_info['app_runtime_version']
functions_version = runtime_info['functionapp_version']
if runtime and runtime_version:
if not is_flex:
runtime_helper = _FunctionAppStackRuntimeHelper(cmd=cmd, linux=is_linux, windows=(not is_linux))
runtime_helper.resolve(runtime, runtime_version, functions_version, is_linux)
else:
location = app.location
runtime_helper = _FlexFunctionAppStackRuntimeHelper(cmd, location, runtime, runtime_version)
runtime_helper.resolve(runtime, runtime_version)
except ValidationError as e:
logger.warning(e.error_msg)

Expand Down Expand Up @@ -8188,7 +8189,8 @@ def _get_app_runtime_info_helper(cmd, app_runtime, app_runtime_version, is_linux
def _get_functionapp_runtime_info_helper(cmd, app_runtime, app_runtime_version, functionapp_version, is_linux):
if is_linux:
if len(app_runtime.split('|')) < 2:
raise ValidationError(f"Runtime {app_runtime} is not supported.")
raise ValidationError("Could not detect runtime. To configure linuxFxVersion, "
"please visit https://aka.ms/linuxFxVersion")
app_runtime_version = app_runtime.split('|')[1]
app_runtime = app_runtime.split('|')[0].lower()

Expand Down