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

fix(eval/inventory): fix some test arguments to buildInventory

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-04-09 17:38:06 +02:00
parent 24137336f1
commit 3ccfcdc0c1
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ let
inherit (instance) module; inherit (instance) module;
inherit resolvedModule instanceRoles; inherit resolvedModule instanceRoles;
} }
) inventory.instances; ) inventory.instances or {};
# TODO: Eagerly check the _class of the resolved module # TODO: Eagerly check the _class of the resolved module
importedModulesEvaluated = lib.mapAttrs ( importedModulesEvaluated = lib.mapAttrs (

9
lib/inventory/tests/default.nix
View File

@@ -12,6 +12,7 @@ in
test_inventory_a = test_inventory_a =
let let
compiled = buildInventory { compiled = buildInventory {
flakeInputs = {};
inventory = { inventory = {
machines = { machines = {
A = { }; A = { };
@@ -41,6 +42,7 @@ in
test_inventory_empty = test_inventory_empty =
let let
compiled = buildInventory { compiled = buildInventory {
flakeInputs = {};
inventory = { }; inventory = { };
directory = ./.; directory = ./.;
}; };
@@ -53,6 +55,7 @@ in
test_inventory_role_resolve = test_inventory_role_resolve =
let let
compiled = buildInventory { compiled = buildInventory {
flakeInputs = {};
directory = ./.; directory = ./.;
inventory = { inventory = {
modules = clan-core.clanModules; modules = clan-core.clanModules;
@@ -111,6 +114,7 @@ in
test_inventory_tag_resolve = test_inventory_tag_resolve =
let let
configs = buildInventory { configs = buildInventory {
flakeInputs = {};
directory = ./.; directory = ./.;
inventory = { inventory = {
modules = clan-core.clanModules; modules = clan-core.clanModules;
@@ -151,6 +155,7 @@ in
test_inventory_multiple_roles = test_inventory_multiple_roles =
let let
configs = buildInventory { configs = buildInventory {
flakeInputs = {};
directory = ./.; directory = ./.;
inventory = { inventory = {
modules = clan-core.clanModules; modules = clan-core.clanModules;
@@ -177,6 +182,7 @@ in
test_inventory_module_doesnt_exist = test_inventory_module_doesnt_exist =
let let
configs = buildInventory { configs = buildInventory {
flakeInputs = {};
directory = ./.; directory = ./.;
inventory = { inventory = {
modules = clan-core.clanModules; modules = clan-core.clanModules;
@@ -203,6 +209,7 @@ in
test_inventory_role_doesnt_exist = test_inventory_role_doesnt_exist =
let let
configs = buildInventory { configs = buildInventory {
flakeInputs = {};
directory = ./.; directory = ./.;
inventory = { inventory = {
modules = clan-core.clanModules; modules = clan-core.clanModules;
@@ -230,6 +237,7 @@ in
test_inventory_tag_doesnt_exist = test_inventory_tag_doesnt_exist =
let let
configs = buildInventory { configs = buildInventory {
flakeInputs = {};
directory = ./.; directory = ./.;
inventory = { inventory = {
modules = clan-core.clanModules; modules = clan-core.clanModules;
@@ -258,6 +266,7 @@ in
test_inventory_disabled_service = test_inventory_disabled_service =
let let
configs = buildInventory { configs = buildInventory {
flakeInputs = {};
directory = ./.; directory = ./.;
inventory = { inventory = {
modules = clan-core.clanModules; modules = clan-core.clanModules;