From 51526aedbb44f8eeaf62e64177c3dff378cc251c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 3 Dec 2024 17:14:27 +0100 Subject: [PATCH] rename run_no_output to run_no_stdout we want stderr for some nix commands. --- pkgs/clan-cli/clan_cli/api/directory.py | 4 ++-- pkgs/clan-cli/clan_cli/api/mdns_discovery.py | 4 ++-- pkgs/clan-cli/clan_cli/api/modules.py | 6 +++--- pkgs/clan-cli/clan_cli/clan/show.py | 4 ++-- pkgs/clan-cli/clan_cli/cmd.py | 4 ++-- pkgs/clan-cli/clan_cli/inventory/__init__.py | 4 ++-- pkgs/clan-cli/clan_cli/machines/hardware.py | 6 +++--- pkgs/clan-cli/clan_cli/machines/list.py | 6 +++--- pkgs/clan-cli/clan_cli/machines/machines.py | 10 +++++----- pkgs/clan-cli/clan_cli/nix/__init__.py | 4 ++-- pkgs/clan-cli/clan_cli/state/list.py | 4 ++-- pkgs/clan-cli/clan_cli/tags.py | 4 ++-- pkgs/clan-cli/tests/test_modules.py | 4 ++-- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/api/directory.py b/pkgs/clan-cli/clan_cli/api/directory.py index b1878d8fc..4a40ad24e 100644 --- a/pkgs/clan-cli/clan_cli/api/directory.py +++ b/pkgs/clan-cli/clan_cli/api/directory.py @@ -5,7 +5,7 @@ from pathlib import Path from typing import Any, Literal from clan_cli.errors import ClanError -from clan_cli.nix import nix_shell, run_no_output +from clan_cli.nix import nix_shell, run_no_stdout from . import API @@ -154,7 +154,7 @@ def show_block_devices(options: BlockDeviceOptions) -> Blockdevices: "PATH,NAME,RM,SIZE,RO,MOUNTPOINTS,TYPE,ID-LINK", ], ) - proc = run_no_output(cmd, needs_user_terminal=True) + proc = run_no_stdout(cmd, needs_user_terminal=True) res = proc.stdout.strip() blk_info: dict[str, Any] = json.loads(res) diff --git a/pkgs/clan-cli/clan_cli/api/mdns_discovery.py b/pkgs/clan-cli/clan_cli/api/mdns_discovery.py index 79a7112de..64fc9cf8c 100644 --- a/pkgs/clan-cli/clan_cli/api/mdns_discovery.py +++ b/pkgs/clan-cli/clan_cli/api/mdns_discovery.py @@ -2,7 +2,7 @@ import argparse import re from dataclasses import dataclass -from clan_cli.cmd import run_no_output +from clan_cli.cmd import run_no_stdout from clan_cli.nix import nix_shell from . import API @@ -100,7 +100,7 @@ def show_mdns() -> DNSInfo: "--terminate", ], ) - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) data = parse_avahi_output(proc.stdout) return data diff --git a/pkgs/clan-cli/clan_cli/api/modules.py b/pkgs/clan-cli/clan_cli/api/modules.py index 31ef7541c..b0ddf501c 100644 --- a/pkgs/clan-cli/clan_cli/api/modules.py +++ b/pkgs/clan-cli/clan_cli/api/modules.py @@ -5,7 +5,7 @@ from dataclasses import dataclass, field from pathlib import Path from typing import Any, TypedDict, get_args, get_type_hints -from clan_cli.cmd import run_no_output +from clan_cli.cmd import run_no_stdout from clan_cli.errors import ClanCmdError, ClanError from clan_cli.inventory import Inventory, load_inventory_json, set_inventory from clan_cli.inventory.classes import Service @@ -164,7 +164,7 @@ def get_modules(base_path: str) -> dict[str, str]: ] ) try: - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) res = proc.stdout.strip() except ClanCmdError as e: msg = "clanInternals might not have inventory.modules attributes" @@ -185,7 +185,7 @@ def get_module_interface(base_path: str, module_name: str) -> dict[str, Any]: """ cmd = nix_eval([f"{base_path}#clanInternals.moduleSchemas.{module_name}", "--json"]) try: - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) res = proc.stdout.strip() except ClanCmdError as e: msg = "clanInternals might not have moduleSchemas attributes" diff --git a/pkgs/clan-cli/clan_cli/clan/show.py b/pkgs/clan-cli/clan_cli/clan/show.py index 7b9c3b2c0..d089a90c3 100644 --- a/pkgs/clan-cli/clan_cli/clan/show.py +++ b/pkgs/clan-cli/clan_cli/clan/show.py @@ -5,7 +5,7 @@ from pathlib import Path from urllib.parse import urlparse from clan_cli.api import API -from clan_cli.cmd import run_no_output +from clan_cli.cmd import run_no_stdout from clan_cli.errors import ClanCmdError, ClanError from clan_cli.inventory import Meta from clan_cli.nix import nix_eval @@ -24,7 +24,7 @@ def show_clan_meta(uri: str | Path) -> Meta: res = "{}" try: - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) res = proc.stdout.strip() except ClanCmdError as e: msg = "Evaluation failed on meta attribute" diff --git a/pkgs/clan-cli/clan_cli/cmd.py b/pkgs/clan-cli/clan_cli/cmd.py index 04652f77f..5b3cf2d9f 100644 --- a/pkgs/clan-cli/clan_cli/cmd.py +++ b/pkgs/clan-cli/clan_cli/cmd.py @@ -338,12 +338,12 @@ def run( return cmd_out -def run_no_output( +def run_no_stdout( cmd: list[str], *, env: dict[str, str] | None = None, cwd: Path | None = None, - log: Log = Log.NONE, + log: Log = Log.STDERR, prefix: str | None = None, check: bool = True, error_msg: str | None = None, diff --git a/pkgs/clan-cli/clan_cli/inventory/__init__.py b/pkgs/clan-cli/clan_cli/inventory/__init__.py index 11ed1a627..c9867c222 100644 --- a/pkgs/clan-cli/clan_cli/inventory/__init__.py +++ b/pkgs/clan-cli/clan_cli/inventory/__init__.py @@ -18,7 +18,7 @@ from pathlib import Path from typing import Any from clan_cli.api import API, dataclass_to_dict, from_dict -from clan_cli.cmd import run_no_output +from clan_cli.cmd import run_no_stdout from clan_cli.errors import ClanCmdError, ClanError from clan_cli.git import commit_file from clan_cli.nix import nix_eval @@ -78,7 +78,7 @@ def load_inventory_eval(flake_dir: str | Path) -> Inventory: ] ) - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) try: res = proc.stdout.strip() diff --git a/pkgs/clan-cli/clan_cli/machines/hardware.py b/pkgs/clan-cli/clan_cli/machines/hardware.py index 568a3d571..7e8d719ba 100644 --- a/pkgs/clan-cli/clan_cli/machines/hardware.py +++ b/pkgs/clan-cli/clan_cli/machines/hardware.py @@ -7,7 +7,7 @@ from pathlib import Path from clan_cli.api import API from clan_cli.clan_uri import FlakeId -from clan_cli.cmd import RunOpts, run, run_no_output +from clan_cli.cmd import RunOpts, run, run_no_stdout from clan_cli.completions import add_dynamic_completer, complete_machines from clan_cli.dirs import specific_machine_dir from clan_cli.errors import ClanCmdError, ClanError @@ -71,7 +71,7 @@ def show_machine_deployment_target(clan_dir: Path, machine_name: str) -> str | N "--json", ] ) - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) res = proc.stdout.strip() target_host = json.loads(res) @@ -93,7 +93,7 @@ def show_machine_hardware_platform(clan_dir: Path, machine_name: str) -> str | N "--json", ] ) - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) res = proc.stdout.strip() host_platform = json.loads(res) diff --git a/pkgs/clan-cli/clan_cli/machines/list.py b/pkgs/clan-cli/clan_cli/machines/list.py index 3d69678c6..b4e931757 100644 --- a/pkgs/clan-cli/clan_cli/machines/list.py +++ b/pkgs/clan-cli/clan_cli/machines/list.py @@ -7,7 +7,7 @@ from typing import Literal from clan_cli.api import API from clan_cli.api.modules import parse_frontmatter -from clan_cli.cmd import run_no_output +from clan_cli.cmd import run_no_stdout from clan_cli.completions import add_dynamic_completer, complete_tags from clan_cli.dirs import specific_machine_dir from clan_cli.errors import ClanCmdError, ClanError @@ -88,7 +88,7 @@ def list_nixos_machines(flake_url: str | Path) -> list[str]: "--json", ] ) - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) try: res = proc.stdout.strip() @@ -142,7 +142,7 @@ def check_machine_online( ], ) try: - proc = run_no_output(cmd, needs_user_terminal=True) + proc = run_no_stdout(cmd, needs_user_terminal=True) if proc.returncode != 0: return "Offline" except ClanCmdError: diff --git a/pkgs/clan-cli/clan_cli/machines/machines.py b/pkgs/clan-cli/clan_cli/machines/machines.py index ea986c428..e46a1af3a 100644 --- a/pkgs/clan-cli/clan_cli/machines/machines.py +++ b/pkgs/clan-cli/clan_cli/machines/machines.py @@ -9,7 +9,7 @@ from tempfile import NamedTemporaryFile from typing import TYPE_CHECKING, Any, Literal from clan_cli.clan_uri import FlakeId -from clan_cli.cmd import run_no_output +from clan_cli.cmd import run_no_stdout from clan_cli.errors import ClanError from clan_cli.facts import public_modules as facts_public_modules from clan_cli.facts import secret_modules as facts_secret_modules @@ -70,7 +70,7 @@ class Machine: attr = f'(builtins.getFlake "{self.flake}").nixosConfigurations.{self.name}.pkgs.hostPlatform.system' output = self._eval_cache.get(attr) if output is None: - output = run_no_output( + output = run_no_stdout( nix_eval(["--impure", "--expr", attr]) ).stdout.strip() self._eval_cache[attr] = output @@ -238,7 +238,7 @@ class Machine: config_json.flush() file_info = json.loads( - run_no_output( + run_no_stdout( nix_eval( [ "--impure", @@ -283,9 +283,9 @@ class Machine: args += nix_options + self.nix_options if method == "eval": - output = run_no_output(nix_eval(args)).stdout.strip() + output = run_no_stdout(nix_eval(args)).stdout.strip() return output - return Path(run_no_output(nix_build(args)).stdout.strip()) + return Path(run_no_stdout(nix_build(args)).stdout.strip()) def eval_nix( self, diff --git a/pkgs/clan-cli/clan_cli/nix/__init__.py b/pkgs/clan-cli/clan_cli/nix/__init__.py index 1ec0d2ea1..d1dc6a083 100644 --- a/pkgs/clan-cli/clan_cli/nix/__init__.py +++ b/pkgs/clan-cli/clan_cli/nix/__init__.py @@ -4,7 +4,7 @@ import tempfile from pathlib import Path from typing import Any -from clan_cli.cmd import run, run_no_output +from clan_cli.cmd import run, run_no_stdout from clan_cli.dirs import nixpkgs_flake, nixpkgs_source from clan_cli.errors import ClanError @@ -63,7 +63,7 @@ def nix_add_to_gcroots(nix_path: Path, dest: Path) -> None: def nix_config() -> dict[str, Any]: cmd = nix_command(["show-config", "--json"]) - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) data = json.loads(proc.stdout) config = {} for key, value in data.items(): diff --git a/pkgs/clan-cli/clan_cli/state/list.py b/pkgs/clan-cli/clan_cli/state/list.py index 4795175e9..ba6a1d684 100644 --- a/pkgs/clan-cli/clan_cli/state/list.py +++ b/pkgs/clan-cli/clan_cli/state/list.py @@ -3,7 +3,7 @@ import json import logging from pathlib import Path -from clan_cli.cmd import run_no_output +from clan_cli.cmd import run_no_stdout from clan_cli.completions import ( add_dynamic_completer, complete_machines, @@ -31,7 +31,7 @@ def list_state_folders(machine: str, service: None | str = None) -> None: res = "{}" try: - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) res = proc.stdout.strip() except ClanCmdError as e: msg = "Clan might not have meta attributes" diff --git a/pkgs/clan-cli/clan_cli/tags.py b/pkgs/clan-cli/clan_cli/tags.py index b0097e13c..4f84a792e 100644 --- a/pkgs/clan-cli/clan_cli/tags.py +++ b/pkgs/clan-cli/clan_cli/tags.py @@ -2,7 +2,7 @@ import json from pathlib import Path from typing import Any -from clan_cli.cmd import run_no_output +from clan_cli.cmd import run_no_stdout from clan_cli.errors import ClanError from clan_cli.nix import nix_eval @@ -18,7 +18,7 @@ def list_tagged_machines(flake_url: str | Path) -> dict[str, Any]: "--json", ] ) - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) try: res = proc.stdout.strip() diff --git a/pkgs/clan-cli/tests/test_modules.py b/pkgs/clan-cli/tests/test_modules.py index 518d596d3..486a40726 100644 --- a/pkgs/clan-cli/tests/test_modules.py +++ b/pkgs/clan-cli/tests/test_modules.py @@ -12,7 +12,7 @@ from clan_cli.inventory import ( set_inventory, ) from clan_cli.machines.create import CreateOptions, create_machine -from clan_cli.nix import nix_eval, run_no_output +from clan_cli.nix import nix_eval, run_no_stdout from fixtures_flakes import FlakeForTest if TYPE_CHECKING: @@ -97,7 +97,7 @@ def test_add_module_to_inventory( "--json", ] ) - proc = run_no_output(cmd) + proc = run_no_stdout(cmd) res = json.loads(proc.stdout.strip()) assert res["machine1"]["authorizedKeys"] == [ssh_key]