chore(inventory/services): dont check _class of legacy clanModules.

Let the module system handle the error. Once we shift to deferred
modules, things get more complicated and we cannot check the module
class eagerly
This commit is contained in:
Johannes Kirschbauer
2025-04-08 15:03:58 +02:00
parent 6c71cdc8cd
commit dd62b6c97a
5 changed files with 35 additions and 43 deletions

View File

@@ -56,7 +56,7 @@ let
assertions = { };
};
legacyResolveImports =
resolveImports =
{
supportedRoles,
resolvedRolesPerInstance,
@@ -168,36 +168,16 @@ in
./roles.nix
];
isClanModule =
let
firstRole = import (getRoleFile (builtins.head config.supportedRoles));
loadModuleForClassCheck =
m:
if lib.isFunction m then
let
args = lib.functionArgs m;
in
m args
else
m;
module = loadModuleForClassCheck (firstRole);
in
if (module) ? _class then module._class == "clan" else false;
# The actual result
machineImports =
if config.isClanModule then
throw "Clan modules are not supported yet."
else
legacyResolveImports {
supportedRoles = config.supportedRoles;
resolvedRolesPerInstance = config.resolvedRolesPerInstance;
inherit
serviceConfigs
serviceName
machineName
getRoleFile
;
};
machineImports = resolveImports {
supportedRoles = config.supportedRoles;
resolvedRolesPerInstance = config.resolvedRolesPerInstance;
inherit
serviceConfigs
serviceName
machineName
getRoleFile
;
};
# Assertions
assertions = {

View File

@@ -54,9 +54,6 @@ in
matchedRoles = mkOption {
type = types.listOf types.str;
};
isClanModule = mkOption {
type = types.bool;
};
machinesRoles = mkOption {
type = types.attrsOf (types.listOf types.str);
};

View File

@@ -14,7 +14,7 @@ in
{
# Roles resolution
# : List String
supportedRoles = clanLib.modules.getRoles inventory.modules serviceName;
supportedRoles = clanLib.modules.getRoles "inventory.modules" inventory.modules serviceName;
matchedRoles = builtins.attrNames (
lib.filterAttrs (_: ms: builtins.elem machineName ms) config.machinesRoles
);