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

Merge pull request 'make cli options more type safe using a dataclass' (#619) from Mic92-main into main

Browse Source
This commit is contained in:
clan-bot
2023-12-08 10:33:44 +00:00
parent 691ddbdd43 b9ca10c4da
commit 38bf05955d
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import shlex
import subprocess import subprocess
import sys import sys
import tempfile import tempfile
from dataclasses import dataclass, field
from pathlib import Path from pathlib import Path
from typing import IO from typing import IO
@@ -268,13 +269,23 @@ def run_vm(
raise ClanError(f"qemu failed with {res.returncode}") raise ClanError(f"qemu failed with {res.returncode}")
@dataclass
class RunOptions:
machine: str
flake_url: str | None
nix_options: list[str] = field(default_factory=list)
flake: Path | None = None
def run_command(args: argparse.Namespace) -> None: def run_command(args: argparse.Namespace) -> None:
flake_url = args.flake_url or args.flake run_options = RunOptions(args.machine, args.flake_url, args.option, args.flake)
flake_url = run_options.flake_url or run_options.flake
if not flake_url: if not flake_url:
flake_url = Path.cwd() flake_url = Path.cwd()
vm = asyncio.run(inspect_vm(flake_url=flake_url, flake_attr=args.machine)) vm = asyncio.run(inspect_vm(flake_url=flake_url, flake_attr=run_options.machine))
run_vm(vm, args.option) run_vm(vm, run_options.nix_options)
def register_run_parser(parser: argparse.ArgumentParser) -> None: def register_run_parser(parser: argparse.ArgumentParser) -> None: