Merge pull request 'skip machines without target_host when running clan machines update' (#816) from Mic92-target_host into main

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

@@ -49,9 +49,8 @@ class Machine:
     @property
     def target_host(self) -> str:
         # deploymentAddress is deprecated.
-        val = (
+        val = self.deployment_info.get("targetHost") or self.deployment_info.get(
-            self.deployment_info.get("targetHost")
+            "deploymentAddress"
-            or self.deployment_info["deploymentAddress"]
         )
         if val is None:
             msg = f"the 'clan.networking.targetHost' nixos option is not set for machine '{self.name}'"

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

@@ -4,6 +4,7 @@ import logging
 import os
 import shlex
 import subprocess
+import sys
 from pathlib import Path
 
 from ..cmd import run
@@ -152,15 +153,28 @@ def get_all_machines(clan_dir: Path) -> HostGroup:
     machines = json.loads(Path(machines_json.rstrip()).read_text())
 
     hosts = []
+    ignored_machines = []
     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)
+        try:
+            machine.target_host
+        except ClanError:
+            ignored_machines.append(name)
+            continue
         host = parse_deployment_address(
             name,
             host=machine.target_host,
             meta={"machine": machine},
         )
         hosts.append(host)
+    if not hosts and ignored_machines != []:
+        print(
+            "WARNING: No machines to update. The following defined machines were ignored because they do not have `clan.networking.targetHost` nixos option set:",
+            file=sys.stderr,
+        )
+        for machine in ignored_machines:
+            print(machine, file=sys.stderr)
+    # very hacky. would be better to do a MachinesGroup instead
     return HostGroup(hosts)