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

users: migrate to clan.nixosTests module

Browse Source
This commit is contained in:
Jörg Thalheim
2025-06-17 19:35:16 +02:00
parent 6e6167ac64
commit 845952ab86
2 changed files with 45 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
clanServices/users/flake-module.nix
View File

@@ -1,18 +1,16 @@
{ lib, self, ... }: { lib, ... }:
let
module = lib.modules.importApply ./default.nix { };
in
{ {
clan.modules = { clan.modules.users = module;
users = lib.modules.importApply ./default.nix { };
};
perSystem = perSystem =
{ pkgs, ... }: { ... }:
{ {
checks = lib.optionalAttrs (pkgs.stdenv.isLinux) { clan.nixosTests.users = {
users = import ./tests/vm/default.nix { imports = [ ./tests/vm/default.nix ];
inherit pkgs;
clan-core = self; clan.modules."@clan/users" = module;
nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
};
}; };
}; };
} }

87
clanServices/users/tests/vm/default.nix
View File

@@ -1,67 +1,50 @@
{ {
pkgs, name = "users";
nixosLib,
clan-core,
...
}:
nixosLib.runTest ( clan = {
{ ... }: directory = ./.;
{ inventory = {
imports = [ machines.server = { };
clan-core.modules.nixosVmTest.clanTest
];
hostPkgs = pkgs; instances = {
root-password-test = {
name = "users"; module.name = "@clan/users";
roles.default.machines."server".settings = {
clan = { user = "root";
directory = ./.; prompt = false;
modules."@clan/users" = ../../default.nix;
inventory = {
machines.server = { };
instances = {
root-password-test = {
module.name = "@clan/users";
roles.default.machines."server".settings = {
user = "root";
prompt = false;
};
}; };
user-password-test = { };
module.name = "@clan/users"; user-password-test = {
roles.default.machines."server".settings = { module.name = "@clan/users";
user = "testuser"; roles.default.machines."server".settings = {
prompt = false; user = "testuser";
}; prompt = false;
}; };
}; };
}; };
}; };
};
nodes = { nodes = {
server = { server = {
users.users.testuser.group = "testuser"; users.users.testuser.group = "testuser";
users.groups.testuser = { }; users.groups.testuser = { };
users.users.testuser.isNormalUser = true; users.users.testuser.isNormalUser = true;
};
}; };
};
testScript = '' testScript = ''
start_all() start_all()
server.wait_for_unit("multi-user.target") server.wait_for_unit("multi-user.target")
# Check that the testuser account exists # Check that the testuser account exists
server.succeed("id testuser") server.succeed("id testuser")
# Try to log in as the user using the generated password # Try to log in as the user using the generated password
# TODO: fix # TODO: fix
# password = server.succeed("cat /run/clan/vars/user-password/user-password").strip() # password = server.succeed("cat /run/clan/vars/user-password/user-password").strip()
# server.succeed(f"echo '{password}' | su - testuser -c 'echo Login successful'") # server.succeed(f"echo '{password}' | su - testuser -c 'echo Login successful'")
''; '';
} }
)