DavHau/clan-core
1
0
Fork 0
forked from clan/clan-core
Code Pull Requests Activity

Merge pull request 'cmd.py refactor part 7' (#727) from Qubasa-main into main

Browse Source
This commit is contained in:
clan-bot 2024-01-12 16:41:21 +00:00
commit 50344b4937
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/clan-cli/clan_cli/vms/run.py
View File

@ -10,7 +10,7 @@ from dataclasses import dataclass, field
from pathlib import Path from pathlib import Path
from typing import IO from typing import IO
from ..cmd import run from ..cmd import Log, run
from ..dirs import module_root, specific_groot_dir, vm_state_dir from ..dirs import module_root, specific_groot_dir, vm_state_dir
from ..errors import ClanError from ..errors import ClanError
from ..nix import nix_build, nix_config, nix_shell from ..nix import nix_build, nix_config, nix_shell
@ -118,7 +118,7 @@ def get_vm_create_info(vm: VmConfig, nix_options: list[str]) -> dict[str, str]:
specific_groot_dir(clan_name=vm.clan_name, flake_url=str(vm.flake_url)) specific_groot_dir(clan_name=vm.clan_name, flake_url=str(vm.flake_url))
/ f"vm-{machine}", / f"vm-{machine}",
) )
proc = run(cmd) proc = run(cmd, log=Log.BOTH, error_msg=f"Could not build vm config for {machine}")
try: try:
return json.loads(Path(proc.stdout.strip()).read_text()) return json.loads(Path(proc.stdout.strip()).read_text())
except json.JSONDecodeError as e: except json.JSONDecodeError as e:
@ -143,28 +143,17 @@ def generate_secrets(
# Only generate secrets for local clans # Only generate secrets for local clans
if isinstance(vm.flake_url, Path) and vm.flake_url.is_dir(): if isinstance(vm.flake_url, Path) and vm.flake_url.is_dir():
if Path(vm.flake_url).is_dir(): if Path(vm.flake_url).is_dir():
subprocess.run( run([nixos_config["generateSecrets"], vm.clan_name], env=env)
[nixos_config["generateSecrets"], vm.clan_name],
env=env,
check=False,
stdout=log_fd,
stderr=log_fd,
)
else: else:
log.warning("won't generate secrets for non local clan") log.warning("won't generate secrets for non local clan")
cmd = [nixos_config["uploadSecrets"]] cmd = [nixos_config["uploadSecrets"]]
res = subprocess.run( run(
cmd, cmd,
env=env, env=env,
check=False, log=Log.BOTH,
stdout=log_fd, error_msg=f"Could not upload secrets for {vm.flake_attr}",
stderr=log_fd,
) )
if res.returncode != 0:
raise ClanError(
f"Failed to upload secrets: {shlex.join(cmd)} failed with {res.returncode}"
)
return secrets_dir return secrets_dir
@ -181,16 +170,11 @@ def prepare_disk(tmpdir: Path, log_fd: IO[str] | None) -> Path:
"1024M", "1024M",
], ],
) )
res = subprocess.run( run(
cmd, cmd,
check=False, log=Log.BOTH,
stdout=log_fd, error_msg=f"Could not create disk image at {disk_img}",
stderr=log_fd,
) )
if res.returncode != 0:
raise ClanError(
f"Failed to create disk image: {shlex.join(cmd)} failed with {res.returncode}"
)
cmd = nix_shell( cmd = nix_shell(
["nixpkgs#e2fsprogs"], ["nixpkgs#e2fsprogs"],
@ -201,16 +185,11 @@ def prepare_disk(tmpdir: Path, log_fd: IO[str] | None) -> Path:
str(disk_img), str(disk_img),
], ],
) )
res = subprocess.run( run(
cmd, cmd,
check=False, log=Log.BOTH,
stdout=log_fd, error_msg=f"Could not create ext4 filesystem at {disk_img}",
stderr=log_fd,
) )
if res.returncode != 0:
raise ClanError(
f"Failed to create ext4 filesystem: {shlex.join(cmd)} failed with {res.returncode}"
)
return disk_img return disk_img