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,40 +7,42 @@
     # - clan.service modules
     name = "dummy-inventory-test";
 
-    inventory.directory = ./.;
+    clan = {
-    inventory.inventory = {
+      directory = ./.;
-      machines.peer1 = { };
+      inventory = {
-      machines.admin1 = { };
+        machines.peer1 = { };
-      services = {
+        machines.admin1 = { };
-        legacy-module.default = {
+        services = {
-          roles.peer.machines = [ "peer1" ];
+          legacy-module.default = {
-          roles.admin.machines = [ "admin1" ];
+            roles.peer.machines = [ "peer1" ];
+            roles.admin.machines = [ "admin1" ];
+          };
+        };
+        instances."test" = {
+          module.name = "new-service";
+          roles.peer.machines.peer1 = { };
         };
-      };
-      instances."test" = {
-        module.name = "new-service";
-        roles.peer.machines.peer1 = { };
-      };
 
-      modules = {
+        modules = {
-        legacy-module = ./legacy-module;
+          legacy-module = ./legacy-module;
-        new-service = {
+          new-service = {
-          _class = "clan.service";
+            _class = "clan.service";
-          manifest.name = "new-service";
+            manifest.name = "new-service";
-          roles.peer = { };
+            roles.peer = { };
-          perMachine = {
+            perMachine = {
-            nixosModule = {
+              nixosModule = {
-              # This should be generated by:
+                # This should be generated by:
-              # ./pkgs/scripts/update-vars.py inventory-test-framework-compatibility-test
+                # ./pkgs/scripts/update-vars.py inventory-test-framework-compatibility-test
-              clan.core.vars.generators.new-service = {
+                clan.core.vars.generators.new-service = {
-                files.hello = {
+                  files.hello = {
-                  secret = false;
+                    secret = false;
-                  deploy = true;
+                    deploy = true;
+                  };
+                  script = ''
+                    # This is a dummy script that does nothing
+                    echo "This is a dummy script" > $out/hello
+                  '';
                 };
-                script = ''
-                  # This is a dummy script that does nothing
-                  echo "This is a dummy script" > $out/hello
-                '';
               };
             };
           };

checks/lib/test-inventory.nix

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