Merge pull request 'clan.deployment: unify deprecated options' (#4184) from cli-fix into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4184

checks/flash/flake-module.nix

@@ -51,7 +51,6 @@
         self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript
         self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript.drvPath
         self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.clan.deployment.file
-
       ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
       closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
     in

docs/site/guides/getting-started/deploy.md

@@ -304,14 +304,14 @@ clan {
 ### Excluding from Automatic Updates
 
 To exclude machines from being updated when running `clan machines update` without any machines specified,
-one can set the `clan.deployment.requireExplicitUpdate` option to true:
+one can set the `clan.core.deployment.requireExplicitUpdate` option to true:
 
 ```{.nix hl_lines="5" .no-copy}
 clan {
     # ...
     machines = {
         "jon" = {
-            clan.deployment.requireExplicitUpdate = true;
+            clan.core.deployment.requireExplicitUpdate = true;
         };
     };
 };

nixosModules/clanCore/networking.nix

@@ -84,31 +84,16 @@
       use = lib.trace "Obsolete option `${lib.showOption from}' is used. It was renamed to `${lib.showOption to}'.";
       withPriority = false;
     })
-    (lib.mkRenamedOptionModule
-      [
-        "clan"
-        "deployment"
-      ]
-      [
-        "clan"
-        "core"
-        "deployment"
-      ]
-    )
-    (lib.mkRenamedOptionModule
-      [
-        "clan"
-        "core"
-        "networking"
-        "deploymentAddress"
-      ]
-      [
-        "clan"
-        "core"
-        "networking"
-        "targetHost"
-      ]
-    )
+    (lib.mkRemovedOptionModule [
+      "clan"
+      "deployment"
+    ] "Use clan.core.deployment instead")
+    (lib.mkRemovedOptionModule [
+      "clan"
+      "core"
+      "networking"
+      "deploymentAddress"
+    ] "Use clan.core.network.targetHost instead")
   ];
   config = lib.optionalAttrs (_class == "nixos") (
     lib.mkIf config.clan.core.enableRecommendedDefaults {

nixosModules/clanCore/outputs.nix

@@ -47,10 +47,10 @@
         deployment.nixosMobileWorkaround = lib.mkOption {
           type = lib.types.bool;
           description = ''
-            if true, the deployment will first do a nixos-rebuild switch 
+            if true, the deployment will first do a nixos-rebuild switch
             to register the boot profile the command will fail applying it to the running system
-            which is why afterwards we execute a nixos-rebuild test to apply 
-            the new config without having to reboot. 
+            which is why afterwards we execute a nixos-rebuild test to apply
+            the new config without having to reboot.
             This is a nixos-mobile deployment bug and will be removed in the future
           '';
           default = false;
@@ -80,8 +80,8 @@
       };
       sops.defaultGroups = config.clan.core.sops.defaultGroups;
       inherit (config.clan.core.networking) targetHost buildHost;
+      inherit (config.clan.core.deployment) requireExplicitUpdate;
       inherit (config.system.clan.deployment) nixosMobileWorkaround;
-      inherit (config.clan.deployment) requireExplicitUpdate;
     };
     system.clan.deployment.file = pkgs.writeText "deployment.json" (
       builtins.toJSON config.system.clan.deployment.data

pkgs/clan-cli/clan_cli/machines/cli.py

@@ -34,7 +34,7 @@ Examples:
   $ clan machines update [MACHINES]
   Will update the specified machines [MACHINES], if [MACHINES] is omitted, the command
   will attempt to update every configured machine.
-  To exclude machines being updated `clan.deployment.requireExplicitUpdate = true;`
+  To exclude machines being updated `clan.core.deployment.requireExplicitUpdate = true;`
   can be set in the machine config.
 
   $ clan machines update --tags [TAGS..]

pkgs/clan-cli/clan_lib/machines/list.py

@@ -8,7 +8,6 @@ from clan_lib.api import API
 from clan_lib.api.disk import MachineDiskMatter
 from clan_lib.api.modules import parse_frontmatter
 from clan_lib.dirs import specific_machine_dir
-from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
 from clan_lib.machines.actions import get_machine, list_machines
 from clan_lib.machines.machines import Machine
@@ -25,13 +24,7 @@ def list_full_machines(flake: Flake) -> dict[str, Machine]:
 
     res: dict[str, Machine] = {}
 
-    for inv_machine in machines.values():
-        name = inv_machine.get("name")
-        # Technically, this should not happen, but we are defensive here.
-        if name is None:
-            msg = "InternalError: Machine name is required. But got a machine without a name."
-            raise ClanError(msg)
-
+    for name in machines:
         machine = Machine(name=name, flake=flake)
         res[machine.name] = machine