From 7207a3e8cde9618a467d649b50e0ac5a088387c1 Mon Sep 17 00:00:00 2001 From: pinpox Date: Thu, 21 Aug 2025 13:56:00 +0200 Subject: [PATCH] Cleanup state-version test --- docs/mkdocs.yml | 1 - .../migrations/migrate-inventory-services.md | 8 +++---- .../state-version/tests/flake-module.nix | 21 ++----------------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index b4dd46d2f..91342b219 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -106,7 +106,6 @@ nav: - reference/clanServices/monitoring.md - reference/clanServices/packages.md - reference/clanServices/sshd.md - - reference/clanServices/state-version.md - reference/clanServices/syncthing.md - reference/clanServices/trusted-nix-caches.md - reference/clanServices/users.md diff --git a/docs/site/guides/migrations/migrate-inventory-services.md b/docs/site/guides/migrations/migrate-inventory-services.md index 0f4eaa4eb..4f64d5655 100644 --- a/docs/site/guides/migrations/migrate-inventory-services.md +++ b/docs/site/guides/migrations/migrate-inventory-services.md @@ -254,7 +254,7 @@ The following table shows the migration status of each deprecated clanModule: | `data-mesher` | ✅ [Migrated](../../reference/clanServices/data-mesher.md) | | | `deltachat` | ❌ Removed | | | `disk-id` | ❌ Removed | | -| `dyndns` | [Being Migrated](https://git.clan.lol/clan/clan-core/pulls/4390) | | +| `dyndns` | ✅ [Migrated](../../reference/clanServices/dyndns.md) | | | `ergochat` | ❌ Removed | | | `garage` | ✅ [Migrated](../../reference/clanServices/garage.md) | | | `golem-provider` | ❌ Removed | | @@ -263,18 +263,18 @@ The following table shows the migration status of each deprecated clanModule: | `iwd` | ❌ Removed | Use [wifi service](../../reference/clanServices/wifi.md) instead | | `localbackup` | ✅ [Migrated](../../reference/clanServices/localbackup.md) | | | `localsend` | ❌ Removed | | -| `machine-id` | ❌ Removed | Now an [option](../../reference/clan.core/settings.md) | +| `machine-id` | ✅ [Migrated](../../reference/clan.core/settings.md) | Now an [option](../../reference/clan.core/settings.md) | | `matrix-synapse` | ✅ [Migrated](../../reference/clanServices/matrix-synapse.md) | | | `moonlight` | ❌ Removed | | | `mumble` | ❌ Removed | | | `mycelium` | ✅ [Migrated](../../reference/clanServices/mycelium.md) | | | `nginx` | ❌ Removed | | | `packages` | ✅ [Migrated](../../reference/clanServices/packages.md) | | -| `postgresql` | ❌ Removed | Now an [option](../../reference/clan.core/settings.md) | +| `postgresql` | ✅ [Migrated](../../reference/clan.core/settings.md) | Now an [option](../../reference/clan.core/settings.md) | | `root-password` | ✅ [Migrated](../../reference/clanServices/users.md) | See [migration guide](../../reference/clanServices/users.md#migration-from-root-password-module) | | `single-disk` | ❌ Removed | | | `sshd` | ✅ [Migrated](../../reference/clanServices/sshd.md) | | -| `state-version` | ✅ [Migrated](../../reference/clanServices/state-version.md) | | +| `state-version` | ✅ [Migrated](../../reference/clan.core/settings.md) | Now an [option](../../reference/clan.core/settings.md) | | `static-hosts` | ❌ Removed | | | `sunshine` | ❌ Removed | | | `syncthing-static-peers` | ❌ Removed | | diff --git a/nixosModules/clanCore/state-version/tests/flake-module.nix b/nixosModules/clanCore/state-version/tests/flake-module.nix index fa68c0a1c..b0a82e32c 100644 --- a/nixosModules/clanCore/state-version/tests/flake-module.nix +++ b/nixosModules/clanCore/state-version/tests/flake-module.nix @@ -9,28 +9,11 @@ clan = { directory = ./.; - - # Workaround until we can use nodes.server = { }; - modules."@clan/importer" = ../../../../clanServices/importer; - - inventory = { - machines.server = { }; - instances.importer = { - module.name = "@clan/importer"; - module.input = "self"; - roles.default.tags.all = { }; - roles.default.extraModules = [ - { - clan.core.settings.state-version.enable = true; - } - ]; - }; + machines.server = { + clan.core.settings.state-version.enable = true; }; }; - # TODO: Broken. Use instead of importer after fixing. - # nodes.server = { }; - # This is not an actual vm test, this is a workaround to # generate the needed vars for the eval test. testScript = "";