ibee-cli 0.5.0__tar.gz → 0.5.1__tar.gz

{ibee_cli-0.5.0/src/ibee_cli.egg-info → ibee_cli-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibee-cli
-Version: 0.5.0
+Version: 0.5.1
 Summary: Official command-line interface for the IBEE Solutions cloud platform
 Author-email: IBEE Solutions <support@ibee.ai>
 License-Expression: MIT

{ibee_cli-0.5.0 → ibee_cli-0.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ibee-cli"
-version = "0.5.0"
+version = "0.5.1"
 description = "Official command-line interface for the IBEE Solutions cloud platform"
 readme = "README.md"
 license = "MIT"

{ibee_cli-0.5.0 → ibee_cli-0.5.1}/src/ibee_cli/__init__.py

@@ -1,3 +1,3 @@
 """IBEE Solutions command-line interface."""
 
-__version__ = "0.5.0"
+__version__ = "0.5.1"

{ibee_cli-0.5.0 → ibee_cli-0.5.1}/src/ibee_cli/render.py

@@ -216,10 +216,14 @@ def to_yaml(payload: Any) -> str:
 # ---------------------------------------------------------------------------
 
 
-def _items(data: Any) -> list[Any]:
+def _items(data: Any, id_field: Optional[str] = None) -> list[Any]:
     if isinstance(data, list):
         return data
     if isinstance(data, dict):
+        if id_field and data.get(id_field) not in (None, ""):
+            # One object that carries the command's id (a firewall group, a load
+            # balancer): its nested ``rules`` or ``subnets`` are not the result.
+            return [data]
         for key in COLLECTION_KEYS:
             if isinstance(data.get(key), list):
                 return data[key]
@@ -241,7 +245,7 @@ def _identifier(item: Any, id_field: Optional[str]) -> Optional[str]:
 def identifiers(payload: Any, id_field: Optional[str] = None) -> list[str]:
     """Identifiers for ``-o id``: one per item of a collection, or one for an object."""
     ids = []
-    for item in _items(to_data(payload)):
+    for item in _items(to_data(payload), id_field):
         value = _identifier(item, id_field)
         if value is not None:
             ids.append(value)

{ibee_cli-0.5.0 → ibee_cli-0.5.1/src/ibee_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibee-cli
-Version: 0.5.0
+Version: 0.5.1
 Summary: Official command-line interface for the IBEE Solutions cloud platform
 Author-email: IBEE Solutions <support@ibee.ai>
 License-Expression: MIT

{ibee_cli-0.5.0 → ibee_cli-0.5.1}/tests/test_cli_core.py

@@ -29,7 +29,7 @@ def test_help_and_version() -> None:
     for group in ("billing", "block-storage", "buckets", "cdn", "secrets", "vms", "gpus", "console", "vpcs",
                   "reserved-ips", "firewalls", "load-balancers", "compute", "ops"):
         assert group in result.output
-    assert runner.invoke(app, ["--version"]).output.strip() == f"ibee-cli {__version__}" == "ibee-cli 0.5.0"
+    assert runner.invoke(app, ["--version"]).output.strip() == f"ibee-cli {__version__}" == "ibee-cli 0.5.1"
 
 
 def test_missing_token_and_workspace_are_usage_errors(monkeypatch: pytest.MonkeyPatch) -> None:

{ibee_cli-0.5.0 → ibee_cli-0.5.1}/tests/test_networking_commands.py

@@ -10,9 +10,11 @@ import json
 
 import pytest
 from click import unstyle
-from _net_fixtures import FW, LB, NAT_CATALOG, RIP, RIP_CATALOG, V, WS, gateway_record, group, lb, pf_rule, plain, rip, run, vpc
+from _net_fixtures import (
+    FW, LB, NAT_CATALOG, RIP, RIP_CATALOG, V, WS, gateway_record, group, lb, pf_rule, plain, rip, run, subnet, vpc,
+)
 
-from ibee_cli.render import EXIT_CODES
+from ibee_cli.render import EXIT_CODES, identifiers
 
 BACKENDS = [{"type": "ip", "target": "10.0.0.5", "port": 80, "weight": 5}, {"target": "web.internal", "port": 8080}]
 
@@ -153,6 +155,34 @@ def test_load_balancer_create_sends_json_backends_unchanged(gw):
     assert gw.last("POST", f"{LB}/l7").json == {"name": "web", "protocol": "https", "backends": BACKENDS}
 
 
+L7_RULES = [{"priority": 1, "path_prefix": "/api", "backends": BACKENDS[:1]}]
+
+
+@pytest.mark.parametrize(
+    "args, method, path, record, expected",
+    [
+        (["firewalls", "create", "web"], "POST", FW, group(), "fw-1"),
+        (["firewalls", "get", "fw-1"], "GET", f"{FW}/fw-1", group(), "fw-1"),
+        (["load-balancers", "create-l7", "web", "--backends", json.dumps(BACKENDS)], "POST", f"{LB}/l7",
+         lb(backends=BACKENDS, rules=L7_RULES), "lb-1"),
+        (["load-balancers", "create-l7", "web", "--backends", "[]"], "POST", f"{LB}/l7", lb(rules=[]), "lb-1"),
+        (["vpcs", "get", "vpc-1"], "GET", V, vpc(subnets=[subnet(), subnet(subnet_id="sub-2")]), "vpc-1"),
+    ],
+)
+def test_id_output_prints_the_object_id_not_its_nested_list(gw, args, method, path, record, expected):
+    gw.on(method, path, (200, record))
+
+    result = run(["-o", "id", *args])
+    assert result.exit_code == 0, result.output
+    assert result.stdout.splitlines() == [expected]
+
+
+def test_id_output_still_prints_one_id_per_collection_item():
+    groups = {"groups": [group(), group(firewall_group_id="fw-2")]}
+    assert identifiers(groups, "firewall_group_id") == ["fw-1", "fw-2"]
+    assert identifiers({"rules": group()["rules"]}) == ["sys-1", "r-1"]
+
+
 def test_load_balancer_repeatable_backend_and_routing(gw):
     gw.on("POST", f"{LB}/l4", (201, lb(layer="l4", protocol="tcp")))