diff --git a/checks/borgbackup/default.nix b/checks/borgbackup/default.nix index 4cb2e5e4b..d58a9ae3c 100644 --- a/checks/borgbackup/default.nix +++ b/checks/borgbackup/default.nix @@ -28,6 +28,7 @@ nixosLib.runTest ( borgone = { module.name = "@clan/borgbackup"; + module.input = "self"; roles.client.machines."clientone" = { }; roles.server.machines."serverone".settings.directory = "/tmp/borg-test"; diff --git a/checks/dummy-inventory-test-from-flake/flake.nix b/checks/dummy-inventory-test-from-flake/flake.nix index 575f65584..3f58be5e3 100644 --- a/checks/dummy-inventory-test-from-flake/flake.nix +++ b/checks/dummy-inventory-test-from-flake/flake.nix @@ -24,6 +24,7 @@ instances."test" = { module.name = "new-service"; + module.input = "self"; roles.peer.machines.peer1 = { }; }; diff --git a/checks/dummy-inventory-test/default.nix b/checks/dummy-inventory-test/default.nix index 0a142145d..2d1cce084 100644 --- a/checks/dummy-inventory-test/default.nix +++ b/checks/dummy-inventory-test/default.nix @@ -33,6 +33,7 @@ nixosLib.runTest ( instances."test" = { module.name = "new-service"; + module.input = "self"; roles.peer.machines.peer1 = { }; }; diff --git a/checks/mycelium/default.nix b/checks/mycelium/default.nix index f9a1d84b8..a8194fa1b 100644 --- a/checks/mycelium/default.nix +++ b/checks/mycelium/default.nix @@ -26,6 +26,7 @@ nixosLib.runTest ( instances = { mycelium-test = { module.name = "@clan/mycelium"; + module.input = "self"; roles.peer.machines."server".settings = { openFirewall = true; addHostedPublicNodes = true; diff --git a/clanServices/admin/tests/vm/default.nix b/clanServices/admin/tests/vm/default.nix index 1e8233cc2..188adb309 100644 --- a/clanServices/admin/tests/vm/default.nix +++ b/clanServices/admin/tests/vm/default.nix @@ -14,6 +14,7 @@ in instances = { ssh-test-one = { module.name = "@clan/admin"; + module.input = "self"; roles.default.machines."server".settings = { allowedKeys.testkey = public-key; }; diff --git a/clanServices/borgbackup/tests/vm/default.nix b/clanServices/borgbackup/tests/vm/default.nix index 3b703066c..a2efb67be 100644 --- a/clanServices/borgbackup/tests/vm/default.nix +++ b/clanServices/borgbackup/tests/vm/default.nix @@ -18,6 +18,7 @@ borgone = { module.name = "@clan/borgbackup"; + module.input = "self"; roles.client.machines."clientone" = { }; roles.server.machines."serverone".settings.directory = "/tmp/borg-test"; diff --git a/clanServices/garage/tests/vm/default.nix b/clanServices/garage/tests/vm/default.nix index deeca4ca7..a207751e8 100644 --- a/clanServices/garage/tests/vm/default.nix +++ b/clanServices/garage/tests/vm/default.nix @@ -14,6 +14,7 @@ instances = { garage-test = { module.name = "@clan/garage"; + module.input = "self"; roles.default.machines."server".settings = { }; }; }; diff --git a/clanServices/hello-world/tests/eval-tests.nix b/clanServices/hello-world/tests/eval-tests.nix index 7dfea9243..4f11977f5 100644 --- a/clanServices/hello-world/tests/eval-tests.nix +++ b/clanServices/hello-world/tests/eval-tests.nix @@ -24,6 +24,7 @@ let inventory.instances = { "hello" = { module.name = "hello-world"; + module.input = "self"; roles.peer.machines.jon = { }; }; diff --git a/clanServices/hello-world/tests/vm/default.nix b/clanServices/hello-world/tests/vm/default.nix index 8fb4f7b3f..772c80085 100644 --- a/clanServices/hello-world/tests/vm/default.nix +++ b/clanServices/hello-world/tests/vm/default.nix @@ -12,6 +12,7 @@ instances."test" = { module.name = "hello-service"; + module.input = "self"; roles.peer.machines.peer1 = { }; }; }; diff --git a/clanServices/mycelium/tests/vm/default.nix b/clanServices/mycelium/tests/vm/default.nix index a69da9c05..7bde4cf76 100644 --- a/clanServices/mycelium/tests/vm/default.nix +++ b/clanServices/mycelium/tests/vm/default.nix @@ -16,6 +16,7 @@ instances = { mycelium-test = { module.name = "@clan/mycelium"; + module.input = "self"; roles.peer.machines."server".settings = { openFirewall = true; addHostedPublicNodes = true; diff --git a/clanServices/packages/tests/vm/default.nix b/clanServices/packages/tests/vm/default.nix index b33b3466b..50705ca00 100644 --- a/clanServices/packages/tests/vm/default.nix +++ b/clanServices/packages/tests/vm/default.nix @@ -1,7 +1,3 @@ -{ - module, - ... -}: { name = "packages"; @@ -12,6 +8,7 @@ instances.default = { module.name = "@clan/packages"; + module.input = "self"; roles.default.machines."server".settings = { packages = [ "cbonsai" ]; }; diff --git a/clanServices/sshd/tests/vm/default.nix b/clanServices/sshd/tests/vm/default.nix index 498eaa59c..afdfd964b 100644 --- a/clanServices/sshd/tests/vm/default.nix +++ b/clanServices/sshd/tests/vm/default.nix @@ -15,6 +15,7 @@ instances = { sshd-test = { module.name = "@clan/sshd"; + module.input = "self"; roles.server.machines."server".settings = { certificate.searchDomains = [ "example.com" ]; hostKeys.rsa.enable = true; diff --git a/clanServices/state-version/tests/vm/default.nix b/clanServices/state-version/tests/vm/default.nix index 9ad1774a4..efd4a6f14 100644 --- a/clanServices/state-version/tests/vm/default.nix +++ b/clanServices/state-version/tests/vm/default.nix @@ -7,6 +7,7 @@ machines.server = { }; instances.default = { module.name = "@clan/state-version"; + module.input = "self"; roles.default.machines."server" = { }; }; }; diff --git a/clanServices/trusted-nix-caches/tests/vm/default.nix b/clanServices/trusted-nix-caches/tests/vm/default.nix index 97adbfd60..5d0a21b91 100644 --- a/clanServices/trusted-nix-caches/tests/vm/default.nix +++ b/clanServices/trusted-nix-caches/tests/vm/default.nix @@ -9,6 +9,7 @@ instances = { trusted-nix-caches = { module.name = "@clan/trusted-nix-caches"; + module.input = "self"; roles.default.machines."server" = { }; }; }; diff --git a/clanServices/users/tests/vm/default.nix b/clanServices/users/tests/vm/default.nix index 002fe6946..672a4dcbf 100644 --- a/clanServices/users/tests/vm/default.nix +++ b/clanServices/users/tests/vm/default.nix @@ -9,6 +9,7 @@ instances = { root-password-test = { module.name = "@clan/users"; + module.input = "self"; roles.default.machines."server".settings = { user = "root"; prompt = false; @@ -16,6 +17,7 @@ }; user-password-test = { module.name = "@clan/users"; + module.input = "self"; roles.default.machines."server".settings = { user = "testuser"; prompt = false; diff --git a/clanServices/wifi/tests/eval-tests.nix b/clanServices/wifi/tests/eval-tests.nix index 59d1efc36..b2f4c329f 100644 --- a/clanServices/wifi/tests/eval-tests.nix +++ b/clanServices/wifi/tests/eval-tests.nix @@ -24,6 +24,7 @@ let inventory.instances = { "default" = { module.name = "wifi"; + module.input = "self"; roles.default.tags.all = { }; roles.default.settings.networks.one = { }; roles.default.settings.networks.two = { }; diff --git a/clanServices/wifi/tests/vm/default.nix b/clanServices/wifi/tests/vm/default.nix index 8d257c9a6..eb50e93d4 100644 --- a/clanServices/wifi/tests/vm/default.nix +++ b/clanServices/wifi/tests/vm/default.nix @@ -11,6 +11,7 @@ instances = { wg-test-one = { module.name = "@clan/wifi"; + module.input = "self"; roles.default.machines = { test.settings.networks.one = { }; diff --git a/clanServices/zerotier/tests/eval-tests.nix b/clanServices/zerotier/tests/eval-tests.nix index 295b7cf18..849d2e007 100644 --- a/clanServices/zerotier/tests/eval-tests.nix +++ b/clanServices/zerotier/tests/eval-tests.nix @@ -22,6 +22,7 @@ let inventory.instances = { zerotier = { module.name = "zerotier"; + module.input = "self"; roles.peer.tags.all = { }; roles.moon.machines.sara.settings.stableEndpoints = [ "10.0.0.3/9993" ]; diff --git a/clanServices/zerotier/tests/vm/default.nix b/clanServices/zerotier/tests/vm/default.nix index 531539c7f..59f555429 100644 --- a/clanServices/zerotier/tests/vm/default.nix +++ b/clanServices/zerotier/tests/vm/default.nix @@ -12,6 +12,7 @@ instances = { "zerotier" = { module.name = "zerotier"; + module.input = "self"; roles.peer.tags.all = { }; roles.controller.machines.bam = { }; diff --git a/lib/modules/inventory/distributed-service/tests/default.nix b/lib/modules/inventory/distributed-service/tests/default.nix index cf4fcb39b..a764ab58b 100644 --- a/lib/modules/inventory/distributed-service/tests/default.nix +++ b/lib/modules/inventory/distributed-service/tests/default.nix @@ -151,16 +151,19 @@ in instances."instance_foo" = { module = { name = "A"; + input = "self"; }; }; instances."instance_bar" = { module = { name = "A"; + input = "self"; }; }; instances."instance_zaza" = { module = { name = "B"; + input = "self"; }; }; }; @@ -186,6 +189,7 @@ in _class = "clan.service"; manifest = { name = "network"; + input = "self"; }; # Define a role without special behavior roles.peer = { }; @@ -200,18 +204,21 @@ in instances."instance_foo" = { module = { name = "A"; + input = "self"; }; roles.peer.machines.jon = { }; }; instances."instance_bar" = { module = { name = "A"; + input = "self"; }; roles.peer.machines.sara = { }; }; instances."instance_zaza" = { module = { name = "B"; + input = "self"; }; roles.peer.tags.all = { }; }; @@ -256,12 +263,14 @@ in instances."instance_foo" = { module = { name = "A"; + input = "self"; }; roles.peer.tags.foo = { }; }; instances."instance_zaza" = { module = { name = "B"; + input = "self"; }; roles.peer.tags.all = { }; }; diff --git a/lib/modules/inventory/distributed-service/tests/import_module_spec.nix b/lib/modules/inventory/distributed-service/tests/import_module_spec.nix index 15db21107..a8d29538d 100644 --- a/lib/modules/inventory/distributed-service/tests/import_module_spec.nix +++ b/lib/modules/inventory/distributed-service/tests/import_module_spec.nix @@ -32,7 +32,11 @@ let in { test_import_local_module_by_name = { - expr = (resolve { name = "A"; }).importedModuleWithInstances.instance_foo.resolvedModule; + expr = + (resolve { + name = "A"; + input = "self"; + }).importedModuleWithInstances.instance_foo.resolvedModule; expected = { _class = "clan.service"; manifest = { diff --git a/lib/modules/inventory/distributed-service/tests/per_instance_args.nix b/lib/modules/inventory/distributed-service/tests/per_instance_args.nix index 82a66dd75..b94697c59 100644 --- a/lib/modules/inventory/distributed-service/tests/per_instance_args.nix +++ b/lib/modules/inventory/distributed-service/tests/per_instance_args.nix @@ -62,6 +62,7 @@ let instances."instance_foo" = { module = { name = "A"; + input = "self"; }; roles.peer.machines.jon = { settings.timeout = lib.mkForce "foo-peer-jon"; @@ -74,6 +75,7 @@ let instances."instance_bar" = { module = { name = "A"; + input = "self"; }; roles.peer.machines.jon = { settings.timeout = "bar-peer-jon"; diff --git a/lib/modules/inventory/distributed-service/tests/per_machine_args.nix b/lib/modules/inventory/distributed-service/tests/per_machine_args.nix index 34fe6c38d..444b94569 100644 --- a/lib/modules/inventory/distributed-service/tests/per_machine_args.nix +++ b/lib/modules/inventory/distributed-service/tests/per_machine_args.nix @@ -44,6 +44,7 @@ let instances."instance_foo" = { module = { name = "A"; + input = "self"; }; roles.peer.machines.jon = { settings.timeout = lib.mkForce "foo-peer-jon"; @@ -55,6 +56,7 @@ let instances."instance_bar" = { module = { name = "A"; + input = "self"; }; roles.peer.machines.jon = { settings.timeout = "bar-peer-jon"; @@ -63,6 +65,7 @@ let instances."instance_zaza" = { module = { name = "B"; + input = "self"; }; roles.peer.tags.all = { }; }; diff --git a/nixosModules/clanCore/machine-id/tests/flake-module.nix b/nixosModules/clanCore/machine-id/tests/flake-module.nix index 842aa452f..b15299355 100644 --- a/nixosModules/clanCore/machine-id/tests/flake-module.nix +++ b/nixosModules/clanCore/machine-id/tests/flake-module.nix @@ -17,6 +17,7 @@ machines.server = { }; instances.importer = { module.name = "@clan/importer"; + module.input = "self"; roles.default.tags.all = { }; roles.default.extraModules = [ {