inventory: Add roles.<name>.description option and a warning if it is not set

This commit is contained in:
Qubasa
2025-10-01 18:28:11 +02:00
parent b344db021b
commit 2df96d3a9b
7 changed files with 75 additions and 10 deletions

View File

@@ -37,8 +37,14 @@ const mockFetcher: Fetcher = <K extends OperationNames>(
description: "This is module A",
},
roles: {
client: null,
server: null,
client: {
name: "client",
description: null,
},
server: {
name: "server",
description: null,
},
},
},
},
@@ -52,9 +58,18 @@ const mockFetcher: Fetcher = <K extends OperationNames>(
description: "This is module B",
},
roles: {
peer: null,
moon: null,
controller: null,
peer: {
name: "peer",
description: null,
},
moon: {
name: "moon",
description: null,
},
controller: {
name: "controller",
description: null,
},
},
},
},

View File

@@ -147,10 +147,16 @@ def extract_frontmatter[T](
)
@dataclass(frozen=True, eq=True)
class Role:
name: str
description: str | None = None
@dataclass
class ModuleInfo:
manifest: ModuleManifest
roles: dict[str, None]
roles: dict[str, Role]
@dataclass
@@ -242,6 +248,9 @@ def list_service_modules(flake: Flake) -> ClanModules:
"input": None if input_name == clan_input_name else input_name,
}
)
roles = module_info.get("roles", {})
res.append(
Module(
instance_refs=find_instance_refs_for_module(
@@ -249,7 +258,13 @@ def list_service_modules(flake: Flake) -> ClanModules:
),
usage_ref=module_ref,
info=ModuleInfo(
roles=module_info.get("roles", {}),
roles={
rname: Role(
name=rname,
description=roles[rname].get("description", None),
)
for rname in roles
},
manifest=ModuleManifest.from_dict(module_info["manifest"]),
),
native=(input_name == clan_input_name),
@@ -462,7 +477,8 @@ def set_service_instance(
raise ClanError(msg)
module = resolve_service_module_ref(flake, module_ref)
allowed_roles = module.info.roles.keys()
allowed_roles = list(module.info.roles)
for role_name in roles:
if role_name not in allowed_roles:

View File

@@ -62,6 +62,13 @@ def test_list_service_instances(
assert instances["baz"].resolved.usage_ref.get("input") is None
assert instances["baz"].resolved.usage_ref.get("name") == "sshd"
borgbackup_service = next(
m for m in service_modules.modules if m.usage_ref.get("name") == "borgbackup"
)
# Module has roles with descriptions
assert borgbackup_service.info.roles["client"].description is not None
assert borgbackup_service.info.roles["server"].description is not None
@pytest.mark.with_core
def test_list_service_modules(