build-inventory: move inventory and inventoryClass into explizitly different folders

2025-06-25 17:45:10 +02:00
parent ae4e18c152
commit 345aa12e99
42 changed files with 49 additions and 139 deletions
--- a/lib/inventory/default.nix
+++ b/lib/inventory/default.nix
@@ -1,51 +0,0 @@
-{ lib, clanLib }:
-let
-  services = clanLib.callLib ./distributed-service/inventory-adapter.nix { };
-in
-{
-  inherit (services) evalClanService mapInstances resolveModule;
-  inherit (import ./build-inventory { inherit lib clanLib; }) buildInventory;
-  interface = {
-    _file = "inventory/default.nix";
-    imports = [
-      ./build-inventory/interface.nix
-    ];
-    _module.args = { inherit clanLib; };
-  };
-  # Returns the list of machine names
-  # { ... } -> [ string ]
-  resolveTags =
-    {
-      # Available InventoryMachines :: { {name} :: { tags = [ string ]; }; }
-      machines,
-      # Requested members :: { machines, tags }
-      # Those will be resolved against the available machines
-      members,
-      # Not needed for resolution - only for error reporting
-      roleName,
-      instanceName,
-    }:
-    {
-      machines =
-        members.machines or [ ]
-        ++ (builtins.foldl' (
-          acc: tag:
-          let
-            # For error printing
-            availableTags = lib.foldlAttrs (
-              acc: _: v:
-              v.tags or [ ] ++ acc
-            ) [ ] (machines);
-
-            tagMembers = builtins.attrNames (lib.filterAttrs (_n: v: builtins.elem tag v.tags or [ ]) machines);
-          in
-          if tagMembers == [ ] then
-            lib.warn ''
-              Service instance '${instanceName}': - ${roleName} tags: no machine with tag '${tag}' found.
-              Available tags: ${builtins.toJSON (lib.unique availableTags)}
-            '' acc
-          else
-            acc ++ tagMembers
-        ) [ ] members.tags or [ ]);
-    };
-}