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

clan-lib: machines.py: Remove private_key attribute

Browse Source
This commit is contained in:
Qubasa
2025-06-19 17:28:50 +02:00
parent acaf04175d
commit cce4d561e4
4 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ class Machine:
flake: Flake
nix_options: list[str] = field(default_factory=list)
private_key: Path | None = None
host_key_check: HostKeyCheck = HostKeyCheck.STRICT
def get_inv_machine(self) -> "InventoryMachine":
@@ -149,18 +149,8 @@ class Machine:
description="See https://docs.clan.lol/guides/getting-started/deploy/#setting-the-target-host for more information.",
)
data = remote.data
return Remote(
address=data.address,
user=data.user,
command_prefix=data.command_prefix,
port=data.port,
private_key=self.private_key,
password=data.password,
forward_agent=data.forward_agent,
return data.override(
host_key_check=self.host_key_check,
verbose_ssh=data.verbose_ssh,
ssh_options=data.ssh_options,
tor_socks=data.tor_socks,
)
def build_host(self) -> Remote | None:
@@ -172,18 +162,8 @@ class Machine:
if remote:
data = remote.data
return Remote(
address=data.address,
user=data.user,
command_prefix=data.command_prefix,
port=data.port,
private_key=self.private_key,
password=data.password,
forward_agent=data.forward_agent,
return data.override(
host_key_check=self.host_key_check,
verbose_ssh=data.verbose_ssh,
ssh_options=data.ssh_options,
tor_socks=data.tor_socks,
)
return None
@@ -289,7 +269,6 @@ def get_host(
machine_name=machine.name,
address=host_str,
host_key_check=machine.host_key_check,
private_key=machine.private_key,
),
source=source,
)