ellf-cli 4.0.26__tar.gz → 4.0.28__tar.gz

{ellf_cli-4.0.26/ellf_cli.egg-info → ellf_cli-4.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 4.0.26
+Version: 4.0.28
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH

{ellf_cli-4.0.26 → ellf_cli-4.0.28}/ellf_cli/about.json

@@ -1,7 +1,7 @@
 {
   "title": "Ellf CLI",
   "name": "ellf-cli",
-  "version": "4.0.26",
+  "version": "4.0.28",
   "summary": "Ellf Command Line Interface",
   "uri": "https://prodi.gy",
   "prog": "ellf",

{ellf_cli-4.0.26 → ellf_cli-4.0.28}/ellf_cli/auth.py

@@ -193,7 +193,10 @@ class AuthStateImpl:
         self._secrets = None
         self._broker_url = URL.parse(broker_host) if broker_host is not None else None
         self._pam_url = URL.parse(pam_host)
-        self._broker_id = None
+        # Seed from saved-defaults so we don't make an unnecessary (and brittle)
+        # PAM lookup-by-address every time the user runs an ellf command.
+        # `auth.broker_id` falls back to the address lookup only if this is None.
+        self._broker_id = settings.broker_id
         self._org_id = None
         self._secrets_path = ctx.secrets_path
         self._saved_settings_path = ctx.saved_settings_path
@@ -407,10 +410,22 @@ class AuthStateImpl:
         ):
             self._broker_client = None
             api_token = self.get_api_token().access_token
+            # Prefer looking up the broker by id when we have it. Address
+            # lookup is brittle: the registered broker.address (e.g.
+            # 'cluster.example.com' or 'localhost') often doesn't textually
+            # match broker_host (e.g. 'https://localhost:8443'), and even
+            # canonicalized forms differ when the user includes a port to
+            # reach the cluster via tunnel that the broker.address doesn't
+            # carry. broker_id is unambiguous.
+            body: dict[str, str] = {}
+            if self._broker_id is not None:
+                body["id"] = str(self._broker_id)
+            else:
+                body["address"] = str(URL.parse(broker_host))
             res = httpx.post(
                 str(self.pam_url / "api/v1/broker/token"),
                 headers={"authorization": f"Bearer {api_token}"},
-                json={"address": str(URL.parse(broker_host))},
+                json=body,
             )
             if res.status_code != 200:
                 err = _format_http_error(res)

{ellf_cli-4.0.26 → ellf_cli-4.0.28}/ellf_cli/commands/infra/register.py

@@ -7,7 +7,6 @@ import srsly
 from radicli import Arg
 from wasabi import msg
 
-from ellf_pam_sdk.errors import BrokerNotFound
 from ellf_pam_sdk.models import BrokerCreating, BrokerUpdating
 
 from ...cli import cli
@@ -36,7 +35,7 @@ def register(
     as_json: bool = False,
 ) -> None:
     """Register a new cluster with PAM and write credentials to cluster-creds.json."""
-    from .._state import get_auth_state
+    from .._state import get_auth_state, get_root_cfg, get_saved_settings
 
     if cloud_provider not in CLOUD_PROVIDERS:
         msg.fail(
@@ -47,9 +46,23 @@ def register(
     auth = get_auth_state()
     client = auth.client
     org_id = auth.org_id
-    try:
-        broker = client.broker.read(address=domain)
-    except BrokerNotFound:
+    # Idempotent on (org_id, name): list and filter client-side rather than
+    # `broker.read(name=...)`, which has historically returned the wrong record
+    # when the name doesn't disambiguate (no LIMIT 1 / ORDER BY guarantees in
+    # the PAM-side query). Address-based lookup also doesn't work as a
+    # disambiguator because two clusters with the same human-readable domain
+    # are valid (e.g. two `localhost`-served dev clusters in the same org).
+    # page_size is capped at 100 server-side; iterate pages so this still
+    # works in larger orgs.
+    existing = next(
+        (
+            b
+            for b in client.broker.all(page_size=100)
+            if b.name == name and b.org_id == org_id
+        ),
+        None,
+    )
+    if existing is None:
         body = BrokerCreating(
             name=name,
             org_id=org_id,
@@ -62,14 +75,14 @@ def register(
         broker = client.broker.create(body)
     else:
         update_body = BrokerUpdating(
-            id=broker.id,
+            id=existing.id,
             name=name,
             address=domain,
             cloud_provider=cloud_provider,
             state="creating",
             cloud={},
         )
-        _ = client.broker.update(update_body)
+        broker = client.broker.update(update_body)
     creds = client.broker.credentials(broker_id=broker.id)
     creds_data = {
         "broker_id": str(creds.broker_id),
@@ -81,9 +94,27 @@ def register(
     }
     creds_path = Path("cluster-creds.json")
     srsly.write_json(creds_path, creds_data)
+    # Persist the broker id locally so subsequent `ellf` commands resolve the
+    # cluster identity from saved-defaults instead of looking it up by address
+    # (which is brittle when the user later sets `broker_host` to a tunnel URL
+    # like `https://localhost:8443` that doesn't match the registered domain).
+    settings = get_saved_settings()
+    prior_broker_id = settings.broker_id
+    settings.broker_id = broker.id
+    settings.save(get_root_cfg().saved_settings_path)
+    # Any cached broker access token from a previous broker_id is now stale.
+    # The cache is keyed by broker_host; if the broker behind that host has
+    # changed identity (re-registered cluster, name reused, tear-down + redeploy),
+    # the cached token will be rejected with 401 by the new broker.
+    if prior_broker_id is not None and prior_broker_id != broker.id:
+        secrets = auth.secrets
+        secrets.broker_tokens.clear()
+        secrets.save(get_root_cfg().secrets_path)
+        msg.info("  Cleared stale broker token cache (broker_id changed)")
     if as_json:
         print(json.dumps(creds_data, indent=2))
     else:
-        msg.good("Cluster registered with PAM")
+        action = "updated existing" if existing else "registered new"
+        msg.good(f"Cluster {action} with PAM")
         msg.info(f"  Broker ID:    {creds.broker_id}")
         msg.info(f"  Wrote credentials to {creds_path}")

{ellf_cli-4.0.26 → ellf_cli-4.0.28}/ellf_cli/ellf.json

@@ -1,7 +1,7 @@
 {
   "prog": "ellf",
   "help": "Ellf Command Line Interface.",
-  "version": "4.0.25",
+  "version": "4.0.27",
   "extra_key": "_extra",
   "commands": {
     "actions": {

{ellf_cli-4.0.26 → ellf_cli-4.0.28}/ellf_cli/url.py

@@ -31,13 +31,22 @@ class URL:
     'http://broker.internal:8080'
     """
 
-    __slots__ = ("url", "netloc", "port", "scheme")
-
-    def __init__(self, *, url: str, netloc: str, port: int, scheme: str) -> None:
+    __slots__ = ("url", "netloc", "port", "scheme", "hostname")
+
+    def __init__(
+        self,
+        *,
+        url: str,
+        netloc: str,
+        port: int,
+        scheme: str,
+        hostname: str,
+    ) -> None:
         object.__setattr__(self, "url", url)
         object.__setattr__(self, "netloc", netloc)
         object.__setattr__(self, "port", port)
         object.__setattr__(self, "scheme", scheme)
+        object.__setattr__(self, "hostname", hostname)
 
     def __setattr__(self, name: str, value: Any) -> None:
         raise AttributeError("URL instances are immutable")
@@ -48,20 +57,22 @@ class URL:
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, URL):
             return NotImplemented
-        return (self.url, self.netloc, self.port, self.scheme) == (
+        return (self.url, self.netloc, self.port, self.scheme, self.hostname) == (
             other.url,
             other.netloc,
             other.port,
             other.scheme,
+            other.hostname,
         )
 
     def __hash__(self) -> int:
-        return hash((self.url, self.netloc, self.port, self.scheme))
+        return hash((self.url, self.netloc, self.port, self.scheme, self.hostname))
 
     def __repr__(self) -> str:
         return (
             f"URL(url={self.url!r}, netloc={self.netloc!r},"
-            f" port={self.port!r}, scheme={self.scheme!r})"
+            f" port={self.port!r}, scheme={self.scheme!r},"
+            f" hostname={self.hostname!r})"
         )
 
     @classmethod
@@ -128,6 +139,7 @@ class URL:
             netloc=parsed.netloc,
             port=resolved_port,
             scheme=parsed.scheme,
+            hostname=parsed.hostname or "",
         )
 
     @classmethod
@@ -151,6 +163,7 @@ class URL:
             netloc=self.netloc,
             port=self.port,
             scheme=self.scheme,
+            hostname=self.hostname,
         )
 
     def with_userinfo(self, username: str, password: str = "") -> URL:
@@ -164,4 +177,10 @@ class URL:
         if parsed.port:
             netloc = f"{netloc}:{parsed.port}"
         new_url = parsed._replace(netloc=netloc).geturl()
-        return URL(url=new_url, netloc=self.netloc, port=self.port, scheme=self.scheme)
+        return URL(
+            url=new_url,
+            netloc=self.netloc,
+            port=self.port,
+            scheme=self.scheme,
+            hostname=self.hostname,
+        )

{ellf_cli-4.0.26 → ellf_cli-4.0.28/ellf_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 4.0.26
+Version: 4.0.28
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH