Skip to content
Merged
Show file tree
Hide file tree
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
21 changes: 20 additions & 1 deletion src/fastapi_cloud_cli/utils/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,22 @@ def _handle_unauthorized(auth_mode: AuthMode) -> str:
return message


def _get_response_error_message(response: httpx.Response) -> str | None:
try:
data = response.json()
except (json.JSONDecodeError, httpx.ResponseNotRead):
return None

if not isinstance(data, dict):
return None # pragma: no cover

detail = data.get("detail")
if not isinstance(detail, str):
return None # pragma: no cover

return detail


def handle_http_error(
error: httpx.HTTPError,
default_message: str | None = None,
Expand All @@ -227,7 +243,10 @@ def handle_http_error(
message = _handle_unauthorized(auth_mode=auth_mode)

elif status_code == 403:
message = "You don't have permissions for this resource"
message = (
_get_response_error_message(error.response)
or "You don't have permissions for this resource"
)

if not message:
message = (
Expand Down
29 changes: 29 additions & 0 deletions tests/test_cli_deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,35 @@ def test_creates_app_on_backend(
assert "App created successfully" in result.output


@pytest.mark.respx
def test_shows_api_message_when_create_app_is_forbidden(
logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
) -> None:
steps = [Keys.ENTER, Keys.ENTER, *"demo", Keys.ENTER, Keys.ENTER, Keys.ENTER]
team = _get_random_team()

respx_mock.get("/teams/").mock(return_value=Response(200, json={"data": [team]}))
respx_mock.post(
"/apps/", json={"name": "demo", "team_id": team["id"], "directory": None}
).mock(
return_value=Response(
403,
json={"detail": "App limit reached"},
)
)

with (
changing_dir(tmp_path),
patch("rich_toolkit.container.getchar") as mock_getchar,
):
mock_getchar.side_effect = steps

result = runner.invoke(app, ["deploy"])

assert result.exit_code == 1
assert "App limit reached" in result.output


@pytest.mark.respx
def test_creates_app_with_directory(
logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
Expand Down
Loading