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

Merge pull request 'Fix: wrong path concat coercion' (#2219) from hsjobeki/clan-core:hsjobeki-main into main

Browse Source
This commit is contained in:
clan-bot
2024-10-07 21:14:21 +00:00
parent bbe0d264f1 50f61979a5
commit 899bfde40c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/inventory/build-inventory/default.nix
View File

@@ -98,12 +98,12 @@ let
roleModules = builtins.map ( roleModules = builtins.map (
role: role:
let let
path = "${clan-core.clanModules.${serviceName}}/roles/${role}.nix"; path = clan-core.clanModules.${serviceName} + "/roles/${role}.nix";
in in
if builtins.pathExists path then if builtins.pathExists path then
path path
else else
throw "Module doesn't have role: '${role}'. Path: ${path} not found." throw "Module doesn't have role: '${role}'. Role: ${role}.nix not found."
) machineRoles; ) machineRoles;
roleServiceConfigs = builtins.filter (m: m != { }) ( roleServiceConfigs = builtins.filter (m: m != { }) (

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

@@ -42,13 +42,13 @@ in
expected = { expected = {
server_imports = [ server_imports = [
"${clan-core.clanModules.borgbackup}/roles/server.nix" (clan-core.clanModules.borgbackup + "/roles/server.nix")
]; ];
client_1_imports = [ client_1_imports = [
"${clan-core.clanModules.borgbackup}/roles/client.nix" (clan-core.clanModules.borgbackup + "/roles/client.nix")
]; ];
client_2_imports = [ client_2_imports = [
"${clan-core.clanModules.borgbackup}/roles/client.nix" (clan-core.clanModules.borgbackup + "/roles/client.nix")
]; ];
}; };
}; };
@@ -114,8 +114,8 @@ in
}; };
expected = { expected = {
machine_1_imports = [ machine_1_imports = [
"${clan-core.clanModules.borgbackup}/roles/client.nix" (clan-core.clanModules.borgbackup + "/roles/client.nix")
"${clan-core.clanModules.borgbackup}/roles/server.nix" (clan-core.clanModules.borgbackup + "/roles/server.nix")
]; ];
}; };
}; };