didericis
77948ef56c
The per-agent companion container (the egress/git-gate/supervise data plane run once per bottle) is the pre-consolidation architecture. Remove it and disable the backends that still depend on it, per the #385 thread. - Delete `backend/docker/sidecar_bundle.py`; docker's live path uses the consolidated shared gateway, not a per-bottle bundle. - Disable the firecracker and macos-container backends: their `launch()` fails closed (they launched a per-bottle companion; firecracker's consolidated relaunch is #354, macos follows). Their `enumerate` return empty and `cleanup` drop the companion-container discovery (firecracker keeps VMM/run-dir cleanup). - Fail-close both backends' `egress_apply` reload (it signalled the per-bottle container); consolidated egress policy resolves per-request against the orchestrator, so gateway-side apply is a follow-up. - Rename `egress_sidecar_env_entries` → `egress_gateway_env_entries`, `SIDECAR_PORTS` → `GATEWAY_PORTS`. - Move the shared DockerBottlePlan fixture to `tests/unit/_docker_bottle_plan.py`; delete tests for the removed launch paths; update cleanup/egress-apply tests. Docker consolidated launch verified end-to-end (multitenant isolation integration test passes). macos/firecracker are intentionally disabled. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WBMWTEtQdJ4W5UrWuLHCck
70 lines
1.9 KiB
Python
70 lines
1.9 KiB
Python
"""Cleanup for the macOS Apple Container backend."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
|
|
from ...log import info, warn
|
|
from . import util as container_mod
|
|
from .bottle_cleanup_plan import MacosContainerBottleCleanupPlan
|
|
|
|
_PREFIX = "bot-bottle-"
|
|
|
|
|
|
def _list_prefixed_containers() -> list[str]:
|
|
result = subprocess.run(
|
|
["container", "list", "--all", "--quiet"],
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
)
|
|
if result.returncode != 0:
|
|
warn(f"container list failed: {result.stderr.strip()}")
|
|
return []
|
|
return sorted(
|
|
name for name in (line.strip() for line in result.stdout.splitlines())
|
|
if name.startswith(_PREFIX)
|
|
)
|
|
|
|
|
|
def _list_prefixed_networks() -> list[str]:
|
|
result = subprocess.run(
|
|
["container", "network", "list", "--quiet"],
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
)
|
|
if result.returncode != 0:
|
|
return []
|
|
return sorted(
|
|
name for name in (line.strip() for line in result.stdout.splitlines())
|
|
if name.startswith(_PREFIX)
|
|
)
|
|
|
|
|
|
def prepare_cleanup() -> MacosContainerBottleCleanupPlan:
|
|
container_mod.require_container()
|
|
return MacosContainerBottleCleanupPlan(
|
|
containers=tuple(_list_prefixed_containers()),
|
|
networks=tuple(_list_prefixed_networks()),
|
|
)
|
|
|
|
|
|
def cleanup(plan: MacosContainerBottleCleanupPlan) -> None:
|
|
for name in plan.containers:
|
|
info(f"container delete --force {name}")
|
|
subprocess.run(
|
|
["container", "delete", "--force", name],
|
|
stdout=subprocess.DEVNULL,
|
|
stderr=subprocess.DEVNULL,
|
|
check=False,
|
|
)
|
|
for name in plan.networks:
|
|
info(f"container network delete {name}")
|
|
subprocess.run(
|
|
["container", "network", "delete", name],
|
|
stdout=subprocess.DEVNULL,
|
|
stderr=subprocess.DEVNULL,
|
|
check=False,
|
|
)
|