ClanModules: make all module available to inventory

This commit is contained in:
Johannes Kirschbauer
2024-09-13 17:18:12 +02:00
parent e561a7cbb7
commit 7c0d87c5b1
3 changed files with 7 additions and 5 deletions

View File

@@ -28,7 +28,7 @@ import os
from pathlib import Path from pathlib import Path
from typing import Any from typing import Any
from clan_cli.api.modules import Frontmatter, extract_frontmatter, get_roles from clan_cli.api.modules import Frontmatter, extract_frontmatter
from clan_cli.errors import ClanError from clan_cli.errors import ClanError
# Get environment variables # Get environment variables
@@ -277,9 +277,9 @@ def produce_clan_modules_docs() -> None:
output += f"{readme_content}\n" output += f"{readme_content}\n"
# get_roles(str) -> list[str] | None # get_roles(str) -> list[str] | None
roles = get_roles(CLAN_CORE_PATH / "clanModules" / module_name) # roles = get_roles(CLAN_CORE_PATH / "clanModules" / module_name)
if roles: # if roles:
output += render_roles(roles, module_name) # output += render_roles(roles, module_name)
output += module_usage(module_name) output += module_usage(module_name)

View File

@@ -135,6 +135,8 @@ let
in in
if builtins.pathExists path then if builtins.pathExists path then
path path
else if role == "default" then
{ }
else else
throw "Module doesn't have role: '${role}'. Path: ${path} not found." throw "Module doesn't have role: '${role}'. Path: ${path} not found."
) inverseRoles.${machineName} or [ ]; ) inverseRoles.${machineName} or [ ];

View File

@@ -96,7 +96,7 @@ let
let let
roles = getRoles self.clanModules.${moduleName}; roles = getRoles self.clanModules.${moduleName};
in in
if roles == null then [ ] else roles; if roles == null then [ "default" ] else roles;
moduleServices = lib.mapAttrs moduleToService ( moduleServices = lib.mapAttrs moduleToService (
lib.filterAttrs (n: _v: rolesOf n != [ ]) modulesSchema lib.filterAttrs (n: _v: rolesOf n != [ ]) modulesSchema
); );