Skip to content

fix(odc-cli): report the status for an error response with an empty body #1809

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jay23606 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(odc-cli): report the status for an error response with an empty body #1809

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
11 changes: 10 additions & 1 deletion cli/odc-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ from argparse import (
RawTextHelpFormatter,
)
from datetime import datetime, timezone
from http import HTTPStatus
from typing import Any, Callable
from urllib.error import HTTPError, URLError
from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse, quote
Expand Down Expand Up @@ -214,7 +215,15 @@ class HttpResponse:
props['data'] = self.data
props['statusCode'] = self.status or 'N/A'
elif not self.ok:
props.update(**self.data)
# Every failure carries its status; an API body with its own statusCode still wins.
props['statusCode'] = self.status or 'N/A'
if isinstance(self.data, dict):
props.update(self.data)
else:
try:
props['error'] = HTTPStatus(self.status).phrase
except (TypeError, ValueError):
pass
return to_json(props)

@property
Expand Down