Skip to content

{Error Improvement} Catch and categorize HttpError in core exception handler #15613

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
houk-ms merged 2 commits into from
Oct 22, 2020
Merged

{Error Improvement} Catch and categorize HttpError in core exception handler #15613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fde9df
catch and categorize HttpError in exception handler
houk-ms Oct 22, 2020
97f722d
modify the way to get status code
houk-ms Oct 22, 2020
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
9 changes: 7 additions & 2 deletions src/azure-cli-core/azure/cli/core/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def handle_exception(ex): # pylint: disable=too-many-locals, too-many-statement
from azure.cli.core.azlogging import CommandLoggerContext
from azure.common import AzureException
from azure.core.exceptions import AzureError
from requests.exceptions import SSLError
from requests.exceptions import SSLError, HTTPError
import azure.cli.core.azclierror as azclierror
import traceback

Expand Down Expand Up @@ -125,6 +125,11 @@ def handle_exception(ex): # pylint: disable=too-many-locals, too-many-statement
AzCLIErrorType = get_error_type_by_status_code(status_code)
az_error = AzCLIErrorType(error_msg)

elif isinstance(ex, HTTPError):
status_code = str(getattr(ex.response, 'status_code', 'Unknown Code'))
AzCLIErrorType = get_error_type_by_status_code(status_code)
az_error = AzCLIErrorType(error_msg)

elif isinstance(ex, KeyboardInterrupt):
error_msg = 'Keyboard interrupt is captured.'
az_error = azclierror.ManualInterrupt(error_msg)
Expand Down Expand Up @@ -211,7 +216,7 @@ def get_error_type_by_status_code(status_code):
if status_code.startswith('5'):
return azclierror.AzureInternalError

return azclierror.AzureResponseError
return azclierror.UnknownError


def is_azure_connection_error(error_msg):
Expand Down