Paul Payne
317232ca6a
Replace the conflated `runner` axis with two orthogonal ones: `manager`
(systemd|caddy|path|none) — who supervises/realizes a deployment — and, for
systemd only, a nested `launcher` (python|command|container|compose|node) — how
the process starts. ServiceSpec and JobSpec collapse into one manager-
discriminated DeploymentSpec union (Systemd/Caddy/Path/Remote); the services/
and jobs/ config dirs collapse into one deployments/ dir. The human "kind"
(service|job|tool|static|reference) is fully derived (kind_for), never stored —
the frontend kind is renamed static. behavior is gone.
- core: DeploymentSpec union + LaunchSpec + kind_for; legacy-aware loader
normalizes old runner shapes; CastleConfig.deployments with derived
services/jobs/tools views; registry.Deployment carries manager/launcher/kind.
- cli: service/job/tool as filtered views + a deployment group; --behavior→--kind,
create --runner→--launcher; lifecycle dispatches over config.deployments.
- castle-api: /deployments primary with /services,/jobs as views; summaries
derive kind; PUT/DELETE /config/deployments/{name} (services/jobs aliased).
- app: KindBadge, frontend→static everywhere, pick-a-kind creation wizard,
per-kind config editors.
- docs: single deployments/ layout, manager/launcher, static kind throughout.
Live migration verified byte-identical: regenerated Caddyfile and every unit
ExecStart line unchanged, so nothing restarted. Suites: core 124, cli 25,
castle-api 55; dashboard build + type-check clean.
83 lines
3.0 KiB
Python
83 lines
3.0 KiB
Python
"""Tests for cloudflared tunnel ingress generation."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import yaml
|
|
|
|
from castle_core.generators.tunnel import (
|
|
generate_tunnel_config,
|
|
public_hostnames,
|
|
)
|
|
from castle_core.registry import Deployment, NodeConfig, NodeRegistry
|
|
|
|
|
|
def _registry(
|
|
*,
|
|
tunnel_id: str | None = "tid-123",
|
|
public_domain: str | None = "pub.payne.io",
|
|
gateway_domain: str | None = "civil.payne.io",
|
|
deployed: dict[str, Deployment] | None = None,
|
|
) -> NodeRegistry:
|
|
return NodeRegistry(
|
|
node=NodeConfig(
|
|
hostname="civil",
|
|
gateway_tls="acme",
|
|
gateway_domain=gateway_domain,
|
|
public_domain=public_domain,
|
|
tunnel_id=tunnel_id,
|
|
),
|
|
deployed=deployed
|
|
or {
|
|
"app": Deployment(manager="systemd", launcher="python", run_cmd=["x"], port=9001,
|
|
subdomain="app", public=True),
|
|
"private": Deployment(manager="systemd", launcher="python", run_cmd=["y"], port=9002,
|
|
subdomain="private", public=False),
|
|
},
|
|
)
|
|
|
|
|
|
def test_public_service_maps_public_zone_to_internal_host() -> None:
|
|
cfg = yaml.safe_load(generate_tunnel_config(_registry()))
|
|
assert cfg["tunnel"] == "tid-123"
|
|
rules = {r.get("hostname"): r for r in cfg["ingress"] if "hostname" in r}
|
|
# only the public service is mapped
|
|
assert set(rules) == {"app.pub.payne.io"}
|
|
r = rules["app.pub.payne.io"]
|
|
assert r["service"] == "https://localhost:443"
|
|
# public zone → internal host (Host + SNI rewritten so Caddy routes + cert validates)
|
|
assert r["originRequest"]["httpHostHeader"] == "app.civil.payne.io"
|
|
assert r["originRequest"]["originServerName"] == "app.civil.payne.io"
|
|
|
|
|
|
def test_terminal_catch_all_present() -> None:
|
|
cfg = yaml.safe_load(generate_tunnel_config(_registry()))
|
|
assert cfg["ingress"][-1] == {"service": "http_status:404"}
|
|
|
|
|
|
def test_private_service_not_in_public_dns() -> None:
|
|
assert public_hostnames(_registry()) == ["app.pub.payne.io"]
|
|
|
|
|
|
def test_none_when_no_public_services() -> None:
|
|
only_private = {
|
|
"x": Deployment(manager="systemd", launcher="python", run_cmd=["x"], subdomain="x", public=False)
|
|
}
|
|
assert generate_tunnel_config(_registry(deployed=only_private)) is None
|
|
|
|
|
|
def test_none_when_tunnel_unconfigured() -> None:
|
|
assert generate_tunnel_config(_registry(tunnel_id=None)) is None
|
|
assert generate_tunnel_config(_registry(public_domain=None)) is None
|
|
|
|
|
|
def test_public_static_frontend_gets_ingress() -> None:
|
|
# A `static` (frontend) service can be public too — the toggle composes for
|
|
# any exposed deployment, process-backed or not.
|
|
reg = _registry(deployed={
|
|
"guestbook": Deployment(manager="caddy", run_cmd=[], subdomain="guestbook",
|
|
static_root="/data/repos/guestbook/public", public=True),
|
|
})
|
|
hosts = {r["hostname"] for r in yaml.safe_load(generate_tunnel_config(reg))["ingress"]
|
|
if "hostname" in r}
|
|
assert hosts == {"guestbook.pub.payne.io"}
|