yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(lib/inventory): fix arguments discrepancy on perInstance and perMachine

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-04-04 14:07:39 +02:00
parent 6c8d2d3cb5
commit f326c307eb
4 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/inventory/distributed-service/service-module.nix
View File

@@ -317,20 +317,24 @@ in
*/
v: instanceName: machineName:
(lib.evalModules {
specialArgs = {
inherit instanceName;
machine = {
name = machineName;
specialArgs =
let
roles = applySettings instanceName config.instances.${instanceName};
in
{
inherit instanceName roles;
machine = {
name = machineName;
roles = lib.attrNames (lib.filterAttrs (_n: v: v.machines ? ${machineName}) roles);
};
settings = (
makeExtensibleConfig evalMachineSettings {
inherit roleName instanceName machineName;
settings =
config.instances.${instanceName}.roles.${roleName}.machines.${machineName}.settings or { };
}
);
};
settings = (
makeExtensibleConfig evalMachineSettings {
inherit roleName instanceName machineName;
settings =
config.instances.${instanceName}.roles.${roleName}.machines.${machineName}.settings or { };
}
);
};
modules = [ v ];
}).config;
};