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

fix(checks/data-mesher): format, dont pass a duplicate data-mesher module

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-04-09 18:03:04 +02:00
parent ec2aee3013
commit c344d57298
8 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
checks/data-mesher/default.nix
View File

@@ -1,5 +1,5 @@
(import ../lib/test-inventory.nix) ( (import ../lib/test-inventory.nix) (
{ self, lib, ... }: { lib, ... }:
let let
machines = [ machines = [
@@ -21,9 +21,6 @@
roles.signer.machines = [ "signer" ]; roles.signer.machines = [ "signer" ];
}; };
}; };
modules = {
data-mesher = self.clanModules.data-mesher;
};
}; };
directory = ./.; directory = ./.;
}; };

4
checks/dummy-inventory-test/default.nix
View File

@@ -48,7 +48,9 @@
}; };
}; };
testScript = { nodes, ...}: '' testScript =
{ nodes, ... }:
''
start_all() start_all()
admin1.wait_for_unit("multi-user.target") admin1.wait_for_unit("multi-user.target")
peer1.wait_for_unit("multi-user.target") peer1.wait_for_unit("multi-user.target")

5
checks/dummy-inventory-test/sops/users/admin/key.json
View File

@@ -1 +1,4 @@
{"publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", "type": "age"} {
"publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
"type": "age"
}

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

@@ -28,7 +28,7 @@ let
inherit (config) inventory; inherit (config) inventory;
inherit flakeInputs; inherit flakeInputs;
}; };
machines = lib.mapAttrs (machineName: v: { machines = lib.mapAttrs (_machineName: v: {
machineImports = v; machineImports = v;
}) config.distributedServices.allMachines; }) config.distributedServices.allMachines;
} }