dev-bubble 0.7.20__tar.gz → 0.7.21__tar.gz

{dev_bubble-0.7.20/dev_bubble.egg-info → dev_bubble-0.7.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dev-bubble
-Version: 0.7.20
+Version: 0.7.21
 Summary: Containerized development environments powered by Incus
 Author-email: Kim Morrison <kim@tqft.net>
 License-Expression: Apache-2.0

{dev_bubble-0.7.20 → dev_bubble-0.7.21}/bubble/__init__.py

@@ -1,3 +1,3 @@
 """bubble: Containerized development environments."""
 
-__version__ = "0.7.20"
+__version__ = "0.7.21"

{dev_bubble-0.7.20 → dev_bubble-0.7.21}/bubble/auth_proxy.py

@@ -76,14 +76,18 @@ from urllib.request import (
     build_opener,
 )
 
-from .config import DATA_DIR
+from .config import AUTH_PROXY_DIR
 from .token_store import RateLimiter as _RateLimiter
 from .token_store import RateWindow, TokenStore, setup_file_logging
 
-AUTH_PROXY_PORT_FILE = DATA_DIR / "auth-proxy.port"
-AUTH_PROXY_ENDPOINT_FILE = DATA_DIR / "auth-proxy.endpoint"
-AUTH_PROXY_LOG = DATA_DIR / "auth-proxy.log"
-AUTH_PROXY_TOKENS = DATA_DIR / "auth-tokens.json"
+# The daemon is a host singleton that always uses ~/.bubble (see
+# AUTH_PROXY_DIR in config.py). Both the daemon and callers running under a
+# custom BUBBLE_HOME must resolve these files against that fixed location so
+# they agree on where the endpoint and per-container tokens live.
+AUTH_PROXY_PORT_FILE = AUTH_PROXY_DIR / "auth-proxy.port"
+AUTH_PROXY_ENDPOINT_FILE = AUTH_PROXY_DIR / "auth-proxy.endpoint"
+AUTH_PROXY_LOG = AUTH_PROXY_DIR / "auth-proxy.log"
+AUTH_PROXY_TOKENS = AUTH_PROXY_DIR / "auth-tokens.json"
 
 # Default port (configurable via config.toml)
 DEFAULT_PORT = 7654
@@ -1574,7 +1578,7 @@ def run_daemon(port: int = 0):
         port: Port to listen on. 0 means use config or default.
     """
     _setup_logging()
-    DATA_DIR.mkdir(parents=True, exist_ok=True)
+    AUTH_PROXY_DIR.mkdir(parents=True, exist_ok=True)
 
     if not port:
         from .config import load_config

{dev_bubble-0.7.20 → dev_bubble-0.7.21}/bubble/config.py

@@ -20,6 +20,15 @@ import tomli_w
 # Override with BUBBLE_HOME environment variable
 DATA_DIR = Path(os.environ.get("BUBBLE_HOME", Path.home() / ".bubble"))
 CONFIG_FILE = DATA_DIR / "config.toml"
+
+# The auth-proxy daemon is a host singleton, installed via launchd/systemd
+# with no BUBBLE_HOME in its environment, so it always runs against the
+# default ~/.bubble and writes its endpoint/port/token/log files there.
+# Callers (e.g. `bubble open`) may run under a custom BUBBLE_HOME, but must
+# resolve those daemon files against the daemon's fixed location rather than
+# their own DATA_DIR — otherwise they look for an endpoint the daemon never
+# wrote and write tokens the daemon never reads. See issue #304.
+AUTH_PROXY_DIR = Path.home() / ".bubble"
 REGISTRY_FILE = DATA_DIR / "registry.json"
 GIT_DIR = DATA_DIR / "git"
 REPOS_FILE = DATA_DIR / "repos.json"

{dev_bubble-0.7.20 → dev_bubble-0.7.21}/bubble/runtime/incus.py

@@ -199,17 +199,25 @@ class IncusRuntime(ContainerRuntime):
     def _get_info(self, name: str) -> ContainerInfo:
         """Get info for a single container.
 
-        Filters the full listing in Python rather than passing
-        ``<remote>:<name>`` as an incus list filter: on recent incus
-        versions ``incus list <remote>:<name>`` returns nothing (the
-        ``remote:name`` form isn't treated as a name filter), whereas
-        ``incus list <remote>:`` reliably scopes to the remote. This is
-        the same workaround the no-name path in ``list_containers``
-        already relies on.
+        Passes the remote scope and the name filter as *separate*
+        arguments (``incus list <remote>: name=<name>``). Concatenating
+        them into one token (``incus list <remote>:<name>``) breaks on
+        recent incus versions: a ``list`` argument that doesn't end in
+        ``:`` is treated as a name filter on the *default* remote, so it
+        matches nothing on a non-default remote (e.g. ``bubble-colima``
+        on macOS). The bare ``<remote>:`` token reliably scopes the list
+        to the remote, the same way the no-name path in
+        ``list_containers`` already relies on.
+
+        ``name=<name>`` is matched as a substring on some incus versions,
+        so we still confirm an exact name match before returning.
         """
-        for info in self.list_containers(fast=False):
-            if info.name == name:
-                return info
+        scope = [self._q("")] if self._remote else []
+        data = self._run_json(["list", *scope, f"name={name}"])
+        if isinstance(data, list):
+            for c in data:
+                if c.get("name") == name:
+                    return self._parse_container(c)
         raise RuntimeError(f"Container '{name}' not found")
 
     def list_containers(self, fast: bool = True) -> list[ContainerInfo]:

{dev_bubble-0.7.20 → dev_bubble-0.7.21/dev_bubble.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dev-bubble
-Version: 0.7.20
+Version: 0.7.21
 Summary: Containerized development environments powered by Incus
 Author-email: Kim Morrison <kim@tqft.net>
 License-Expression: Apache-2.0

{dev_bubble-0.7.20 → dev_bubble-0.7.21}/dev_bubble.egg-info/SOURCES.txt

@@ -110,6 +110,7 @@ tests/test_config.py
 tests/test_customize.py
 tests/test_editor.py
 tests/test_ephemeral.py
+tests/test_get_info_remote.py
 tests/test_git_store.py
 tests/test_github_security_override.py
 tests/test_github_token.py

{dev_bubble-0.7.20 → dev_bubble-0.7.21}/tests/conftest.py

@@ -156,7 +156,15 @@ def tmp_data_dir(tmp_path, monkeypatch):
     try:
         import bubble.auth_proxy as auth_proxy_mod
 
+        # These files are pinned to the fixed singleton ~/.bubble
+        # (AUTH_PROXY_DIR), not DATA_DIR, so they don't follow BUBBLE_HOME
+        # (issue #304). Patch all four explicitly to keep tests off the
+        # real ~/.bubble.
         monkeypatch.setattr(auth_proxy_mod, "AUTH_PROXY_PORT_FILE", data_dir / "auth-proxy.port")
+        monkeypatch.setattr(
+            auth_proxy_mod, "AUTH_PROXY_ENDPOINT_FILE", data_dir / "auth-proxy.endpoint"
+        )
+        monkeypatch.setattr(auth_proxy_mod, "AUTH_PROXY_LOG", data_dir / "auth-proxy.log")
         monkeypatch.setattr(auth_proxy_mod, "AUTH_PROXY_TOKENS", data_dir / "auth-tokens.json")
     except ImportError:
         pass

{dev_bubble-0.7.20 → dev_bubble-0.7.21}/tests/test_auth_proxy.py

@@ -24,6 +24,48 @@ from bubble.auth_proxy import (
     validate_path,
 )
 
+# ---------------------------------------------------------------------------
+# Daemon file location (issue #304)
+# ---------------------------------------------------------------------------
+
+
+class TestDaemonFileLocation:
+    """The auth-proxy daemon is a host singleton pinned to ~/.bubble.
+
+    Its endpoint/port/token/log files must resolve against that fixed
+    location even when the caller runs under a custom BUBBLE_HOME, or the
+    caller looks for an endpoint the daemon never wrote and writes tokens
+    the daemon never reads (issue #304).
+    """
+
+    def test_files_ignore_bubble_home(self, tmp_path, monkeypatch):
+        import importlib
+        from pathlib import Path
+
+        import bubble.auth_proxy
+        import bubble.config
+
+        fixed = Path.home() / ".bubble"
+        try:
+            monkeypatch.setenv("BUBBLE_HOME", str(tmp_path))
+            importlib.reload(bubble.config)
+            importlib.reload(bubble.auth_proxy)
+
+            # DATA_DIR follows BUBBLE_HOME ...
+            assert bubble.config.DATA_DIR == tmp_path
+            # ... but the daemon's files stay at the fixed singleton location.
+            assert bubble.config.AUTH_PROXY_DIR == fixed
+            assert bubble.auth_proxy.AUTH_PROXY_ENDPOINT_FILE == fixed / "auth-proxy.endpoint"
+            assert bubble.auth_proxy.AUTH_PROXY_PORT_FILE == fixed / "auth-proxy.port"
+            assert bubble.auth_proxy.AUTH_PROXY_TOKENS == fixed / "auth-tokens.json"
+            assert bubble.auth_proxy.AUTH_PROXY_LOG == fixed / "auth-proxy.log"
+        finally:
+            # Restore default module state for subsequent tests.
+            monkeypatch.delenv("BUBBLE_HOME", raising=False)
+            importlib.reload(bubble.config)
+            importlib.reload(bubble.auth_proxy)
+
+
 # ---------------------------------------------------------------------------
 # Token management
 # ---------------------------------------------------------------------------
@@ -1669,7 +1711,14 @@ class TestApiProxyIntegration:
 
 @pytest.fixture
 def auth_proxy_env(tmp_path, monkeypatch):
-    """Set BUBBLE_HOME to tmp_path and reload auth_proxy module."""
+    """Isolate the auth_proxy daemon's files into tmp_path.
+
+    The daemon's endpoint/port/token/log files are pinned to the fixed
+    singleton location ~/.bubble (AUTH_PROXY_DIR), independent of
+    BUBBLE_HOME (see issue #304), so setting BUBBLE_HOME alone would leave
+    these tests writing the real ~/.bubble/auth-tokens.json. Monkeypatch
+    the module constants directly to keep the tests hermetic.
+    """
     import importlib
 
     import bubble.auth_proxy
@@ -1678,4 +1727,10 @@ def auth_proxy_env(tmp_path, monkeypatch):
     monkeypatch.setenv("BUBBLE_HOME", str(tmp_path))
     importlib.reload(bubble.config)
     importlib.reload(bubble.auth_proxy)
+    monkeypatch.setattr(bubble.auth_proxy, "AUTH_PROXY_PORT_FILE", tmp_path / "auth-proxy.port")
+    monkeypatch.setattr(
+        bubble.auth_proxy, "AUTH_PROXY_ENDPOINT_FILE", tmp_path / "auth-proxy.endpoint"
+    )
+    monkeypatch.setattr(bubble.auth_proxy, "AUTH_PROXY_LOG", tmp_path / "auth-proxy.log")
+    monkeypatch.setattr(bubble.auth_proxy, "AUTH_PROXY_TOKENS", tmp_path / "auth-tokens.json")
     return tmp_path

dev_bubble-0.7.21/tests/test_get_info_remote.py

@@ -0,0 +1,138 @@
+"""Regression test for issue #300: container lookup on a non-default remote.
+
+On macOS/Colima, ``IncusRuntime`` is constructed with
+``remote="bubble-colima"``. Recent incus clients treat a single
+concatenated ``list`` token (``incus list <remote>:<name>``) as a name
+filter on the *default* remote, so it matches nothing on a non-default
+remote and ``_get_info`` raised "Container not found" even when the
+container was running (breaking the base-image rebuild path).
+
+``_get_info`` must instead pass the remote scope and the name filter as
+*separate* arguments (``incus list <remote>: name=<name>``).
+"""
+
+from __future__ import annotations
+
+import json
+import subprocess
+
+import pytest
+
+from bubble.runtime.incus import IncusRuntime
+
+
+def _fake_subprocess(records, containers):
+    """A ``_run_subprocess`` stand-in that records argv and serves JSON.
+
+    The fake models incus's ``name=`` filtering so tests exercise the real
+    behavior ``_get_info`` depends on, not just the argv shape: a ``list``
+    with a ``name=<value>`` token returns *containers* whose names contain
+    ``<value>`` as a substring, mirroring incus versions where ``name=``
+    over-matches.
+    """
+
+    def run(self, cmd, *, capture=True):
+        records.append(cmd)
+        name_filter = next((a[len("name=") :] for a in cmd if a.startswith("name=")), None)
+        if name_filter is not None:
+            result = [c for c in containers if name_filter in c["name"]]
+        else:
+            result = containers
+        return subprocess.CompletedProcess(cmd, 0, stdout=json.dumps(result), stderr="")
+
+    return run
+
+
+def _container(name, status="Running"):
+    return {"name": name, "status": status, "state": {}}
+
+
+def test_get_info_uses_separate_remote_and_filter_tokens(monkeypatch):
+    records: list[list[str]] = []
+    monkeypatch.setattr(
+        IncusRuntime,
+        "_run_subprocess",
+        _fake_subprocess(records, [_container("base-builder")]),
+    )
+    rt = IncusRuntime(remote="bubble-colima")
+    info = rt._get_info("base-builder")
+    assert info.name == "base-builder"
+    # Exactly one incus invocation, with the remote scope and name filter as
+    # *separate* argv tokens (never the broken "bubble-colima:base-builder").
+    assert len(records) == 1
+    cmd = records[0]
+    assert cmd == ["incus", "list", "bubble-colima:", "name=base-builder", "--format=json"]
+    assert "bubble-colima:base-builder" not in cmd
+
+
+def test_get_info_no_remote_omits_scope_token(monkeypatch):
+    records: list[list[str]] = []
+    monkeypatch.setattr(
+        IncusRuntime,
+        "_run_subprocess",
+        _fake_subprocess(records, [_container("foo")]),
+    )
+    rt = IncusRuntime()
+    info = rt._get_info("foo")
+    assert info.name == "foo"
+    assert records[0] == ["incus", "list", "name=foo", "--format=json"]
+
+
+def test_get_info_exact_match_among_substring_matches(monkeypatch):
+    # Some incus versions match `name=base` as a substring, returning both
+    # "base" and "base-builder"; _get_info must return the exact match.
+    records: list[list[str]] = []
+    monkeypatch.setattr(
+        IncusRuntime,
+        "_run_subprocess",
+        _fake_subprocess(records, [_container("base-builder"), _container("base")]),
+    )
+    rt = IncusRuntime(remote="bubble-colima")
+    info = rt._get_info("base")
+    assert info.name == "base"
+
+
+def test_get_info_not_found_raises(monkeypatch):
+    records: list[list[str]] = []
+    monkeypatch.setattr(
+        IncusRuntime,
+        "_run_subprocess",
+        _fake_subprocess(records, []),
+    )
+    rt = IncusRuntime(remote="bubble-colima")
+    with pytest.raises(RuntimeError, match="not found"):
+        rt._get_info("missing")
+
+
+def test_get_info_superstring_only_is_not_a_match(monkeypatch):
+    # Asking for "base-build" when only "base-builder" exists must NOT match.
+    records: list[list[str]] = []
+    monkeypatch.setattr(
+        IncusRuntime,
+        "_run_subprocess",
+        _fake_subprocess(records, [_container("base-builder")]),
+    )
+    rt = IncusRuntime(remote="bubble-colima")
+    with pytest.raises(RuntimeError, match="not found"):
+        rt._get_info("base-build")
+
+
+def test_launch_then_lookup_on_remote(monkeypatch):
+    """Reproduces issue #300 end-to-end: launch base-builder on the
+    bubble-colima remote, then look it up via the separate-token filter."""
+    records: list[list[str]] = []
+    monkeypatch.setattr(
+        IncusRuntime,
+        "_run_subprocess",
+        _fake_subprocess(records, [_container("base-builder")]),
+    )
+    rt = IncusRuntime(remote="bubble-colima")
+    info = rt.launch("base-builder", "base")
+    assert info.name == "base-builder"
+    launch_cmd, list_cmd = records
+    # launch uses remote:name as a single resource identifier (correct).
+    assert launch_cmd == ["incus", "launch", "bubble-colima:base", "bubble-colima:base-builder"]
+    # the follow-up lookup must NOT concatenate remote and name.
+    assert "bubble-colima:base-builder" not in list_cmd
+    assert "bubble-colima:" in list_cmd
+    assert "name=base-builder" in list_cmd