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

machines.Machine: refactor flake_dir -> flake; use Machine class in vm

Browse Source
This commit is contained in:
lassulus
2024-01-19 14:37:30 +01:00
parent b98e15d6d7
commit bdd1f9be6d
13 changed files with 144 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/clan-cli/clan_cli/machines/install.py
View File

@@ -34,7 +34,7 @@ def install_nixos(machine: Machine, kexec: str | None = None) -> None:
cmd = [
"nixos-anywhere",
"-f",
f"{machine.flake_dir}#{flake_attr}",
f"{machine.flake}#{flake_attr}",
"-t",
"--no-reboot",
"--extra-files",
@@ -68,7 +68,7 @@ def install_command(args: argparse.Namespace) -> None:
target_host=args.target_host,
kexec=args.kexec,
)
machine = Machine(opts.machine, flake_dir=opts.flake)
machine = Machine(opts.machine, flake=opts.flake)
machine.deployment_address = opts.target_host
install_nixos(machine, kexec=opts.kexec)

101
pkgs/clan-cli/clan_cli/machines/machines.py
View File

@@ -1,33 +1,16 @@
import json
from pathlib import Path
from ..cmd import Log, run
from ..cmd import run
from ..nix import nix_build, nix_config, nix_eval
from ..ssh import Host, parse_deployment_address
def build_machine_data(machine_name: str, clan_dir: Path) -> dict:
config = nix_config()
system = config["system"]
proc = run(
nix_build(
[
f'{clan_dir}#clanInternals.machines."{system}"."{machine_name}".config.system.clan.deployment.file'
]
),
log=Log.BOTH,
error_msg="failed to build machine data",
)
return json.loads(Path(proc.stdout.strip()).read_text())
class Machine:
def __init__(
self,
name: str,
flake_dir: Path,
flake: Path | str,
machine_data: dict | None = None,
) -> None:
"""
@@ -36,22 +19,39 @@ class Machine:
@clan_dir: the directory of the clan, optional, if not set it will be determined from the current working directory
@machine_json: can be optionally used to skip evaluation of the machine, location of the json file with machine data
"""
self.name = name
self.flake_dir = flake_dir
self.name: str = name
self.flake: str | Path = flake
self.eval_cache: dict[str, str] = {}
self.build_cache: dict[str, Path] = {}
# TODO do this lazily
if machine_data is None:
self.machine_data = build_machine_data(name, self.flake_dir)
self.machine_data = json.loads(
self.build_nix("config.system.clan.deployment.file").read_text()
)
else:
self.machine_data = machine_data
self.deployment_address = self.machine_data["deploymentAddress"]
self.secrets_module = self.machine_data["secretsModule"]
self.secrets_data = json.loads(
Path(self.machine_data["secretsData"]).read_text()
)
self.secrets_module = self.machine_data.get("secretsModule", None)
if "secretsData" in self.machine_data:
self.secrets_data = json.loads(
Path(self.machine_data["secretsData"]).read_text()
)
self.secrets_upload_directory = self.machine_data["secretsUploadDirectory"]
self.eval_cache: dict[str, str] = {}
self.build_cache: dict[str, Path] = {}
@property
def flake_dir(self) -> Path:
if isinstance(self.flake, Path):
return self.flake
if hasattr(self, "flake_path"):
return Path(self.flake_path)
print(nix_eval([f"{self.flake}"]))
self.flake_path = run(nix_eval([f"{self.flake}"])).stdout.strip()
return Path(self.flake_path)
@property
def host(self) -> Host:
@@ -67,9 +67,25 @@ class Machine:
if attr in self.eval_cache and not refresh:
return self.eval_cache[attr]
output = run(
nix_eval([f"path:{self.flake_dir}#{attr}"]),
).stdout.strip()
config = nix_config()
system = config["system"]
if isinstance(self.flake, Path):
output = run(
nix_eval(
[
f'path:{self.flake}#clanInternals.machines."{system}"."{self.name}".{attr}'
]
),
).stdout.strip()
else:
output = run(
nix_eval(
[
f'{self.flake}#clanInternals.machines."{system}"."{self.name}".{attr}'
]
),
).stdout.strip()
self.eval_cache[attr] = output
return output
@@ -80,8 +96,25 @@ class Machine:
"""
if attr in self.build_cache and not refresh:
return self.build_cache[attr]
outpath = run(
nix_build([f"path:{self.flake_dir}#{attr}"]),
).stdout.strip()
config = nix_config()
system = config["system"]
if isinstance(self.flake, Path):
outpath = run(
nix_build(
[
f'path:{self.flake}#clanInternals.machines."{system}"."{self.name}".{attr}'
]
),
).stdout.strip()
else:
outpath = run(
nix_build(
[
f'{self.flake}#clanInternals.machines."{system}"."{self.name}".{attr}'
]
),
).stdout.strip()
self.build_cache[attr] = Path(outpath)
return Path(outpath)

8
pkgs/clan-cli/clan_cli/machines/update.py
View File

@@ -93,9 +93,7 @@ def get_all_machines(clan_dir: Path) -> HostGroup:
name,
machine_data["deploymentAddress"],
meta={
"machine": Machine(
name=name, flake_dir=clan_dir, machine_data=machine_data
)
"machine": Machine(name=name, flake=clan_dir, machine_data=machine_data)
},
)
hosts.append(host)
@@ -105,7 +103,7 @@ def get_all_machines(clan_dir: Path) -> HostGroup:
def get_selected_machines(machine_names: list[str], flake_dir: Path) -> HostGroup:
hosts = []
for name in machine_names:
machine = Machine(name=name, flake_dir=flake_dir)
machine = Machine(name=name, flake=flake_dir)
hosts.append(machine.host)
return HostGroup(hosts)
@@ -115,7 +113,7 @@ def update(args: argparse.Namespace) -> None:
if args.flake is None:
raise ClanError("Could not find clan flake toplevel directory")
if len(args.machines) == 1 and args.target_host is not None:
machine = Machine(name=args.machines[0], flake_dir=args.flake)
machine = Machine(name=args.machines[0], flake=args.flake)
machine.deployment_address = args.target_host
host = parse_deployment_address(
args.machines[0],