kind is a deployment property, not a program property
A program has no single kind — it HAS deployments, each with its own kind (a
program can be a tool AND a job, e.g. protonmail). Remove program-level kind:
- core: drop ProgramSpec.kind; CastleConfig.kind_of → deployments_of(name) →
[(deployment-name, kind)]; tools property derives from a tool deployment.
- api: ProgramSummary drops kind/services/jobs → deployments: [{name, kind}];
/programs?kind= filters by deployment-kind membership; a program's legacy
DeploymentSummary carries kind=None.
- cli: list/info show a program's set of deployment kinds; --kind filters by
membership.
Also: Services page now covers statics — /services returns kind in
{service, static} (both are exposed, URL-reachable 'services', caddy vs systemd),
and ServiceSummary gains kind + manager to distinguish them.
Suites: core 124, cli 25, castle-api 58.
This commit is contained in:
@@ -53,16 +53,18 @@ def run_info(args: argparse.Namespace) -> int:
|
||||
print(f"\n{BOLD}{name}{RESET}")
|
||||
print(f"{'─' * 40}")
|
||||
|
||||
# Determine kind (derived)
|
||||
kind = None
|
||||
if program and program.kind:
|
||||
kind = program.kind
|
||||
# Determine kind(s) — for a program, the kinds of its deployments; for a
|
||||
# single deployment, its own kind.
|
||||
kinds: list[str] = []
|
||||
if program:
|
||||
kinds = sorted({k for _, k in config.deployments_of(name)})
|
||||
elif service:
|
||||
kind = "service"
|
||||
kinds = ["service"]
|
||||
elif job:
|
||||
kind = "job"
|
||||
if kind:
|
||||
print(f" {BOLD}kind{RESET}: {kind}")
|
||||
kinds = ["job"]
|
||||
if kinds:
|
||||
label = "kind" if len(kinds) == 1 else "kinds"
|
||||
print(f" {BOLD}{label}{RESET}: {', '.join(kinds)}")
|
||||
|
||||
# Show stack
|
||||
stack = None
|
||||
@@ -182,8 +184,8 @@ def _info_json(
|
||||
data["service"] = service.model_dump(exclude_none=True, exclude={"id"})
|
||||
if job:
|
||||
data["job"] = job.model_dump(exclude_none=True, exclude={"id"})
|
||||
if program and program.kind:
|
||||
data["kind"] = program.kind
|
||||
if program:
|
||||
data["kinds"] = sorted({k for _, k in config.deployments_of(name)})
|
||||
elif service:
|
||||
data["kind"] = "service"
|
||||
elif job:
|
||||
|
||||
Reference in New Issue
Block a user