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

Clan-api: disk schema: improve error messages for invalid options

Browse Source
This commit is contained in:
Johannes Kirschbauer
2024-11-29 21:33:22 +01:00
parent 6d50587f7b
commit 07c8b2c9ae
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/clan-cli/clan_cli/api/disk.py
View File

@@ -157,7 +157,10 @@ def set_machine_disk_schema(
msg = ( msg = (
f"Placeholder {placeholder_name} not found in disk schema {schema_name}" f"Placeholder {placeholder_name} not found in disk schema {schema_name}"
) )
raise ClanError(msg) raise ClanError(
msg,
description=f"Available placeholders: {disk_schema.placeholders.keys()}",
)
# Invalid value. Check if the value is one of the provided options # Invalid value. Check if the value is one of the provided options
if ph.options and placeholder_value not in ph.options: if ph.options and placeholder_value not in ph.options:
@@ -180,7 +183,7 @@ def set_machine_disk_schema(
disko_file_path = hw_config_path.parent.joinpath("disko.nix") disko_file_path = hw_config_path.parent.joinpath("disko.nix")
if disko_file_path.exists() and not force: if disko_file_path.exists() and not force:
msg = f"Disk schema already exists at {disko_file_path}" msg = f"Disk schema already exists at {disko_file_path}"
raise ClanError(msg) raise ClanError(msg, description="Use 'force' to overwrite")
with disko_file_path.open("w") as disk_config: with disko_file_path.open("w") as disk_config:
disk_config.write(config_str) disk_config.write(config_str)