fix(ctl): guard marketplace pagination and JSON parsing, clarify 4xx messages

Author: iddocohen

infrahub_sdk/ctl/marketplace.py

@@ -105,13 +105,17 @@ async def _fetch_listing(
     while True:
         resp = await client.get(url, params=params)
         resp.raise_for_status()
-        payload = resp.json()
+        payload = _json_or_fail(resp, url)
         items.extend(payload.get("items", []))
         total_count = payload.get("total_count", len(items))
         page_info = payload.get("page_info") or {}
-        if limit is not None or not page_info.get("has_next_page"):
+        cursor = page_info.get("end_cursor")
+        # Stop when a single page was requested, when the server reports no more
+        # pages, or when it claims a next page but gives no cursor to follow
+        # (guards against an infinite loop re-requesting the same page).
+        if limit is not None or not page_info.get("has_next_page") or not cursor:
             break
-        params = {**params, "cursor": page_info.get("end_cursor")}
+        params = {**params, "cursor": cursor}
     return items, total_count
 
 
@@ -170,7 +174,7 @@ async def _run_listing(
         except httpx.HTTPError as exc:
             error_class = _classify_http_error(exc)
             if error_class is _ErrorClass.NOT_FOUND:
-                _fail(error_class, f"Marketplace listing not found on {_host_from(resolved_url)}: {exc}")
+                _fail(error_class, f"Marketplace request to {_host_from(resolved_url)} failed: {exc}")
             detail = str(exc) or type(exc).__name__
             _fail(_ErrorClass.NETWORK, f"Marketplace request failed: {detail}")
     if json_output:
@@ -198,6 +202,19 @@ def _classify_http_error(exc: httpx.HTTPError) -> _ErrorClass:
     return _ErrorClass.NETWORK
 
 
+def _json_or_fail(resp: httpx.Response, source_url: str) -> Any:
+    """Parse a JSON response body, failing with a network-class error on invalid JSON.
+
+    A 200 with a malformed body is a broken response, not user error, so it is
+    reported cleanly (exit 2) rather than leaking a raw ``JSONDecodeError`` and
+    traceback — which would also corrupt ``--json`` output.
+    """
+    try:
+        return resp.json()
+    except ValueError:
+        _fail(_ErrorClass.NETWORK, f"Response from {_host_from(source_url)} is not valid JSON.")
+
+
 def _mkdir_or_fail(path: Path) -> None:
     try:
         path.mkdir(parents=True, exist_ok=True)
@@ -422,7 +439,7 @@ async def _fetch_detail(
         if resp.status_code == 404:
             _fail(_ErrorClass.NOT_FOUND, f"No collection named '{namespace}/{name}' found on {_host_from(base_url)}.")
         resp.raise_for_status()
-        return "collection", resp.json()
+        return "collection", _json_or_fail(resp, base_url)
 
     schema_resp, collection_resp = await asyncio.gather(
         client.get(_detail_url(base_url, "schema", namespace, name)),
@@ -435,9 +452,9 @@ async def _fetch_detail(
                 f"[yellow]Note: '{namespace}/{name}' exists as both a schema and a collection. "
                 "Resolving as schema. Pass --collection to force the collection path."
             )
-        return "schema", schema_resp.json()
+        return "schema", _json_or_fail(schema_resp, base_url)
     if isinstance(collection_resp, httpx.Response) and collection_resp.status_code == 200:
-        return "collection", collection_resp.json()
+        return "collection", _json_or_fail(collection_resp, base_url)
 
     if _is_transport_failure(schema_resp) or _is_transport_failure(collection_resp):
         _fail(
@@ -527,7 +544,7 @@ async def show(
         except httpx.HTTPError as exc:
             error_class = _classify_http_error(exc)
             if error_class is _ErrorClass.NOT_FOUND:
-                _fail(error_class, f"Marketplace listing not found on {_host_from(resolved_url)}: {exc}")
+                _fail(error_class, f"Marketplace request for '{parsed.namespace}/{parsed.name}' failed: {exc}")
             message = str(exc) or type(exc).__name__
             _fail(_ErrorClass.NETWORK, f"Marketplace request failed: {message}")
     if json_output:

tests/unit/ctl/test_marketplace_app.py

@@ -1012,3 +1012,56 @@ def test_list_network_error_exits_2_regression(httpx_mock: HTTPXMock) -> None:
 
     assert result.exit_code == 2
     assert "Marketplace request failed" in result.output
+
+
+def test_list_stops_when_next_page_has_null_cursor(httpx_mock: HTTPXMock) -> None:
+    """has_next_page=true with a null end_cursor must not loop forever.
+
+    Only one page is mocked. If the loop followed the (null) cursor it would issue
+    a second request that pytest-httpx has no response for, failing the test.
+    """
+    httpx_mock.add_response(
+        method="GET",
+        url="https://marketplace.infrahub.app/api/v1/schemas",
+        json={
+            "items": [_schema_item("infrahub", "a", display="A", semver="1.0.0", downloads=1, tags=[])],
+            "page_info": {"has_next_page": True, "end_cursor": None},
+            "total_count": 1,
+        },
+    )
+    result = runner.invoke(app, ["list"])
+
+    assert result.exit_code == 0
+    assert "infrahub/a" in result.output
+
+
+def test_list_invalid_json_body_is_network_error(httpx_mock: HTTPXMock) -> None:
+    """A 200 response with a non-JSON body is reported as a clean network error (exit 2)."""
+    httpx_mock.add_response(
+        method="GET",
+        url="https://marketplace.infrahub.app/api/v1/schemas",
+        text="<html>not json</html>",
+    )
+    result = runner.invoke(app, ["list"])
+
+    assert result.exit_code == 2
+    assert "not valid JSON" in result.output
+
+
+def test_show_invalid_json_body_is_network_error(httpx_mock: HTTPXMock) -> None:
+    """A schema detail endpoint returning 200 with a malformed body exits 2, not a traceback."""
+    httpx_mock.add_response(
+        method="GET",
+        url="https://marketplace.infrahub.app/api/v1/schemas/infrahub/vlan",
+        text="<html>not json</html>",
+    )
+    httpx_mock.add_response(
+        method="GET",
+        url="https://marketplace.infrahub.app/api/v1/collections/infrahub/vlan",
+        status_code=404,
+        json={"detail": "Collection not found"},
+    )
+    result = runner.invoke(app, ["show", "infrahub/vlan"])
+
+    assert result.exit_code == 2
+    assert "not valid JSON" in result.output