From acffa629e19978824835032d1f1dfb164670257e Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 30 Jun 2025 19:06:13 +0700 Subject: [PATCH] checks: rename dummy-inventory-test -> service-dummy-test --- checks/flake-module.nix | 4 ++-- .../default.nix | 2 +- .../flake.nix | 2 +- .../legacy-module/README.md | 0 .../legacy-module/roles/admin.nix | 0 .../legacy-module/roles/peer.nix | 0 .../legacy-module/shared.nix | 0 .../sops/machines/admin1/key.json | 0 .../sops/machines/peer1/key.json | 0 .../sops/secrets/admin1-age.key/secret | 0 .../sops/secrets/admin1-age.key/users/admin | 0 .../sops/secrets/peer1-age.key/secret | 0 .../sops/secrets/peer1-age.key/users/admin | 0 .../sops/users/admin/key.json | 0 .../admin1/dummy-generator/generated-password/machines/admin1 | 0 .../admin1/dummy-generator/generated-password/secret | 0 .../admin1/dummy-generator/generated-password/users/admin | 0 .../vars/per-machine/admin1/dummy-generator/host-id/value | 0 .../peer1/dummy-generator/generated-password/machines/peer1 | 0 .../peer1/dummy-generator/generated-password/secret | 0 .../peer1/dummy-generator/generated-password/users/admin | 0 .../vars/per-machine/peer1/dummy-generator/host-id/value | 0 .../per-machine/peer1/new-service/a-secret/machines/peer1 | 0 .../vars/per-machine/peer1/new-service/a-secret/secret | 0 .../vars/per-machine/peer1/new-service/a-secret/users/admin | 0 .../vars/per-machine/peer1/new-service/not-a-secret/value | 0 .../{dummy-inventory-test => service-dummy-test}/default.nix | 4 ++-- .../legacy-module/README.md | 0 .../legacy-module/roles/admin.nix | 0 .../legacy-module/roles/peer.nix | 0 .../legacy-module/shared.nix | 0 .../sops/machines/admin1/key.json | 0 .../sops/machines/peer1/key.json | 0 .../sops/secrets/admin1-age.key/secret | 0 .../sops/secrets/admin1-age.key/users/admin | 0 .../sops/secrets/peer1-age.key/secret | 0 .../sops/secrets/peer1-age.key/users/admin | 0 .../sops/users/admin/key.json | 0 .../admin1/dummy-generator/generated-password/machines/admin1 | 0 .../admin1/dummy-generator/generated-password/secret | 0 .../admin1/dummy-generator/generated-password/users/admin | 0 .../vars/per-machine/admin1/dummy-generator/host-id/value | 0 .../peer1/dummy-generator/generated-password/machines/peer1 | 0 .../peer1/dummy-generator/generated-password/secret | 0 .../peer1/dummy-generator/generated-password/users/admin | 0 .../vars/per-machine/peer1/dummy-generator/host-id/value | 0 .../per-machine/peer1/new-service/a-secret/machines/peer1 | 0 .../vars/per-machine/peer1/new-service/a-secret/secret | 0 .../vars/per-machine/peer1/new-service/a-secret/users/admin | 0 .../vars/per-machine/peer1/new-service/not-a-secret/value | 0 50 files changed, 6 insertions(+), 6 deletions(-) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/default.nix (97%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/flake.nix (95%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/legacy-module/README.md (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/legacy-module/roles/admin.nix (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/legacy-module/roles/peer.nix (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/legacy-module/shared.nix (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/sops/machines/admin1/key.json (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/sops/machines/peer1/key.json (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/sops/secrets/admin1-age.key/secret (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/sops/secrets/admin1-age.key/users/admin (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/sops/secrets/peer1-age.key/secret (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/sops/secrets/peer1-age.key/users/admin (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/sops/users/admin/key.json (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/admin1/dummy-generator/generated-password/secret (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/admin1/dummy-generator/generated-password/users/admin (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/admin1/dummy-generator/host-id/value (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/peer1/dummy-generator/generated-password/secret (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/peer1/dummy-generator/generated-password/users/admin (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/peer1/dummy-generator/host-id/value (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/peer1/new-service/a-secret/machines/peer1 (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/peer1/new-service/a-secret/secret (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/peer1/new-service/a-secret/users/admin (100%) rename checks/{dummy-inventory-test-from-flake => service-dummy-test-from-flake}/vars/per-machine/peer1/new-service/not-a-secret/value (100%) rename checks/{dummy-inventory-test => service-dummy-test}/default.nix (95%) rename checks/{dummy-inventory-test => service-dummy-test}/legacy-module/README.md (100%) rename checks/{dummy-inventory-test => service-dummy-test}/legacy-module/roles/admin.nix (100%) rename checks/{dummy-inventory-test => service-dummy-test}/legacy-module/roles/peer.nix (100%) rename checks/{dummy-inventory-test => service-dummy-test}/legacy-module/shared.nix (100%) rename checks/{dummy-inventory-test => service-dummy-test}/sops/machines/admin1/key.json (100%) rename checks/{dummy-inventory-test => service-dummy-test}/sops/machines/peer1/key.json (100%) rename checks/{dummy-inventory-test => service-dummy-test}/sops/secrets/admin1-age.key/secret (100%) rename checks/{dummy-inventory-test => service-dummy-test}/sops/secrets/admin1-age.key/users/admin (100%) rename checks/{dummy-inventory-test => service-dummy-test}/sops/secrets/peer1-age.key/secret (100%) rename checks/{dummy-inventory-test => service-dummy-test}/sops/secrets/peer1-age.key/users/admin (100%) rename checks/{dummy-inventory-test => service-dummy-test}/sops/users/admin/key.json (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/admin1/dummy-generator/generated-password/secret (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/admin1/dummy-generator/generated-password/users/admin (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/admin1/dummy-generator/host-id/value (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/peer1/dummy-generator/generated-password/secret (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/peer1/dummy-generator/generated-password/users/admin (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/peer1/dummy-generator/host-id/value (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/peer1/new-service/a-secret/machines/peer1 (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/peer1/new-service/a-secret/secret (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/peer1/new-service/a-secret/users/admin (100%) rename checks/{dummy-inventory-test => service-dummy-test}/vars/per-machine/peer1/new-service/not-a-secret/value (100%) diff --git a/checks/flake-module.nix b/checks/flake-module.nix index 0cffe80f3..6cd99353c 100644 --- a/checks/flake-module.nix +++ b/checks/flake-module.nix @@ -53,8 +53,8 @@ in user-firewall-iptables = self.clanLib.test.containerTest ./user-firewall/iptables.nix nixosTestArgs; user-firewall-nftables = self.clanLib.test.containerTest ./user-firewall/nftables.nix nixosTestArgs; - dummy-inventory-test = import ./dummy-inventory-test nixosTestArgs; - dummy-inventory-test-from-flake = import ./dummy-inventory-test-from-flake nixosTestArgs; + service-dummy-test = import ./service-dummy-test nixosTestArgs; + service-dummy-test-from-flake = import ./service-dummy-test-from-flake nixosTestArgs; data-mesher = import ./data-mesher nixosTestArgs; }; diff --git a/checks/dummy-inventory-test-from-flake/default.nix b/checks/service-dummy-test-from-flake/default.nix similarity index 97% rename from checks/dummy-inventory-test-from-flake/default.nix rename to checks/service-dummy-test-from-flake/default.nix index 586f0f244..0faa8f9b1 100644 --- a/checks/dummy-inventory-test-from-flake/default.nix +++ b/checks/service-dummy-test-from-flake/default.nix @@ -18,7 +18,7 @@ nixosLib.runTest ( # With the test framework # - legacy-modules # - clan.service modules - name = "dummy-inventory-test-from-flake"; + name = "service-dummy-test-from-flake"; clan.test.fromFlake = ./.; diff --git a/checks/dummy-inventory-test-from-flake/flake.nix b/checks/service-dummy-test-from-flake/flake.nix similarity index 95% rename from checks/dummy-inventory-test-from-flake/flake.nix rename to checks/service-dummy-test-from-flake/flake.nix index 3f58be5e3..d3c7ee75f 100644 --- a/checks/dummy-inventory-test-from-flake/flake.nix +++ b/checks/service-dummy-test-from-flake/flake.nix @@ -40,7 +40,7 @@ perMachine = { nixosModule = { # This should be generated by: - # nix run .#generate-test-vars -- checks/dummy-inventory-test dummy-inventory-test + # nix run .#generate-test-vars -- checks/service-dummy-test service-dummy-test clan.core.vars.generators.new-service = { files.not-a-secret = { secret = false; diff --git a/checks/dummy-inventory-test-from-flake/legacy-module/README.md b/checks/service-dummy-test-from-flake/legacy-module/README.md similarity index 100% rename from checks/dummy-inventory-test-from-flake/legacy-module/README.md rename to checks/service-dummy-test-from-flake/legacy-module/README.md diff --git a/checks/dummy-inventory-test-from-flake/legacy-module/roles/admin.nix b/checks/service-dummy-test-from-flake/legacy-module/roles/admin.nix similarity index 100% rename from checks/dummy-inventory-test-from-flake/legacy-module/roles/admin.nix rename to checks/service-dummy-test-from-flake/legacy-module/roles/admin.nix diff --git a/checks/dummy-inventory-test-from-flake/legacy-module/roles/peer.nix b/checks/service-dummy-test-from-flake/legacy-module/roles/peer.nix similarity index 100% rename from checks/dummy-inventory-test-from-flake/legacy-module/roles/peer.nix rename to checks/service-dummy-test-from-flake/legacy-module/roles/peer.nix diff --git a/checks/dummy-inventory-test-from-flake/legacy-module/shared.nix b/checks/service-dummy-test-from-flake/legacy-module/shared.nix similarity index 100% rename from checks/dummy-inventory-test-from-flake/legacy-module/shared.nix rename to checks/service-dummy-test-from-flake/legacy-module/shared.nix diff --git a/checks/dummy-inventory-test-from-flake/sops/machines/admin1/key.json b/checks/service-dummy-test-from-flake/sops/machines/admin1/key.json similarity index 100% rename from checks/dummy-inventory-test-from-flake/sops/machines/admin1/key.json rename to checks/service-dummy-test-from-flake/sops/machines/admin1/key.json diff --git a/checks/dummy-inventory-test-from-flake/sops/machines/peer1/key.json b/checks/service-dummy-test-from-flake/sops/machines/peer1/key.json similarity index 100% rename from checks/dummy-inventory-test-from-flake/sops/machines/peer1/key.json rename to checks/service-dummy-test-from-flake/sops/machines/peer1/key.json diff --git a/checks/dummy-inventory-test-from-flake/sops/secrets/admin1-age.key/secret b/checks/service-dummy-test-from-flake/sops/secrets/admin1-age.key/secret similarity index 100% rename from checks/dummy-inventory-test-from-flake/sops/secrets/admin1-age.key/secret rename to checks/service-dummy-test-from-flake/sops/secrets/admin1-age.key/secret diff --git a/checks/dummy-inventory-test-from-flake/sops/secrets/admin1-age.key/users/admin b/checks/service-dummy-test-from-flake/sops/secrets/admin1-age.key/users/admin similarity index 100% rename from checks/dummy-inventory-test-from-flake/sops/secrets/admin1-age.key/users/admin rename to checks/service-dummy-test-from-flake/sops/secrets/admin1-age.key/users/admin diff --git a/checks/dummy-inventory-test-from-flake/sops/secrets/peer1-age.key/secret b/checks/service-dummy-test-from-flake/sops/secrets/peer1-age.key/secret similarity index 100% rename from checks/dummy-inventory-test-from-flake/sops/secrets/peer1-age.key/secret rename to checks/service-dummy-test-from-flake/sops/secrets/peer1-age.key/secret diff --git a/checks/dummy-inventory-test-from-flake/sops/secrets/peer1-age.key/users/admin b/checks/service-dummy-test-from-flake/sops/secrets/peer1-age.key/users/admin similarity index 100% rename from checks/dummy-inventory-test-from-flake/sops/secrets/peer1-age.key/users/admin rename to checks/service-dummy-test-from-flake/sops/secrets/peer1-age.key/users/admin diff --git a/checks/dummy-inventory-test-from-flake/sops/users/admin/key.json b/checks/service-dummy-test-from-flake/sops/users/admin/key.json similarity index 100% rename from checks/dummy-inventory-test-from-flake/sops/users/admin/key.json rename to checks/service-dummy-test-from-flake/sops/users/admin/key.json diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 b/checks/service-dummy-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 rename to checks/service-dummy-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/secret b/checks/service-dummy-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/secret similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/secret rename to checks/service-dummy-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/secret diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/users/admin b/checks/service-dummy-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/users/admin similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/users/admin rename to checks/service-dummy-test-from-flake/vars/per-machine/admin1/dummy-generator/generated-password/users/admin diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/admin1/dummy-generator/host-id/value b/checks/service-dummy-test-from-flake/vars/per-machine/admin1/dummy-generator/host-id/value similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/admin1/dummy-generator/host-id/value rename to checks/service-dummy-test-from-flake/vars/per-machine/admin1/dummy-generator/host-id/value diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 b/checks/service-dummy-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 rename to checks/service-dummy-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/secret b/checks/service-dummy-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/secret similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/secret rename to checks/service-dummy-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/secret diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/users/admin b/checks/service-dummy-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/users/admin similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/users/admin rename to checks/service-dummy-test-from-flake/vars/per-machine/peer1/dummy-generator/generated-password/users/admin diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/dummy-generator/host-id/value b/checks/service-dummy-test-from-flake/vars/per-machine/peer1/dummy-generator/host-id/value similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/dummy-generator/host-id/value rename to checks/service-dummy-test-from-flake/vars/per-machine/peer1/dummy-generator/host-id/value diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/new-service/a-secret/machines/peer1 b/checks/service-dummy-test-from-flake/vars/per-machine/peer1/new-service/a-secret/machines/peer1 similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/new-service/a-secret/machines/peer1 rename to checks/service-dummy-test-from-flake/vars/per-machine/peer1/new-service/a-secret/machines/peer1 diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/new-service/a-secret/secret b/checks/service-dummy-test-from-flake/vars/per-machine/peer1/new-service/a-secret/secret similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/new-service/a-secret/secret rename to checks/service-dummy-test-from-flake/vars/per-machine/peer1/new-service/a-secret/secret diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/new-service/a-secret/users/admin b/checks/service-dummy-test-from-flake/vars/per-machine/peer1/new-service/a-secret/users/admin similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/new-service/a-secret/users/admin rename to checks/service-dummy-test-from-flake/vars/per-machine/peer1/new-service/a-secret/users/admin diff --git a/checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/new-service/not-a-secret/value b/checks/service-dummy-test-from-flake/vars/per-machine/peer1/new-service/not-a-secret/value similarity index 100% rename from checks/dummy-inventory-test-from-flake/vars/per-machine/peer1/new-service/not-a-secret/value rename to checks/service-dummy-test-from-flake/vars/per-machine/peer1/new-service/not-a-secret/value diff --git a/checks/dummy-inventory-test/default.nix b/checks/service-dummy-test/default.nix similarity index 95% rename from checks/dummy-inventory-test/default.nix rename to checks/service-dummy-test/default.nix index 2d1cce084..a771cb541 100644 --- a/checks/dummy-inventory-test/default.nix +++ b/checks/service-dummy-test/default.nix @@ -17,7 +17,7 @@ nixosLib.runTest ( # With the test framework # - legacy-modules # - clan.service modules - name = "dummy-inventory-test"; + name = "service-dummy-test"; clan = { directory = ./.; @@ -48,7 +48,7 @@ nixosLib.runTest ( perMachine = { nixosModule = { # This should be generated by: - # nix run .#generate-test-vars -- checks/dummy-inventory-test dummy-inventory-test + # nix run .#generate-test-vars -- checks/service-dummy-test service-dummy-test clan.core.vars.generators.new-service = { files.not-a-secret = { secret = false; diff --git a/checks/dummy-inventory-test/legacy-module/README.md b/checks/service-dummy-test/legacy-module/README.md similarity index 100% rename from checks/dummy-inventory-test/legacy-module/README.md rename to checks/service-dummy-test/legacy-module/README.md diff --git a/checks/dummy-inventory-test/legacy-module/roles/admin.nix b/checks/service-dummy-test/legacy-module/roles/admin.nix similarity index 100% rename from checks/dummy-inventory-test/legacy-module/roles/admin.nix rename to checks/service-dummy-test/legacy-module/roles/admin.nix diff --git a/checks/dummy-inventory-test/legacy-module/roles/peer.nix b/checks/service-dummy-test/legacy-module/roles/peer.nix similarity index 100% rename from checks/dummy-inventory-test/legacy-module/roles/peer.nix rename to checks/service-dummy-test/legacy-module/roles/peer.nix diff --git a/checks/dummy-inventory-test/legacy-module/shared.nix b/checks/service-dummy-test/legacy-module/shared.nix similarity index 100% rename from checks/dummy-inventory-test/legacy-module/shared.nix rename to checks/service-dummy-test/legacy-module/shared.nix diff --git a/checks/dummy-inventory-test/sops/machines/admin1/key.json b/checks/service-dummy-test/sops/machines/admin1/key.json similarity index 100% rename from checks/dummy-inventory-test/sops/machines/admin1/key.json rename to checks/service-dummy-test/sops/machines/admin1/key.json diff --git a/checks/dummy-inventory-test/sops/machines/peer1/key.json b/checks/service-dummy-test/sops/machines/peer1/key.json similarity index 100% rename from checks/dummy-inventory-test/sops/machines/peer1/key.json rename to checks/service-dummy-test/sops/machines/peer1/key.json diff --git a/checks/dummy-inventory-test/sops/secrets/admin1-age.key/secret b/checks/service-dummy-test/sops/secrets/admin1-age.key/secret similarity index 100% rename from checks/dummy-inventory-test/sops/secrets/admin1-age.key/secret rename to checks/service-dummy-test/sops/secrets/admin1-age.key/secret diff --git a/checks/dummy-inventory-test/sops/secrets/admin1-age.key/users/admin b/checks/service-dummy-test/sops/secrets/admin1-age.key/users/admin similarity index 100% rename from checks/dummy-inventory-test/sops/secrets/admin1-age.key/users/admin rename to checks/service-dummy-test/sops/secrets/admin1-age.key/users/admin diff --git a/checks/dummy-inventory-test/sops/secrets/peer1-age.key/secret b/checks/service-dummy-test/sops/secrets/peer1-age.key/secret similarity index 100% rename from checks/dummy-inventory-test/sops/secrets/peer1-age.key/secret rename to checks/service-dummy-test/sops/secrets/peer1-age.key/secret diff --git a/checks/dummy-inventory-test/sops/secrets/peer1-age.key/users/admin b/checks/service-dummy-test/sops/secrets/peer1-age.key/users/admin similarity index 100% rename from checks/dummy-inventory-test/sops/secrets/peer1-age.key/users/admin rename to checks/service-dummy-test/sops/secrets/peer1-age.key/users/admin diff --git a/checks/dummy-inventory-test/sops/users/admin/key.json b/checks/service-dummy-test/sops/users/admin/key.json similarity index 100% rename from checks/dummy-inventory-test/sops/users/admin/key.json rename to checks/service-dummy-test/sops/users/admin/key.json diff --git a/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 b/checks/service-dummy-test/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 rename to checks/service-dummy-test/vars/per-machine/admin1/dummy-generator/generated-password/machines/admin1 diff --git a/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/secret b/checks/service-dummy-test/vars/per-machine/admin1/dummy-generator/generated-password/secret similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/secret rename to checks/service-dummy-test/vars/per-machine/admin1/dummy-generator/generated-password/secret diff --git a/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/users/admin b/checks/service-dummy-test/vars/per-machine/admin1/dummy-generator/generated-password/users/admin similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/users/admin rename to checks/service-dummy-test/vars/per-machine/admin1/dummy-generator/generated-password/users/admin diff --git a/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/host-id/value b/checks/service-dummy-test/vars/per-machine/admin1/dummy-generator/host-id/value similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/host-id/value rename to checks/service-dummy-test/vars/per-machine/admin1/dummy-generator/host-id/value diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 b/checks/service-dummy-test/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 rename to checks/service-dummy-test/vars/per-machine/peer1/dummy-generator/generated-password/machines/peer1 diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/secret b/checks/service-dummy-test/vars/per-machine/peer1/dummy-generator/generated-password/secret similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/secret rename to checks/service-dummy-test/vars/per-machine/peer1/dummy-generator/generated-password/secret diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/users/admin b/checks/service-dummy-test/vars/per-machine/peer1/dummy-generator/generated-password/users/admin similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/users/admin rename to checks/service-dummy-test/vars/per-machine/peer1/dummy-generator/generated-password/users/admin diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/host-id/value b/checks/service-dummy-test/vars/per-machine/peer1/dummy-generator/host-id/value similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/host-id/value rename to checks/service-dummy-test/vars/per-machine/peer1/dummy-generator/host-id/value diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/new-service/a-secret/machines/peer1 b/checks/service-dummy-test/vars/per-machine/peer1/new-service/a-secret/machines/peer1 similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/peer1/new-service/a-secret/machines/peer1 rename to checks/service-dummy-test/vars/per-machine/peer1/new-service/a-secret/machines/peer1 diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/new-service/a-secret/secret b/checks/service-dummy-test/vars/per-machine/peer1/new-service/a-secret/secret similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/peer1/new-service/a-secret/secret rename to checks/service-dummy-test/vars/per-machine/peer1/new-service/a-secret/secret diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/new-service/a-secret/users/admin b/checks/service-dummy-test/vars/per-machine/peer1/new-service/a-secret/users/admin similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/peer1/new-service/a-secret/users/admin rename to checks/service-dummy-test/vars/per-machine/peer1/new-service/a-secret/users/admin diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/new-service/not-a-secret/value b/checks/service-dummy-test/vars/per-machine/peer1/new-service/not-a-secret/value similarity index 100% rename from checks/dummy-inventory-test/vars/per-machine/peer1/new-service/not-a-secret/value rename to checks/service-dummy-test/vars/per-machine/peer1/new-service/not-a-secret/value