yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pkgs/clan: Rename target_host_str

Browse Source 
The `target_host_str` is a confusing choice, since it can be either
the `targetHost` or `buildHost`.
This commit is contained in:
a-kenji
2025-06-18 12:03:57 +02:00
parent f4973a48a7
commit 8e128239d9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/clan-cli/clan_lib/machines/machines.py
View File

@@ -266,28 +266,28 @@ def get_host(
name: str, flake: Flake, field: Literal["targetHost", "buildHost"] name: str, flake: Flake, field: Literal["targetHost", "buildHost"]
) -> RemoteSource | None: ) -> RemoteSource | None:
""" """
Get the build host for a machine. Get the build or target host for a machine.
""" """
machine = Machine(name=name, flake=flake) machine = Machine(name=name, flake=flake)
inv_machine = machine.get_inv_machine() inv_machine = machine.get_inv_machine()
source: Literal["inventory", "nix_machine"] = "inventory" source: Literal["inventory", "nix_machine"] = "inventory"
target_host_str = inv_machine.get("deploy", {}).get(field) host_str = inv_machine.get("deploy", {}).get(field)
if target_host_str is None: if host_str is None:
machine.info( machine.info(
f"'{field}' is not set in inventory, falling back to slow Nix config" f"'{field}' is not set in inventory, falling back to slow Nix config"
) )
target_host_str = machine.eval_nix(f'config.clan.core.networking."{field}"') host_str = machine.eval_nix(f'config.clan.core.networking."{field}"')
source = "nix_machine" source = "nix_machine"
if not target_host_str: if not host_str:
return None return None
return RemoteSource( return RemoteSource(
data=Remote.from_deployment_address( data=Remote.from_deployment_address(
machine_name=machine.name, machine_name=machine.name,
address=target_host_str, address=host_str,
host_key_check=machine.host_key_check, host_key_check=machine.host_key_check,
private_key=machine.private_key, private_key=machine.private_key,
), ),