From 826ea7d515a60c94251eca13c940d8e4cbc7ce5c Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 6 Jul 2025 12:22:00 +0200 Subject: [PATCH] cli: return validated list from validate_machine_names --- pkgs/clan-cli/clan_lib/machines/suggestions.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_lib/machines/suggestions.py b/pkgs/clan-cli/clan_lib/machines/suggestions.py index 5923fc881..81be38156 100644 --- a/pkgs/clan-cli/clan_lib/machines/suggestions.py +++ b/pkgs/clan-cli/clan_lib/machines/suggestions.py @@ -48,9 +48,13 @@ def get_available_machines(flake: Flake) -> list[str]: return list(machines.keys()) -def validate_machine_names(machine_names: list[str], flake: Flake) -> None: +def validate_machine_names(machine_names: list[str], flake: Flake) -> list[str]: + """ + Returns a list of valid machine names + that are guaranteed to exist in the referenced clan + """ if not machine_names: - return + return [] available_machines = get_available_machines(flake) invalid_machines = [ @@ -70,3 +74,5 @@ def validate_machine_names(machine_names: list[str], flake: Flake) -> None: error_lines.append(f"Machine '{machine_name}' not found. {suggestion_text}") raise ClanError("\n".join(error_lines)) + + return machine_names