refactor(clan.service): make evalClanService a standalone function to interact with standalone modules
This commit is contained in:
Johannes Kirschbauer
@@ -1,8 +1,11 @@
|
|||||||
{ lib, clanLib }:
|
{ lib, clanLib }:
|
||||||
|
let
|
||||||
|
services = clanLib.callLib ./distributed-service/inventory-adapter.nix { };
|
||||||
|
in
|
||||||
{
|
{
|
||||||
|
inherit (services) evalClanService mapInstances;
|
||||||
inherit (import ./build-inventory { inherit lib clanLib; }) buildInventory;
|
inherit (import ./build-inventory { inherit lib clanLib; }) buildInventory;
|
||||||
interface = ./build-inventory/interface.nix;
|
interface = ./build-inventory/interface.nix;
|
||||||
mapInstances = clanLib.callLib ./distributed-service/inventory-adapter.nix { };
|
|
||||||
# Returns the list of machine names
|
# Returns the list of machine names
|
||||||
# { ... } -> [ string ]
|
# { ... } -> [ string ]
|
||||||
resolveTags =
|
resolveTags =
|
||||||
|
|||||||
@@ -14,167 +14,180 @@
|
|||||||
clanLib,
|
clanLib,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
|
||||||
# This is used to resolve the module imports from 'flake.inputs'
|
|
||||||
flakeInputs,
|
|
||||||
# The clan inventory
|
|
||||||
inventory,
|
|
||||||
}:
|
|
||||||
let
|
let
|
||||||
# machineHasTag = machineName: tagName: lib.elem tagName inventory.machines.${machineName}.tags;
|
evalClanService =
|
||||||
|
{ modules, id }:
|
||||||
# map the instances into the module
|
|
||||||
importedModuleWithInstances = lib.mapAttrs (
|
|
||||||
instanceName: instance:
|
|
||||||
let
|
|
||||||
# TODO:
|
|
||||||
resolvedModuleSet =
|
|
||||||
# If the module.name is self then take the modules defined in the flake
|
|
||||||
# Otherwise its an external input which provides the modules via 'clan.modules' attribute
|
|
||||||
if instance.module.input == null then
|
|
||||||
inventory.modules
|
|
||||||
else
|
|
||||||
let
|
|
||||||
input =
|
|
||||||
flakeInputs.${instance.module.input} or (throw ''
|
|
||||||
Flake doesn't provide input with name '${instance.module.input}'
|
|
||||||
|
|
||||||
Choose one of the following inputs:
|
|
||||||
- ${
|
|
||||||
builtins.concatStringsSep "\n- " (
|
|
||||||
lib.attrNames (lib.filterAttrs (_name: input: input ? clan) flakeInputs)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
To import a local module from 'inventory.modules' remove the 'input' attribute from the module definition
|
|
||||||
Remove the following line from the module definition:
|
|
||||||
|
|
||||||
...
|
|
||||||
- module.input = "${instance.module.input}"
|
|
||||||
|
|
||||||
|
|
||||||
'');
|
|
||||||
clanAttrs =
|
|
||||||
input.clan
|
|
||||||
or (throw "It seems the flake input ${instance.module.input} doesn't export any clan resources");
|
|
||||||
in
|
|
||||||
clanAttrs.modules;
|
|
||||||
|
|
||||||
resolvedModule =
|
|
||||||
resolvedModuleSet.${instance.module.name}
|
|
||||||
or (throw "flake doesn't provide clan-module with name ${instance.module.name}");
|
|
||||||
|
|
||||||
# Every instance includes machines via roles
|
|
||||||
# :: { client :: ... }
|
|
||||||
instanceRoles = lib.mapAttrs (
|
|
||||||
roleName: role:
|
|
||||||
let
|
|
||||||
resolvedMachines = clanLib.inventory.resolveTags {
|
|
||||||
members = {
|
|
||||||
# Explicit members
|
|
||||||
machines = lib.attrNames role.machines;
|
|
||||||
# Resolved Members
|
|
||||||
tags = lib.attrNames role.tags;
|
|
||||||
};
|
|
||||||
inherit (inventory) machines;
|
|
||||||
inherit instanceName roleName;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
# instances.<instanceName>.roles.<roleName> =
|
|
||||||
{
|
|
||||||
machines = lib.genAttrs resolvedMachines.machines (
|
|
||||||
machineName:
|
|
||||||
let
|
|
||||||
machineSettings = instance.roles.${roleName}.machines.${machineName}.settings or { };
|
|
||||||
in
|
|
||||||
# TODO: tag settings
|
|
||||||
# Wait for this feature until option introspection for 'settings' is done.
|
|
||||||
# This might get too complex to handle otherwise.
|
|
||||||
# settingsViaTags = lib.filterAttrs (
|
|
||||||
# tagName: _: machineHasTag machineName tagName
|
|
||||||
# ) instance.roles.${roleName}.tags;
|
|
||||||
{
|
|
||||||
# TODO: Do we want to wrap settings with
|
|
||||||
# setDefaultModuleLocation "inventory.instances.${instanceName}.roles.${roleName}.tags.${tagName}";
|
|
||||||
settings = {
|
|
||||||
imports = [
|
|
||||||
machineSettings
|
|
||||||
]; # ++ lib.attrValues (lib.mapAttrs (_tagName: v: v.settings) settingsViaTags);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
);
|
|
||||||
# Maps to settings for the role.
|
|
||||||
# In other words this sets the following path of a clan.service module:
|
|
||||||
# instances.<instanceName>.roles.<roleName>.settings
|
|
||||||
settings = role.settings;
|
|
||||||
}
|
|
||||||
) instance.roles;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
inherit (instance) module;
|
|
||||||
inherit resolvedModule instanceRoles;
|
|
||||||
}
|
|
||||||
) inventory.instances or { };
|
|
||||||
|
|
||||||
# TODO: Eagerly check the _class of the resolved module
|
|
||||||
importedModulesEvaluated = lib.mapAttrs (
|
|
||||||
module_ident: instances:
|
|
||||||
(lib.evalModules {
|
(lib.evalModules {
|
||||||
class = "clan.service";
|
class = "clan.service";
|
||||||
modules =
|
modules = [
|
||||||
[
|
./service-module.nix
|
||||||
./service-module.nix
|
|
||||||
# Import the resolved module.
|
|
||||||
(builtins.head instances).instance.resolvedModule
|
|
||||||
|
|
||||||
# feature modules
|
# feature modules
|
||||||
(lib.modules.importApply ./api-feature.nix {
|
(lib.modules.importApply ./api-feature.nix {
|
||||||
inherit clanLib;
|
inherit clanLib;
|
||||||
attrName = module_ident;
|
attrName = id;
|
||||||
})
|
})
|
||||||
]
|
|
||||||
# Include all the instances that correlate to the resolved module
|
|
||||||
++ (builtins.map (v: {
|
|
||||||
instances.${v.instanceName}.roles = v.instance.instanceRoles;
|
|
||||||
}) instances);
|
|
||||||
})
|
|
||||||
) grouped;
|
|
||||||
|
|
||||||
# Group the instances by the module they resolve to
|
|
||||||
# This is necessary to evaluate the module in a single pass
|
|
||||||
# :: { <module.input>_<module.name> :: [ { name, value } ] }
|
|
||||||
# Since 'perMachine' needs access to all the instances we should include them as a whole
|
|
||||||
grouped = lib.foldlAttrs (
|
|
||||||
acc: instanceName: instance:
|
|
||||||
let
|
|
||||||
inputName = if instance.module.input == null then "self" else instance.module.input;
|
|
||||||
id = inputName + "-" + instance.module.name;
|
|
||||||
in
|
|
||||||
acc
|
|
||||||
// {
|
|
||||||
${id} = acc.${id} or [ ] ++ [
|
|
||||||
{
|
|
||||||
inherit instanceName instance;
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
}
|
});
|
||||||
) { } importedModuleWithInstances;
|
|
||||||
|
|
||||||
# TODO: Return an attribute set of resources instead of a plain list of nixosModules
|
|
||||||
allMachines = lib.foldlAttrs (
|
|
||||||
acc: _module_ident: eval:
|
|
||||||
acc
|
|
||||||
// lib.mapAttrs (
|
|
||||||
machineName: result: acc.${machineName} or [ ] ++ [ result.nixosModule ]
|
|
||||||
) eval.config.result.final
|
|
||||||
) { } importedModulesEvaluated;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit
|
inherit evalClanService;
|
||||||
importedModuleWithInstances
|
mapInstances =
|
||||||
grouped
|
{
|
||||||
|
# This is used to resolve the module imports from 'flake.inputs'
|
||||||
|
flakeInputs,
|
||||||
|
# The clan inventory
|
||||||
|
inventory,
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
# machineHasTag = machineName: tagName: lib.elem tagName inventory.machines.${machineName}.tags;
|
||||||
|
|
||||||
|
# map the instances into the module
|
||||||
|
importedModuleWithInstances = lib.mapAttrs (
|
||||||
|
instanceName: instance:
|
||||||
|
let
|
||||||
|
# TODO:
|
||||||
|
resolvedModuleSet =
|
||||||
|
# If the module.name is self then take the modules defined in the flake
|
||||||
|
# Otherwise its an external input which provides the modules via 'clan.modules' attribute
|
||||||
|
if instance.module.input == null then
|
||||||
|
inventory.modules
|
||||||
|
else
|
||||||
|
let
|
||||||
|
input =
|
||||||
|
flakeInputs.${instance.module.input} or (throw ''
|
||||||
|
Flake doesn't provide input with name '${instance.module.input}'
|
||||||
|
|
||||||
|
Choose one of the following inputs:
|
||||||
|
- ${
|
||||||
|
builtins.concatStringsSep "\n- " (
|
||||||
|
lib.attrNames (lib.filterAttrs (_name: input: input ? clan) flakeInputs)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
To import a local module from 'inventory.modules' remove the 'input' attribute from the module definition
|
||||||
|
Remove the following line from the module definition:
|
||||||
|
|
||||||
|
...
|
||||||
|
- module.input = "${instance.module.input}"
|
||||||
|
|
||||||
|
|
||||||
|
'');
|
||||||
|
clanAttrs =
|
||||||
|
input.clan
|
||||||
|
or (throw "It seems the flake input ${instance.module.input} doesn't export any clan resources");
|
||||||
|
in
|
||||||
|
clanAttrs.modules;
|
||||||
|
|
||||||
|
resolvedModule =
|
||||||
|
resolvedModuleSet.${instance.module.name}
|
||||||
|
or (throw "flake doesn't provide clan-module with name ${instance.module.name}");
|
||||||
|
|
||||||
|
# Every instance includes machines via roles
|
||||||
|
# :: { client :: ... }
|
||||||
|
instanceRoles = lib.mapAttrs (
|
||||||
|
roleName: role:
|
||||||
|
let
|
||||||
|
resolvedMachines = clanLib.inventory.resolveTags {
|
||||||
|
members = {
|
||||||
|
# Explicit members
|
||||||
|
machines = lib.attrNames role.machines;
|
||||||
|
# Resolved Members
|
||||||
|
tags = lib.attrNames role.tags;
|
||||||
|
};
|
||||||
|
inherit (inventory) machines;
|
||||||
|
inherit instanceName roleName;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
# instances.<instanceName>.roles.<roleName> =
|
||||||
|
{
|
||||||
|
machines = lib.genAttrs resolvedMachines.machines (
|
||||||
|
machineName:
|
||||||
|
let
|
||||||
|
machineSettings = instance.roles.${roleName}.machines.${machineName}.settings or { };
|
||||||
|
in
|
||||||
|
# TODO: tag settings
|
||||||
|
# Wait for this feature until option introspection for 'settings' is done.
|
||||||
|
# This might get too complex to handle otherwise.
|
||||||
|
# settingsViaTags = lib.filterAttrs (
|
||||||
|
# tagName: _: machineHasTag machineName tagName
|
||||||
|
# ) instance.roles.${roleName}.tags;
|
||||||
|
{
|
||||||
|
# TODO: Do we want to wrap settings with
|
||||||
|
# setDefaultModuleLocation "inventory.instances.${instanceName}.roles.${roleName}.tags.${tagName}";
|
||||||
|
settings = {
|
||||||
|
imports = [
|
||||||
|
machineSettings
|
||||||
|
]; # ++ lib.attrValues (lib.mapAttrs (_tagName: v: v.settings) settingsViaTags);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
# Maps to settings for the role.
|
||||||
|
# In other words this sets the following path of a clan.service module:
|
||||||
|
# instances.<instanceName>.roles.<roleName>.settings
|
||||||
|
settings = role.settings;
|
||||||
|
}
|
||||||
|
) instance.roles;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit (instance) module;
|
||||||
|
inherit resolvedModule instanceRoles;
|
||||||
|
}
|
||||||
|
) inventory.instances or { };
|
||||||
|
|
||||||
|
# TODO: Eagerly check the _class of the resolved module
|
||||||
|
importedModulesEvaluated = lib.mapAttrs (
|
||||||
|
module_ident: instances:
|
||||||
|
evalClanService {
|
||||||
|
id = module_ident;
|
||||||
|
modules =
|
||||||
|
[
|
||||||
|
# Import the resolved module.
|
||||||
|
(builtins.head instances).instance.resolvedModule
|
||||||
|
] # Include all the instances that correlate to the resolved module
|
||||||
|
++ (builtins.map (v: {
|
||||||
|
instances.${v.instanceName}.roles = v.instance.instanceRoles;
|
||||||
|
}) instances);
|
||||||
|
}
|
||||||
|
) grouped;
|
||||||
|
|
||||||
|
# Group the instances by the module they resolve to
|
||||||
|
# This is necessary to evaluate the module in a single pass
|
||||||
|
# :: { <module.input>_<module.name> :: [ { name, value } ] }
|
||||||
|
# Since 'perMachine' needs access to all the instances we should include them as a whole
|
||||||
|
grouped = lib.foldlAttrs (
|
||||||
|
acc: instanceName: instance:
|
||||||
|
let
|
||||||
|
inputName = if instance.module.input == null then "self" else instance.module.input;
|
||||||
|
id = inputName + "-" + instance.module.name;
|
||||||
|
in
|
||||||
|
acc
|
||||||
|
// {
|
||||||
|
${id} = acc.${id} or [ ] ++ [
|
||||||
|
{
|
||||||
|
inherit instanceName instance;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
) { } importedModuleWithInstances;
|
||||||
|
|
||||||
|
# TODO: Return an attribute set of resources instead of a plain list of nixosModules
|
||||||
|
allMachines = lib.foldlAttrs (
|
||||||
|
acc: _module_ident: eval:
|
||||||
|
acc
|
||||||
|
// lib.mapAttrs (
|
||||||
|
machineName: result: acc.${machineName} or [ ] ++ [ result.nixosModule ]
|
||||||
|
) eval.config.result.final
|
||||||
|
) { } importedModulesEvaluated;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit
|
||||||
|
importedModuleWithInstances
|
||||||
|
grouped
|
||||||
|
|
||||||
|
allMachines
|
||||||
|
importedModulesEvaluated
|
||||||
|
;
|
||||||
|
};
|
||||||
|
|
||||||
allMachines
|
|
||||||
importedModulesEvaluated
|
|
||||||
;
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user