didericis
f77023db1d
test / integration-docker (pull_request) Successful in 11s
test / unit (pull_request) Successful in 43s
lint / lint (push) Successful in 56s
test / integration-firecracker (pull_request) Successful in 3m19s
test / coverage (pull_request) Successful in 19s
test / publish-infra (pull_request) Has been skipped
tracker-policy-pr / check-pr (pull_request) Successful in 7s
Separate the gateway (data plane) from the orchestrator (control plane) at the
module level. The gateway runtime files move out of the package root — and the
backend-neutral Gateway lifecycle ABC + GATEWAY_* constants move out of
orchestrator/ — into a new bot_bottle/gateway/ package:
gateway/__init__.py (was orchestrator/gateway.py: Gateway ABC + consts
+ rotate_gateway_ca)
gateway/gateway_init.py (the PID-1 daemon supervisor)
gateway/egress_addon.py, egress_addon_core.py, egress_dlp_config.py,
dlp_detectors.py (the egress mitmproxy daemon)
gateway/git_http_backend.py (the git-http daemon)
gateway/git_gate_render.py (the git-gate pre-receive rendering)
gateway/supervise_server.py (the supervise MCP daemon)
gateway/policy_resolver.py (the data-plane control-plane RPC client)
orchestrator/ now holds only control-plane files. The shared plan/types/auth
layer (egress.py=EgressPlan, git_gate.py=GitGatePlan, supervise.py,
supervise_types.py, control_auth.py) and the launch-time git-gate provisioning
helpers stay at root, so orchestrator/ and backend/ still own them.
Because these daemons are invoked as `python3 -m bot_bottle.<name>`, loaded flat
by mitmproxy, and referenced in Dockerfile.gateway, the move updates more than
Python imports: the `-m` invocations (firecracker/macOS infra scripts), the
Dockerfile.gateway addon shim + ENTRYPOINT, gateway_init's _DAEMONS module
paths, and the git-gate CGI heredocs all now point at bot_bottle.gateway.*.
No behavior change; full unit suite green (2251).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
68 lines
2.4 KiB
Python
68 lines
2.4 KiB
Python
"""Unit: consolidated per-bottle git-gate provisioning render (PRD 0070)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import unittest
|
|
|
|
from bot_bottle.gateway.git_gate_render import (
|
|
GitGateUpstream,
|
|
git_gate_render_entrypoint,
|
|
git_gate_render_provision,
|
|
)
|
|
|
|
|
|
def _ups(*names: str) -> tuple[GitGateUpstream, ...]:
|
|
return tuple(
|
|
GitGateUpstream(
|
|
name=n,
|
|
upstream_url=f"ssh://git@github.com/x/{n}.git",
|
|
upstream_host="github.com",
|
|
upstream_port="22",
|
|
identity_file="",
|
|
known_host_key="",
|
|
)
|
|
for n in names
|
|
)
|
|
|
|
|
|
class TestProvisionRender(unittest.TestCase):
|
|
def test_namespaces_repos_and_creds_by_bottle_id(self) -> None:
|
|
script = git_gate_render_provision("bottleab12", _ups("foo"))
|
|
self.assertIn("repo=/git/bottleab12/${name}.git", script)
|
|
self.assertIn("keyfile=/git-gate/creds/bottleab12/${name}-key", script)
|
|
self.assertIn("mkdir -p /git/bottleab12", script)
|
|
|
|
def test_one_init_repo_call_per_upstream(self) -> None:
|
|
script = git_gate_render_provision("b1", _ups("foo", "bar"))
|
|
calls = [l for l in script.splitlines() if l.startswith("init_repo ")]
|
|
self.assertEqual(2, len(calls))
|
|
|
|
def test_provision_does_not_start_the_daemon(self) -> None:
|
|
# The shared gateway already serves; provisioning is init-only.
|
|
self.assertNotIn("git daemon", git_gate_render_provision("b1", _ups("foo")))
|
|
|
|
def test_installs_pre_receive_hook(self) -> None:
|
|
script = git_gate_render_provision("b1", _ups("foo"))
|
|
self.assertIn("install -m 755 /etc/git-gate/pre-receive", script)
|
|
|
|
def test_rejects_unsafe_bottle_id(self) -> None:
|
|
for bad in ("../etc", "a/b", "a b", "a;rm", ""):
|
|
with self.assertRaises(ValueError):
|
|
git_gate_render_provision(bad, _ups("foo"))
|
|
|
|
|
|
class TestEntrypointUnchanged(unittest.TestCase):
|
|
"""The shared `_git_gate_init_repo_fn` refactor must not alter the
|
|
single-tenant daemon entrypoint's output."""
|
|
|
|
def test_entrypoint_still_single_tenant_flat(self) -> None:
|
|
script = git_gate_render_entrypoint(_ups("foo"))
|
|
self.assertIn("repo=/git/${name}.git", script) # flat, not namespaced
|
|
self.assertIn("keyfile=/git-gate/creds/${name}-key", script)
|
|
self.assertIn("--base-path=/git", script)
|
|
self.assertIn("exec git daemon", script)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|