move checks if targetHost/buildHost is set to cli

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

@@ -3,6 +3,7 @@ import logging
 from pathlib import Path
 
 from ..cmd import run
+from ..errors import ClanError
 from ..nix import nix_build, nix_config, nix_eval, nix_metadata
 from ..ssh import Host, parse_deployment_address
 
@@ -48,10 +49,14 @@ class Machine:
     @property
     def target_host(self) -> str:
         # deploymentAddress is deprecated.
-        return (
+        val = (
             self.deployment_info.get("targetHost")
             or self.deployment_info["deploymentAddress"]
         )
+        if val is None:
+            msg = f"the 'clan.networking.targetHost' nixos option is not set for machine '{self.name}'"
+            raise ClanError(msg)
+        return val
 
     @target_host.setter
     def target_host(self, value: str) -> None:

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

@@ -154,14 +154,11 @@ def get_all_machines(clan_dir: Path) -> HostGroup:
     hosts = []
     for name, machine_data in machines.items():
         # very hacky. would be better to do a MachinesGroup instead
+        machine = Machine(name=name, flake=clan_dir, deployment_info=machine_data)
         host = parse_deployment_address(
             name,
-            machine_data.get("targetHost") or machine_data.get("deploymentAddress"),
-            meta={
-                "machine": Machine(
-                    name=name, flake=clan_dir, deployment_info=machine_data
-                )
-            },
+            host=machine.target_host,
+            meta={"machine": machine},
         )
         hosts.append(host)
     return HostGroup(hosts)