fix(ctl): classify 4xx marketplace errors as exit 1 and keep show --json clean

Author: iddocohen

infrahub_sdk/ctl/marketplace.py

@@ -168,6 +168,9 @@ async def _run_listing(
         try:
             items, total_count = await _fetch_listing(client, resolved_url, item_type, search=search, limit=limit)
         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}")
             detail = str(exc) or type(exc).__name__
             _fail(_ErrorClass.NETWORK, f"Marketplace request failed: {detail}")
     if json_output:
@@ -182,6 +185,19 @@ def _is_transport_failure(r: object) -> bool:
     return isinstance(r, httpx.Response) and r.status_code >= 500
 
 
+def _classify_http_error(exc: httpx.HTTPError) -> _ErrorClass:
+    """Map an httpx error to an error class for consistent exit-code assignment.
+
+    A response with a 4xx status code is a client/not-found error (exit 1).
+    A 5xx response or a transport-level failure with no response is a network
+    error (exit 2).
+    """
+    response = getattr(exc, "response", None)
+    if response is not None and response.status_code < 500:
+        return _ErrorClass.NOT_FOUND
+    return _ErrorClass.NETWORK
+
+
 def _mkdir_or_fail(path: Path) -> None:
     try:
         path.mkdir(parents=True, exist_ok=True)
@@ -415,7 +431,7 @@ async def _fetch_detail(
     )
     if isinstance(schema_resp, httpx.Response) and schema_resp.status_code == 200:
         if isinstance(collection_resp, httpx.Response) and collection_resp.status_code == 200:
-            console.print(
+            err_console.print(
                 f"[yellow]Note: '{namespace}/{name}' exists as both a schema and a collection. "
                 "Resolving as schema. Pass --collection to force the collection path."
             )
@@ -509,6 +525,9 @@ async def show(
                 client, resolved_url, parsed.namespace, parsed.name, force_collection=collection
             )
         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}")
             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

@@ -921,3 +921,94 @@ async def test_collection_false_autodetects_schema(httpx_mock: HTTPXMock, tmp_pa
     )
 
     assert (tmp_path / "network-base.yml").read_text() == SCHEMA_YAML
+
+
+# ---------------------------------------------------------------------------
+# Fix #1 — 4xx errors must exit 1 (not 2)
+# ---------------------------------------------------------------------------
+
+
+def test_list_4xx_error_exits_1(httpx_mock: HTTPXMock) -> None:
+    """A 4xx response on the listing endpoint must exit 1, not 2."""
+    httpx_mock.add_response(
+        method="GET",
+        url="https://marketplace.infrahub.app/api/v1/schemas",
+        status_code=400,
+        json={"detail": "Bad Request"},
+    )
+    result = runner.invoke(app, ["list"])
+
+    assert result.exit_code == 1
+
+
+def test_show_force_collection_4xx_exits_1(httpx_mock: HTTPXMock) -> None:
+    """A 4xx response on the --collection (force) path in show must exit 1, not 2."""
+    httpx_mock.add_response(
+        method="GET",
+        url="https://marketplace.infrahub.app/api/v1/collections/infrahub/security-mgmt",
+        status_code=400,
+        json={"detail": "Bad Request"},
+    )
+    result = runner.invoke(app, ["show", "infrahub/security-mgmt", "--collection"])
+
+    assert result.exit_code == 1
+
+
+# ---------------------------------------------------------------------------
+# Fix #2 — collision note must not appear on stdout when --json is used
+# ---------------------------------------------------------------------------
+
+
+def test_show_collision_json_stdout_is_clean(httpx_mock: HTTPXMock) -> None:
+    """When show hits a 200/200 collision and --json is passed, stdout must stay JSON-only.
+
+    The collision note must be routed to err_console (stderr) not console (stdout).
+
+    Stream-separation assertion limitation: Typer 0.25 / Click 8.3 do not
+    support ``mix_stderr=False`` on CliRunner, so we cannot isolate stdout in
+    this test runner.  The structural fix (console.print → err_console.print in
+    ``_fetch_detail``) is the authoritative correction; this test guards that the
+    command exits 0 on a collision+json path and that the JSON payload is
+    present somewhere in the combined output.
+    """
+    httpx_mock.add_response(
+        method="GET",
+        url="https://marketplace.infrahub.app/api/v1/schemas/infrahub/vlan",
+        json=_schema_detail(),
+    )
+    httpx_mock.add_response(
+        method="GET",
+        url="https://marketplace.infrahub.app/api/v1/collections/infrahub/vlan",
+        json=_collection_detail(),
+    )
+
+    result = runner.invoke(app, ["show", "infrahub/vlan", "--json"])
+
+    assert result.exit_code == 0
+    # The combined output must contain the JSON payload.  We parse the whole
+    # block starting from the first '{' at column 0 (the root object printed by
+    # Rich's print_json always starts at column 0).
+    output = result.output
+    root_brace = next((i for i, ch in enumerate(output) if ch == "{" and (i == 0 or output[i - 1] == "\n")), None)
+    assert root_brace is not None, "No root-level JSON object found in output"
+    parsed = _json.loads(output[root_brace:])
+    assert parsed["name"] == "vlan"
+
+
+# ---------------------------------------------------------------------------
+# Regression guard — 5xx must still exit 2
+# ---------------------------------------------------------------------------
+
+
+def test_list_network_error_exits_2_regression(httpx_mock: HTTPXMock) -> None:
+    """503 responses must still exit 2 (unchanged behaviour)."""
+    httpx_mock.add_response(
+        method="GET",
+        url="https://marketplace.infrahub.app/api/v1/schemas",
+        status_code=503,
+        json={"detail": "unavailable"},
+    )
+    result = runner.invoke(app, ["list"])
+
+    assert result.exit_code == 2
+    assert "Marketplace request failed" in result.output