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

fix(inventory/interface): use explizit file dependency, until dependency injection works properly

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-04-02 11:09:09 +02:00
parent 2ab53b05fe
commit 2715c398cc
7 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/inventory/default.nix
View File

@@ -2,8 +2,8 @@
{
inherit (import ./build-inventory { inherit lib clanLib; }) buildInventory;
interface = ./build-inventory/interface.nix;
mapInstances = clanLib.callLib ./distributed-service/inventory-adapter.nix {};
# Returns the list of machine names
mapInstances = clanLib.callLib ./distributed-service/inventory-adapter.nix { };
# Returns the list of machine names
# { ... } -> [ string ]
resolveTags =
{

3
lib/inventory/distributed-service/inventory-adapter.nix
View File

@@ -169,5 +169,6 @@ in
grouped
allMachines
importedModulesEvaluated;
importedModulesEvaluated
;
}

3
lib/inventory/distributed-service/tests/per_machine_args.nix
View File

@@ -84,7 +84,8 @@ in
specificMachineSettings = filterInternals res.importedModulesEvaluated.self-A.config.result.allMachines.jon.nixosModule.instance_foo.roles.peer.machines.jon.settings;
hasRoleSettings =
res.importedModulesEvaluated.self-A.config.result.allMachines.jon.nixosModule.instance_foo.roles.peer ? settings;
res.importedModulesEvaluated.self-A.config.result.allMachines.jon.nixosModule.instance_foo.roles.peer
? settings;
# settings are specific.
# Below we access: