From afcc5d9e260dded2de81b6c9d515c59fa7e6d86f Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 19 Oct 2025 14:29:54 +0200 Subject: [PATCH] inventory: fix internal indentifier --- .../inventory/distributed-service/inventory-adapter.nix | 2 +- lib/modules/inventory/distributed-service/tests/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/modules/inventory/distributed-service/inventory-adapter.nix b/lib/modules/inventory/distributed-service/inventory-adapter.nix index 66786b375..8d82ed97d 100644 --- a/lib/modules/inventory/distributed-service/inventory-adapter.nix +++ b/lib/modules/inventory/distributed-service/inventory-adapter.nix @@ -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 "" else instance.module.input; id = inputName + "-" + instance.module.name; in acc diff --git a/lib/modules/inventory/distributed-service/tests/default.nix b/lib/modules/inventory/distributed-service/tests/default.nix index 9183ea644..426351c8b 100644 --- a/lib/modules/inventory/distributed-service/tests/default.nix +++ b/lib/modules/inventory/distributed-service/tests/default.nix @@ -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 ? "-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; + "-A" = 2; + "-B" = 1; }; };