didericis
09393b354b
Completes the de-sidecar cleanup: no live code, test, current doc, script, or nix file mentions or is named "sidecar" any more. Only the dated PRD/research docs keep the term as historical record (agreed on the #385 thread). - Rename `sidecar_init.py`→`gateway_init.py` was done earlier; this pass sweeps the remaining descriptive uses: the egress / git-gate / supervise components are the gateway's *daemons*, the shared container is the *gateway*, the old per-bottle container was the *companion container*. - Rename `tests/integration/test_sidecar_bundle_image.py`→`test_gateway_image.py` and its class; update `docs/ci.md` + `tests/README.md` for the renamed/ removed integration tests. - `SIDECAR_PORTS` shell var in `scripts/firecracker-netpool.sh`→`GATEWAY_PORTS`. Full unit suite green (bar the pre-existing `/bin/sleep`-missing env errors in test_gateway_init); docker integration — gateway singleton, broker, real two-bottle multitenant isolation, and the gateway-image build — all pass. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WBMWTEtQdJ4W5UrWuLHCck
58 lines
2.1 KiB
Python
58 lines
2.1 KiB
Python
"""Consolidated registration inputs (PRD 0070, docker slice).
|
|
|
|
Bridges the existing per-bottle `prepare` output to the consolidated
|
|
registry: turns a prepared bottle's egress plan into the backend-neutral
|
|
inputs `Orchestrator.launch_bottle` takes — the egress **policy** blob and
|
|
launch **metadata**.
|
|
|
|
The policy blob is the exact routes YAML the per-bottle egress daemon used
|
|
to read from a file; in the consolidated model the multi-tenant gateway's
|
|
`PolicyResolver` fetches it from the registry per request (keyed by source
|
|
IP) instead. Same render, so consolidated and single-tenant egress apply
|
|
byte-identical policy — a bottle's allow-list doesn't change when it moves
|
|
onto the shared gateway.
|
|
|
|
Host-side glue (imports `bot_bottle.egress`), used by the launch path — not
|
|
by the lean orchestrator control-plane process itself.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from dataclasses import dataclass
|
|
|
|
from ..egress import EgressPlan, egress_render_routes
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class RegistrationInputs:
|
|
"""What `Orchestrator.launch_bottle` needs to register a bottle, derived
|
|
from its prepared plan. `policy` is served verbatim by the gateway's
|
|
`/resolve`; `metadata` is opaque forward-compat state — it carries the
|
|
human slug so the console / supervise can show a name, not just the
|
|
minted bottle id."""
|
|
|
|
policy: str
|
|
metadata: str
|
|
|
|
|
|
def egress_policy(plan: EgressPlan) -> str:
|
|
"""The bottle's egress policy blob: the routes YAML the gateway serves
|
|
and the addon parses with `load_config`. Identical to the per-bottle
|
|
`routes.yaml` render, so the consolidated path applies the same
|
|
allow-list."""
|
|
return egress_render_routes(plan.routes, log=plan.log)
|
|
|
|
|
|
def registration_inputs(plan: EgressPlan) -> RegistrationInputs:
|
|
"""Assemble the orchestrator registration inputs from a prepared egress
|
|
plan. `metadata` records the slug so the shared registry can map a minted
|
|
bottle id back to its human name."""
|
|
return RegistrationInputs(
|
|
policy=egress_policy(plan),
|
|
metadata=json.dumps({"slug": plan.slug}),
|
|
)
|
|
|
|
|
|
__all__ = ["RegistrationInputs", "egress_policy", "registration_inputs"]
|