Merge pull request 'Refactor(inventory): move prio 'introspection' into inventoryClass to minimize the 'clanInternals' api' (#3440) from hsjobeki/clan-core:ui-fixups into main

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

lib/build-clan/interface.nix

@@ -160,7 +160,6 @@ in
           # Those options are interfaced by the CLI
           # We don't specify the type here, for better performance.
           inventory = lib.mkOption { type = lib.types.raw; };
-          inventoryValuesPrios = lib.mkOption { type = lib.types.raw; };
           # all exported clan templates from this clan
           templates = lib.mkOption { type = lib.types.raw; };
           # all exported clan modules from this clan

lib/build-clan/module.nix

@@ -210,14 +210,12 @@ in
     modules = config.modules;
 
     inherit inventoryFile;
-    inventoryValuesPrios =
-      # Temporary workaround
-      builtins.removeAttrs (clan-core.clanLib.introspection.getPrios { options = inventory.options; })
-        # tags are freeformType which is not supported yet.
-        [ "tags" ];
 
     templates = config.templates;
     inventory = config.inventory;
+    # TODO: Remove this in about a month
+    # It is only here for backwards compatibility for people with older CLI versions
+    inventoryValuesPrios = inventoryClass.introspection;
     meta = config.inventory.meta;
     secrets = config.secrets;
 

lib/inventory/build-inventory/default.nix

@@ -33,6 +33,7 @@ let
             }) config.distributedServices.allMachines;
           }
         )
+        (lib.modules.importApply ./inventory-introspection.nix { inherit clanLib; })
       ];
     }).config;
 in

lib/inventory/build-inventory/inventory-introspection.nix

@@ -0,0 +1,17 @@
+{ clanLib }:
+{
+  config,
+  options,
+  lib,
+  ...
+}:
+{
+  options.introspection = lib.mkOption {
+    readOnly = true;
+    # TODO: use options.inventory instead of the evaluate config attribute
+    default =
+      builtins.removeAttrs (clanLib.introspection.getPrios { options = config.inventory.options; })
+        # tags are freeformType which is not supported yet.
+        [ "tags" ];
+  };
+}