Paul Payne
43ef1cc588
Collapse the two proxy shapes (path_prefix + host) to a single checkbox: a service is either port-only, or exposed at <service-name>.<gateway.domain>. Path routes and their prefix-stripping foot-guns are gone; the subdomain is always the service name (rename the service to change it). - Schema: CaddySpec is just `enable` (presence = expose). service_proxy_targets returns (expose, port, base_url); Deployment carries `subdomain` (was proxy_path/proxy_host). Registry/deploy/mesh/CLI updated in lockstep. - Generator: compute_routes emits one host route per exposed service/frontend (address = name). acme mode = one *.<domain> site with a reverse_proxy matcher per service + a file_server matcher per frontend; the :<port> site redirects to the dashboard. off mode = a HTTP control plane on :<port> (dashboard at / + /api → castle-api); other services are port-only. - Dashboard/API: castle-app and castle-api are ordinary subdomains. The dashboard derives the API base at runtime (castle-api.<domain> on a subdomain, else /api) and calls it cross-origin — castle-api already allows CORS *. Frontends build with VITE_BASE=/ (served at their subdomain root). - CLI: `service create` drops --path/--host; --no-proxy makes it port-only. - Docs/tests reworked for the model; docs use generic placeholders only (no personal host/domain/IP details).
102 lines
3.5 KiB
Python
102 lines
3.5 KiB
Python
"""Tests for MQTT client serialization logic."""
|
|
|
|
import json
|
|
|
|
from castle_core.registry import Deployment, NodeConfig, NodeRegistry
|
|
|
|
from castle_api.mqtt_client import _json_to_registry, _registry_to_json
|
|
|
|
|
|
def _make_registry() -> NodeRegistry:
|
|
return NodeRegistry(
|
|
node=NodeConfig(hostname="tower", castle_root="/data/repos/castle", gateway_port=9000),
|
|
deployed={
|
|
"my-svc": Deployment(
|
|
runner="python",
|
|
run_cmd=["uv", "run", "my-svc"],
|
|
env={"PORT": "9001", "SECRET_KEY": "super-secret"},
|
|
description="My service",
|
|
behavior="daemon",
|
|
stack="python-fastapi",
|
|
port=9001,
|
|
health_path="/health",
|
|
subdomain="my-svc",
|
|
managed=True,
|
|
),
|
|
"my-job": Deployment(
|
|
runner="command",
|
|
run_cmd=["my-job"],
|
|
behavior="tool",
|
|
stack="python-cli",
|
|
schedule="0 2 * * *",
|
|
),
|
|
},
|
|
)
|
|
|
|
|
|
class TestRegistrySerialization:
|
|
"""Round-trip serialization of NodeRegistry to/from JSON."""
|
|
|
|
def test_round_trip(self) -> None:
|
|
original = _make_registry()
|
|
json_str = _registry_to_json(original)
|
|
restored = _json_to_registry(json_str)
|
|
|
|
assert restored.node.hostname == "tower"
|
|
assert restored.node.gateway_port == 9000
|
|
|
|
def test_deployed_components_preserved(self) -> None:
|
|
original = _make_registry()
|
|
restored = _json_to_registry(_registry_to_json(original))
|
|
|
|
assert "my-svc" in restored.deployed
|
|
svc = restored.deployed["my-svc"]
|
|
assert svc.runner == "python"
|
|
assert svc.port == 9001
|
|
assert svc.health_path == "/health"
|
|
assert svc.subdomain == "my-svc"
|
|
assert svc.managed is True
|
|
assert svc.behavior == "daemon"
|
|
assert svc.stack == "python-fastapi"
|
|
|
|
def test_job_fields_preserved(self) -> None:
|
|
original = _make_registry()
|
|
restored = _json_to_registry(_registry_to_json(original))
|
|
|
|
assert "my-job" in restored.deployed
|
|
job = restored.deployed["my-job"]
|
|
assert job.runner == "command"
|
|
assert job.schedule == "0 2 * * *"
|
|
assert job.behavior == "tool"
|
|
assert job.stack == "python-cli"
|
|
|
|
def test_optional_fields_omitted(self) -> None:
|
|
"""Fields like port, health_path are None when not set."""
|
|
reg = NodeRegistry(
|
|
node=NodeConfig(hostname="minimal"),
|
|
deployed={
|
|
"bare": Deployment(runner="command", run_cmd=["bare"]),
|
|
},
|
|
)
|
|
restored = _json_to_registry(_registry_to_json(reg))
|
|
bare = restored.deployed["bare"]
|
|
assert bare.port is None
|
|
assert bare.health_path is None
|
|
assert bare.subdomain is None
|
|
assert bare.schedule is None
|
|
assert bare.managed is False
|
|
|
|
def test_no_secrets_in_payload(self) -> None:
|
|
"""env vars, run_cmd, and castle_root must not appear in MQTT payload."""
|
|
original = _make_registry()
|
|
json_str = _registry_to_json(original)
|
|
data = json.loads(json_str)
|
|
|
|
# No castle_root in node
|
|
assert "castle_root" not in data["node"]
|
|
|
|
# No env or run_cmd in any component
|
|
for name, comp in data["deployed"].items():
|
|
assert "env" not in comp, f"{name} has env in MQTT payload"
|
|
assert "run_cmd" not in comp, f"{name} has run_cmd in MQTT payload"
|