mirrors/home-manager
mirrors/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-03-31 04:04:32 +00:00
Code Activity

rclone: ensure remotes have a type field

Browse source
This commit is contained in:
Jess 2025-03-23 12:33:23 +13:00 • committed by Austin Horstman
parent 7a08b8c898
commit 7853236fae
3 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/programs/rclone.nix
View file

@ -17,7 +17,16 @@ in {
options = {
config = lib.mkOption {
type = with lib.types;
attrsOf (nullOr (oneOf [ bool int float str ]));
let
baseType = attrsOf (nullOr (oneOf [ bool int float str ]));
# Should we verify whether type constitutes a valid remote?
remoteConfigType = addCheck baseType (lib.hasAttr "type") // {
name = "rcloneRemoteConfig";
description =
"An attribute set containing a remote type and options.";
};
in remoteConfigType;
default = { };
description = ''
Regular configuration options as described in rclone's documentation

15
tests/integration/standalone/rclone/default.nix
View file

@ -98,6 +98,21 @@
./secrets-with-whitespace.conf
} /home/alice/.config/rclone/rclone.conf")
with subtest("Un-typed remote"):
succeed_as_alice("install -m644 ${
./no-type.nix
} /home/alice/.config/home-manager/test-remote.nix")
actual = fail_as_alice("home-manager switch")
expected = "Activating createRcloneConfig"
assert expected not in actual, \
f"expected home-manager switch to contain {expected}, but got {actual}"
expected = "An attribute set containing a remote type and options."
assert expected not in actual, \
f"expected home-manager switch to contain {expected}, but got {actual}"
# TODO: verify correct activation order with the agenix and sops hm modules
logout_alice()

9
tests/integration/standalone/rclone/no-type.nix Normal file
View file

@ -0,0 +1,9 @@
{
programs.rclone.remotes = {
alices-cool-remote-v4.config = {
description = "this value does not have a type";
some-key = "value pairs";
another-key-value = "pair";
};
};
}