didericis
610c4173a5
The per-bottle model rendered a compose project with the agent + a sidecar
bundle on two per-bottle networks. Consolidated has no sidecars — one shared
gateway serves everyone — so this renders JUST the agent, attached to the
external shared gateway network at the orchestrator-allocated pinned IP, and
pointed at the gateway's address for egress.
- consolidated_agent_compose(plan, *, gateway_ip, source_ip, network):
agent service only; networks {<gateway>: {ipv4_address: source_ip}} on the
external gateway network; HTTPS_PROXY -> http://<gateway_ip>:9099; NO_PROXY
includes the gateway address so git-http + supervise (also on the gateway)
bypass the proxy and are reached directly. No depends_on/sidecars.
- Pure (takes the launch-time LaunchContext values), so it's unit-testable
without docker.
pyright 0 errors; pylint 9.83/10; unit suite green (the 13 test_sidecar_init
/bin/sleep errors are pre-existing NixOS-local noise).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WBMWTEtQdJ4W5UrWuLHCck
52 lines
2.0 KiB
Python
52 lines
2.0 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.test_compose 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()
|