From c03fda1b84d519dcd4c653956bdf1143e6ad1ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 17 Jun 2025 19:37:37 +0200 Subject: [PATCH] zerotier: migrate to clan.nixosTests module --- clanServices/zerotier/flake-module.nix | 16 +++--- clanServices/zerotier/tests/vm/default.nix | 52 +++++++------------ .../tests/vm/sops/machines/test/key.json | 6 --- .../tests/vm/sops/secrets/test-age.key/secret | 15 ------ .../vm/sops/secrets/test-age.key/users/admin | 1 - .../wifi.one/network-name/machines/test | 1 - .../vars/shared/wifi.one/network-name/secret | 19 ------- .../shared/wifi.one/network-name/users/admin | 1 - .../shared/wifi.one/password/machines/test | 1 - .../vm/vars/shared/wifi.one/password/secret | 19 ------- .../vars/shared/wifi.one/password/users/admin | 1 - 11 files changed, 25 insertions(+), 107 deletions(-) delete mode 100755 clanServices/zerotier/tests/vm/sops/machines/test/key.json delete mode 100644 clanServices/zerotier/tests/vm/sops/secrets/test-age.key/secret delete mode 120000 clanServices/zerotier/tests/vm/sops/secrets/test-age.key/users/admin delete mode 120000 clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/machines/test delete mode 100644 clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/secret delete mode 120000 clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/users/admin delete mode 120000 clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/machines/test delete mode 100644 clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/secret delete mode 120000 clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/users/admin diff --git a/clanServices/zerotier/flake-module.nix b/clanServices/zerotier/flake-module.nix index 4aaa0ab3d..e1f691fcd 100644 --- a/clanServices/zerotier/flake-module.nix +++ b/clanServices/zerotier/flake-module.nix @@ -8,9 +8,7 @@ let module = lib.modules.importApply ./default.nix { }; in { - clan.modules = { - zerotier = module; - }; + clan.modules.zerotier = module; perSystem = { ... }: let @@ -28,11 +26,11 @@ in imports = [ unit-test-module ]; - # zerotier = import ./tests/vm/default.nix { - # inherit module; - # inherit inputs pkgs; - # clan-core = self; - # nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { }; - # }; + + clan.nixosTests.zerotier = { + imports = [ ./tests/vm/default.nix ]; + + clan.modules.zerotier = module; + }; }; } diff --git a/clanServices/zerotier/tests/vm/default.nix b/clanServices/zerotier/tests/vm/default.nix index 52961d336..531539c7f 100644 --- a/clanServices/zerotier/tests/vm/default.nix +++ b/clanServices/zerotier/tests/vm/default.nix @@ -1,43 +1,27 @@ { - pkgs, - nixosLib, - clan-core, - module, - ... -}: -nixosLib.runTest ( - { ... }: - { - imports = [ - clan-core.modules.nixosVmTest.clanTest - ]; + name = "zerotier"; - hostPkgs = pkgs; + clan = { + directory = ./.; + inventory = { - name = "zerotier"; + machines.jon = { }; + machines.sara = { }; + machines.bam = { }; - clan = { - directory = ./.; - modules."zerotier" = module; - inventory = { + instances = { + "zerotier" = { + module.name = "zerotier"; - machines.jon = { }; - machines.sara = { }; - machines.bam = { }; - - instances = { - "zerotier" = { - module.name = "zerotier"; - - roles.peer.tags.all = { }; - roles.controller.machines.bam = { }; - }; + roles.peer.tags.all = { }; + roles.controller.machines.bam = { }; + roles.moon.machines = { }; }; }; }; + }; - # This is not an actual vm test, this is a workaround to - # generate the needed vars for the eval test. - testScript = ''''; - } -) + # This is not an actual vm test, this is a workaround to + # generate the needed vars for the eval test. + testScript = ""; +} diff --git a/clanServices/zerotier/tests/vm/sops/machines/test/key.json b/clanServices/zerotier/tests/vm/sops/machines/test/key.json deleted file mode 100755 index e8dcc2dc3..000000000 --- a/clanServices/zerotier/tests/vm/sops/machines/test/key.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "publickey": "age13ahclyps97532zt2sfta5zrfx976d3r2jmctj8d36vj9x5v5ffqq304fqf", - "type": "age" - } -] diff --git a/clanServices/zerotier/tests/vm/sops/secrets/test-age.key/secret b/clanServices/zerotier/tests/vm/sops/secrets/test-age.key/secret deleted file mode 100644 index 89db73364..000000000 --- a/clanServices/zerotier/tests/vm/sops/secrets/test-age.key/secret +++ /dev/null @@ -1,15 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:AGYme1x1pE7SVk6HowmIYMN3EHNaZglW97geihpDCkKqArq/zD2IHxbgo8OtXmaNws16i0R6LehWJTL21fVmnAEA9GNZQOE/Y4Q=,iv:Kc3bDcOwJmxHnnlBweUbqDE77VVFZFelEGpmpfBSct8=,tag:m4kzx3nOtexD91kisQafFw==,type:str]", - "sops": { - "age": [ - { - "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTc2Q5NTY1ejl5ODhSOXhv\nVUFrb0xvblErWEY1R0k3UXNBQk5Ja1MwaERVCmdISk1RSGFUL2FRMWlPSFdERjB6\nalltcHZLd21XOVFuaExSRUNQc1VmdjAKLS0tIGg0ZGdvbm9wbC9Jd255cHNmVWxP\nWStOQS9EQW9WQUtLZVp5SDBmM1ByaEEKzviyWc0yLbDMwk/CHhTwntrjA5LX44Wu\nNdlsQG/yfRaqRL1TKZztT9RnX0293gOEZFvoYZasEJJAIeBoZvN6VQ==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2025-05-29T13:14:51Z", - "mac": "ENC[AES256_GCM,data:uCk2e5aFHZhttLkIdvDU3KARN7PiHKLtXsqxmuLkZP903XhDTCuj1GH6S0C9UN5LftlaVjCEaqlgx68cCNwTc9bTUnhSdVVjMWy0gjxKZ1Y25YzOMlEmOAk/TZqUvnMn/cUL8KOeBnymPbAeqLm8yATjwsyx5+GrFrIVxwGQzUA=,iv:UMX2Ik0xlcljMZyBhjOpvYcsJCC5Wb6d/rgbTFb+6oM=,tag:HH05tFDzOcRrQ8TTXxrDyw==,type:str]", - "unencrypted_suffix": "_unencrypted", - "version": "3.10.2" - } -} diff --git a/clanServices/zerotier/tests/vm/sops/secrets/test-age.key/users/admin b/clanServices/zerotier/tests/vm/sops/secrets/test-age.key/users/admin deleted file mode 120000 index 9e21a9938..000000000 --- a/clanServices/zerotier/tests/vm/sops/secrets/test-age.key/users/admin +++ /dev/null @@ -1 +0,0 @@ -../../../users/admin \ No newline at end of file diff --git a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/machines/test b/clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/machines/test deleted file mode 120000 index 8adbdc900..000000000 --- a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/machines/test +++ /dev/null @@ -1 +0,0 @@ -../../../../../sops/machines/test \ No newline at end of file diff --git a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/secret b/clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/secret deleted file mode 100644 index fa59b60ac..000000000 --- a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/secret +++ /dev/null @@ -1,19 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:iNOb,iv:24+bKY5u61JYsvLHV8TIUBVmJPV1aX/BJr//c7le68o=,tag:ANCOrzvnukvqyKGf+L8gFQ==,type:str]", - "sops": { - "age": [ - { - "recipient": "age13ahclyps97532zt2sfta5zrfx976d3r2jmctj8d36vj9x5v5ffqq304fqf", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxN2EwVHN3SENVTjdjZGRi\nQmJOWlNGYmpmM1BnZnpYWGhaSlRaUVJIODFRCkhhMUhyZzVWWk53SDBwSVBVZGVY\nVUpMTm9qWTIzc3VwdGJHcUVWVzFlV0UKLS0tIDBBVXdlS1FFbzNPSnlZWWtEaDJi\nK215OWQvMVRCRUZyQjFZckJFbHBZeDQK2cqgDnGM5uIm834dbQ3bi3nQA5nPq6Bf\n0+sezXuY55GdFS6OxIgI5/KcitHzDE0WHOvklIGDCSysoXIQ3QXanA==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0NDB5SVcrU0V6akYwbDlv\na1BuSm5XbjYwN2ZkZWtIcnhBVHBTWGFxd24wCnZTVGlPRm5uZEd3QXYwdFRMS09K\nWWw5N2RJZ3d4N0VDMWZmM2lkYVM4VncKLS0tIGplTDVka1VoUVdXMU9VS3hYSlZ1\nRjZGL25hQWxHWEx3OXdQamJiNG9KaDgKk94uXPuCE/M4Hz/7hVKJPHuzQfbOQi/9\nVfR2i17Hjcq08l68Xzn+DllQEAFdts2fS96Pu4FFKfiLK7INl/fUOg==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2025-05-29T13:15:02Z", - "mac": "ENC[AES256_GCM,data:4beXC5ONY5RLChluoVkklpDnaf/KCjlUzpQkFVSp7vauQmMKeTK40xqfvY5d+64u/OKRTIdc38KQTwhZ0pYzOv1LcJOWbHrGu7XadlALKgyUqKOZy03G2O8y0IF6t/LUK8TaNFnNvNteFsfD36/+wkRaxPJe7MKXGqPhWf6RC78=,iv:FR/PQUZqL3HnyVbW+H1QlZMmgFxA5juSb88wuatIlHM=,tag:parvZw3y9ZHieZ8pmUjCZQ==,type:str]", - "unencrypted_suffix": "_unencrypted", - "version": "3.10.2" - } -} diff --git a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/users/admin b/clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/users/admin deleted file mode 120000 index f14859ae0..000000000 --- a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/network-name/users/admin +++ /dev/null @@ -1 +0,0 @@ -../../../../../sops/users/admin \ No newline at end of file diff --git a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/machines/test b/clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/machines/test deleted file mode 120000 index 8adbdc900..000000000 --- a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/machines/test +++ /dev/null @@ -1 +0,0 @@ -../../../../../sops/machines/test \ No newline at end of file diff --git a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/secret b/clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/secret deleted file mode 100644 index 2353f2d36..000000000 --- a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/secret +++ /dev/null @@ -1,19 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:HHWyM9d6StpKc6uTxg==,iv:blDyfL/xSThCt+dhxeR5eOLa11OsIkbe+w4ReLBv754=,tag:qGHcDXS4DWdUIXUvtLc5XQ==,type:str]", - "sops": { - "age": [ - { - "recipient": "age13ahclyps97532zt2sfta5zrfx976d3r2jmctj8d36vj9x5v5ffqq304fqf", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPdkQyYnQ1UzlCWEFtdnJh\nMWlBK0RGcENTMmRITWM5SSs2Mkt2N0ZKdm5VClNTS0NuR05OVHY3QkFLZWt6bTUx\nMzJLc2Vib1ZUbW1VM0lhYXFFeEhOaEEKLS0tIHVoODVOK3BUU2JDZkJkN2I2Wm1L\nMWM0TUNQazljZS9uWXRKRFlxWmd0clUKg1YhJoRea05c24hCuZKYvqyvjuu965KD\nr4GLtyqQ6wt9sn50Rzx5cAY/Ac684DNFJVZ1RwG1NTB2kmXcVP8SJA==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoZTA5QXpsOXR3L2FKcnJD\neUxzNVp3M2VQMFFaUUxwNXQ4UTlXa01rR0IwCjkyU2hmdlVYbWY4WUpVK0J1ZC9Q\nRjVkYWlGTlh1MFY3R3FxMEZHODZXMmcKLS0tIFV3bGdvUEtnT21wRWJveEQwdTBV\nbGFUUExBZWR1enQ0c0l0dUY3TnErM3cKutl5cv8dSlpQA7SXUYWJq1M0yLmko/Bx\nUvxxGGLQaK0Mp81Z5mOsjNhcVQrY160AyVnWJ0z39cqOJq9PpXRP+A==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2025-05-29T13:15:02Z", - "mac": "ENC[AES256_GCM,data:Y2FFQevNHSJrEtCmGHQXcpfyof0v2IF8ey79g7EfGj13An4ylhvogsVjRtfMkQvKD5GZykswZgmh+PmKUIzRoc+cvnMLu0iBzleYv+KzpYqtvUpdK0+NQn/4cKOoafajwNV7EuCQh+SkJgSGjNSbMs8xtIb4q9DmJyTcTbG0JQ4=,iv:xmA/cEhl/J0Z+8QR2GFiGWRw4aH/C4HmO+Qd4e25utw=,tag:/hG5S/EmRt8CjAy8DfBoqg==,type:str]", - "unencrypted_suffix": "_unencrypted", - "version": "3.10.2" - } -} diff --git a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/users/admin b/clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/users/admin deleted file mode 120000 index f14859ae0..000000000 --- a/clanServices/zerotier/tests/vm/vars/shared/wifi.one/password/users/admin +++ /dev/null @@ -1 +0,0 @@ -../../../../../sops/users/admin \ No newline at end of file