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
52 lines
2.1 KiB
Python
52 lines
2.1 KiB
Python
"""Unit: agent-only consolidated compose render (PRD 0070)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import unittest
|
|
|
|
from bot_bottle.backend.docker.consolidated_compose import consolidated_agent_compose
|
|
from tests.unit._docker_bottle_plan import _plan
|
|
|
|
_GW = "172.18.0.2"
|
|
_IP = "172.18.0.5"
|
|
_NET = "bot-bottle-gateway"
|
|
|
|
|
|
class TestConsolidatedAgentCompose(unittest.TestCase):
|
|
def _spec(self, *, runsc: bool = False):
|
|
plan = _plan(with_egress=True, supervise=True, with_git=True)
|
|
if runsc:
|
|
plan = type(plan)(**{**vars(plan), "use_runsc": True}) # type: ignore[arg-type]
|
|
return consolidated_agent_compose(plan, gateway_ip=_GW, source_ip=_IP, network=_NET)
|
|
|
|
def test_only_agent_service_no_sidecars(self) -> None:
|
|
# The whole point of consolidation: no per-bottle sidecar bundle.
|
|
self.assertEqual(["agent"], list(self._spec()["services"]))
|
|
|
|
def test_agent_pinned_on_external_gateway_network(self) -> None:
|
|
spec = self._spec()
|
|
self.assertEqual({"external": True}, spec["networks"][_NET])
|
|
agent_net = spec["services"]["agent"]["networks"][_NET]
|
|
self.assertEqual(_IP, agent_net["ipv4_address"])
|
|
|
|
def test_proxy_and_ca_point_at_gateway(self) -> None:
|
|
env = self._spec()["services"]["agent"]["environment"]
|
|
self.assertIn(f"HTTPS_PROXY=http://{_GW}:9099", env)
|
|
# git-http + supervise on the gateway must bypass the egress proxy.
|
|
self.assertTrue(any(e.startswith("NO_PROXY=") and _GW in e for e in env))
|
|
|
|
def test_no_sidecar_dependency(self) -> None:
|
|
self.assertNotIn("depends_on", self._spec()["services"]["agent"])
|
|
|
|
def test_runsc_runtime_when_enabled(self) -> None:
|
|
self.assertEqual("runsc", self._spec(runsc=True)["services"]["agent"]["runtime"])
|
|
|
|
def test_forwarded_env_stays_bare_names(self) -> None:
|
|
env = self._spec()["services"]["agent"]["environment"]
|
|
# forwarded secrets are bare names (value inherited from process env).
|
|
self.assertIn("CLAUDE_CODE_OAUTH_TOKEN", env)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|