Merge pull request 'chore(checks/inventory): doogfood 'clan' flake-parts module into the test, instead of custom inventory logic' (#3279) from hsjobeki/clan-core:clan-services into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3279

checks/data-mesher/default.nix

@@ -11,7 +11,8 @@
   {
     name = "data-mesher";
 
-    inventory = {
+    clan = {
+      directory = ./.;
       inventory = {
         machines = lib.genAttrs machines (_: { });
         services = {
@@ -22,7 +23,6 @@
           };
         };
       };
-      directory = ./.;
     };
 
     defaults =

checks/dummy-inventory-test/default.nix

@@ -7,8 +7,9 @@
     # - clan.service modules
     name = "dummy-inventory-test";
 
-    inventory.directory = ./.;
-    inventory.inventory = {
+    clan = {
+      directory = ./.;
+      inventory = {
         machines.peer1 = { };
         machines.admin1 = { };
         services = {
@@ -47,6 +48,7 @@
           };
         };
       };
+    };
 
     testScript =
       { nodes, ... }:

checks/lib/test-inventory.nix

@@ -2,37 +2,54 @@ test:
 { pkgs, self, ... }:
 let
   inherit (pkgs) lib;
-  inherit (lib) mkOption flip mapAttrs;
-  inherit (lib.types) path raw;
-  inherit (self.clanLib) buildClan;
+  inherit (lib)
+    mkOption
+    flip
+    mapAttrs
+    types
+    ;
   nixos-lib = import (pkgs.path + "/nixos/lib") { };
 in
 (nixos-lib.runTest (
   { config, ... }:
   let
-    result = buildClan {
-      inventory = config.inventory.inventory;
-      # TODO: make directory argument optional in buildInventory
-      directory = config.inventory.directory;
-    };
+    clanFlakeResult = config.clan;
   in
   {
     imports = [ test ];
     options = {
-      inventory.inventory = mkOption {
-        description = "Inventory of machines and services";
-        type = raw;
+      clanSettings = mkOption {
+        default = { };
+        type = types.submodule {
+          options = {
+            clan-core = mkOption { default = self; };
+            nixpkgs = mkOption { default = self.inputs.nixpkgs; };
+            nix-darwin = mkOption { default = self.inputs.nix-darwin; };
+          };
+        };
+      };
+
+      clan = mkOption {
+        default = { };
+        type = types.submoduleWith {
+          specialArgs = {
+            inherit (config.clanSettings)
+              clan-core
+              nixpkgs
+              nix-darwin
+              ;
+          };
+          modules = [
+            self.clanLib.buildClanModule.flakePartsModule
+          ];
         };
-      inventory.directory = mkOption {
-        description = "Directory which contains the vars";
-        type = path;
       };
     };
     config = {
-      nodes = flip mapAttrs result.clanInternals.inventoryClass.machines (
+      nodes = flip mapAttrs clanFlakeResult.clanInternals.inventoryClass.machines (
         machineName: attrs: {
           imports = attrs.machineImports ++ [ self.nixosModules.clanCore ];
-          clan.core.settings.directory = "${config.inventory.directory}";
+          clan.core.settings.directory = "${config.clan.directory}";
           clan.core.settings.machine.name = machineName;
         }
       );