didericis-claude
de80aafb1f
Add `attach_bottled_agents_to_gateway()` as an `@abc.abstractmethod` on `BottleBackend` and implement the first reconcile step across all three backends: on a gateway cold boot, replace every already-running agent's trusted CA with the freshly-minted gateway CA. Reconciling running bottles is a backend responsibility (only the backend can enumerate its agents and reach them — firecracker over SSH, docker/macOS over exec/cp), so making it an abstract method keeps the fix cross-backend by construction. The gateway rootfs is ephemeral, so a rebuild mints a new CA that every running bottle distrusts (SSL verification fails — #510). This reconcile is what distributes the fresh CA, so a routine gateway rebuild now doubles as a free CA rotation. Per-bottle steps are best-effort: one unreachable or malformed bottle is logged and skipped, never blocking the others. Trigger — `Gateway.connect_to_orchestrator` now returns a cold-boot bool (True when it actually (re)brought the gateway up, False when a healthy current gateway was left untouched); each infra `ensure_running` gates the reconcile on it, so it fires exactly on cold boot and never on an adopt. Git-gate re-provision and egress-token restore fold into this same reconcile on the same trigger in follow-up PRs (#516). Refs #516. Addresses #510. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
102 lines
4.3 KiB
Python
102 lines
4.3 KiB
Python
"""Unit: MacosInfraService composes the orchestrator + gateway services.
|
|
|
|
`MacosInfraService` no longer owns the container lifecycles — it composes the
|
|
`MacosOrchestrator` (control plane) and `MacosGateway` (data plane) services,
|
|
each tested in its own module. These tests isolate the *composition*: the
|
|
networks are ensured, both images built, the orchestrator comes up first, then
|
|
the gateway is connected to it with a freshly minted token."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import unittest
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from bot_bottle.backend.macos_container.infra import MacosInfraService
|
|
|
|
_INFRA = "bot_bottle.backend.macos_container.infra"
|
|
|
|
|
|
class TestInfraEnsureRunning(unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
self.svc = MacosInfraService(repo_root=Path("/r"))
|
|
self.orch = MagicMock()
|
|
self.orch.url.return_value = "http://192.168.128.2:8099"
|
|
self.orch.mint_gateway_token.return_value = "gw.jwt"
|
|
self.gw = MagicMock()
|
|
# Default to a cold boot (gateway (re)created) so the reconcile branch
|
|
# runs; the actual reconcile is stubbed so these composition tests stay
|
|
# isolated from the `container` CLI.
|
|
self.gw.connect_to_orchestrator.return_value = True
|
|
for name, mock in (("orchestrator", self.orch), ("gateway", self.gw)):
|
|
p = patch.object(self.svc, name, return_value=mock)
|
|
p.start()
|
|
self.addCleanup(p.stop)
|
|
ap = patch(
|
|
"bot_bottle.backend.macos_container.backend"
|
|
".MacosContainerBottleBackend.attach_bottled_agents_to_gateway"
|
|
)
|
|
self.attach = ap.start()
|
|
self.addCleanup(ap.stop)
|
|
|
|
def test_composes_networks_builds_and_brings_up_orchestrator_first(self) -> None:
|
|
with patch(f"{_INFRA}.ensure_networks") as nets:
|
|
url = self.svc.ensure_running()
|
|
nets.assert_called_once()
|
|
self.orch.ensure_built.assert_called_once()
|
|
self.gw.ensure_built.assert_called_once()
|
|
self.orch.ensure_running.assert_called_once()
|
|
# Returns the host control-plane URL (the InfraService contract).
|
|
self.assertEqual("http://192.168.128.2:8099", url)
|
|
|
|
def test_connects_gateway_with_orchestrator_url_and_minted_token(self) -> None:
|
|
with patch(f"{_INFRA}.ensure_networks"):
|
|
self.svc.ensure_running()
|
|
self.gw.connect_to_orchestrator.assert_called_once_with(
|
|
"http://192.168.128.2:8099", "gw.jwt")
|
|
self.orch.mint_gateway_token.assert_called_once()
|
|
|
|
def test_cold_boot_reconciles_running_bottles(self) -> None:
|
|
# A (re)created gateway (connect returns True) triggers the bring-up
|
|
# reconcile so running bottles re-trust the fresh gateway (PRD 0081).
|
|
self.gw.connect_to_orchestrator.return_value = True
|
|
with patch(f"{_INFRA}.ensure_networks"):
|
|
self.svc.ensure_running()
|
|
self.attach.assert_called_once_with()
|
|
|
|
def test_no_reconcile_when_gateway_left_untouched(self) -> None:
|
|
self.gw.connect_to_orchestrator.return_value = False
|
|
with patch(f"{_INFRA}.ensure_networks"):
|
|
self.svc.ensure_running()
|
|
self.attach.assert_not_called()
|
|
|
|
def test_is_healthy_delegates_to_the_orchestrator(self) -> None:
|
|
self.orch.is_healthy.return_value = True
|
|
self.assertTrue(self.svc.is_healthy())
|
|
self.orch.is_healthy.assert_called_once()
|
|
|
|
|
|
class TestCaCertPem(unittest.TestCase):
|
|
def test_delegates_to_the_gateway_service(self) -> None:
|
|
svc = MacosInfraService(repo_root=Path("/r"))
|
|
gw = MagicMock()
|
|
gw.ca_cert_pem.return_value = "-----BEGIN CERTIFICATE-----\n"
|
|
with patch.object(svc, "gateway", return_value=gw):
|
|
pem = svc.ca_cert_pem(timeout=5)
|
|
self.assertTrue(pem.startswith("-----BEGIN CERTIFICATE-----"))
|
|
gw.ca_cert_pem.assert_called_once_with(timeout=5)
|
|
|
|
|
|
class TestStop(unittest.TestCase):
|
|
def test_removes_both_containers(self) -> None:
|
|
svc = MacosInfraService(repo_root=Path("/r"))
|
|
with patch(f"{_INFRA}.container_mod") as mod:
|
|
svc.stop()
|
|
removed = {c.args[0] for c in mod.force_remove_container.call_args_list}
|
|
self.assertIn("bot-bottle-mac-infra", removed) # gateway
|
|
self.assertIn("bot-bottle-mac-orchestrator", removed) # orchestrator
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|