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

Merge pull request 'inventory: fix internal indentifier' (#5576) from inventory-fixes-2 into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5576
This commit is contained in:
hsjobeki
2025-10-19 14:25:45 +00:00
parent 0e9931d749 afcc5d9e26
commit 460c6d4fc9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@
grouped = lib.foldlAttrs (
acc: instanceName: instance:
let
inputName = if instance.module.input == null then "self" else instance.module.input;
inputName = if instance.module.input == null then "<clan-core>" else instance.module.input;
id = inputName + "-" + instance.module.name;
in
acc

6
lib/modules/inventory/distributed-service/tests/default.nix
View File

@@ -79,7 +79,7 @@ in
{
# Test that the module is mapped into the output
# We might change the attribute name in the future
expr = res.importedModulesEvaluated ? "self-simple-module";
expr = res.importedModulesEvaluated ? "<clan-core>-simple-module";
expected = true;
inherit res;
};
@@ -133,8 +133,8 @@ in
# We might change the attribute name in the future
expr = lib.mapAttrs (_n: v: builtins.length v) res.grouped;
expected = {
self-A = 2;
self-B = 1;
"<clan-core>-A" = 2;
"<clan-core>-B" = 1;
};
};