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.
105 lines
3.6 KiB
Python
105 lines
3.6 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(
|
|
manager="systemd",
|
|
launcher="python",
|
|
run_cmd=["uv", "run", "my-svc"],
|
|
env={"PORT": "9001", "SECRET_KEY": "super-secret"},
|
|
description="My service",
|
|
kind="service",
|
|
stack="python-fastapi",
|
|
port=9001,
|
|
health_path="/health",
|
|
subdomain="my-svc",
|
|
managed=True,
|
|
),
|
|
"my-job": Deployment(
|
|
manager="systemd",
|
|
launcher="command",
|
|
run_cmd=["my-job"],
|
|
kind="job",
|
|
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.manager == "systemd"
|
|
assert svc.launcher == "python"
|
|
assert svc.port == 9001
|
|
assert svc.health_path == "/health"
|
|
assert svc.subdomain == "my-svc"
|
|
assert svc.managed is True
|
|
assert svc.kind == "service"
|
|
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.launcher == "command"
|
|
assert job.schedule == "0 2 * * *"
|
|
assert job.kind == "job"
|
|
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(manager="systemd", launcher="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"
|