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

don't expose polymorphic api

Browse Source
This commit is contained in:
Jörg Thalheim
2024-09-29 16:14:34 +02:00
parent 84cb54a537
commit b97ee66e8f
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/clan-cli/clan_cli/machines/hardware.py
View File

@@ -30,13 +30,13 @@ facter_file = "facter.json"
@API.register @API.register
def show_machine_hardware_info( def show_machine_hardware_info(
clan_dir: str | Path, machine_name: str clan_dir: Path, machine_name: str
) -> HardwareReport | None: ) -> HardwareReport | None:
""" """
Show hardware information for a machine returns None if none exist. Show hardware information for a machine returns None if none exist.
""" """
hw_file = Path(f"{clan_dir}/machines/{machine_name}/{hw_nix_file}") hw_file = Path(clan_dir) / "machines" / machine_name / hw_nix_file
is_template = hw_file.exists() and "throw" in hw_file.read_text() is_template = hw_file.exists() and "throw" in hw_file.read_text()
if hw_file.exists() and not is_template: if hw_file.exists() and not is_template:
@@ -49,9 +49,7 @@ def show_machine_hardware_info(
@API.register @API.register
def show_machine_deployment_target( def show_machine_deployment_target(clan_dir: Path, machine_name: str) -> str | None:
clan_dir: str | Path, machine_name: str
) -> str | None:
""" """
Show deployment target for a machine returns None if none exist. Show deployment target for a machine returns None if none exist.
""" """
@@ -73,9 +71,7 @@ def show_machine_deployment_target(
@API.register @API.register
def show_machine_hardware_platform( def show_machine_hardware_platform(clan_dir: Path, machine_name: str) -> str | None:
clan_dir: str | Path, machine_name: str
) -> str | None:
""" """
Show hardware information for a machine returns None if none exist. Show hardware information for a machine returns None if none exist.
""" """
@@ -159,13 +155,15 @@ def generate_machine_hardware_info(
msg = f"Failed to inspect {machine_name}. Address: {hostname}" msg = f"Failed to inspect {machine_name}. Address: {hostname}"
raise ClanError(msg) raise ClanError(msg)
hw_file = Path( hw_file = clan_dir.path / "machines" / machine_name
f"{clan_dir}/machines/{machine_name}/{hw_nix_file if backend == 'nixos-generate-config' else facter_file}" if backend == "nixos-generate-config":
) hw_file /= hw_nix_file
else:
hw_file /= facter_file
hw_file.parent.mkdir(parents=True, exist_ok=True) hw_file.parent.mkdir(parents=True, exist_ok=True)
# Check if the hardware-configuration.nix file is a template # Check if the hardware-configuration.nix file is a template
is_template = hw_file.exists() and "throw" in hw_file.read_text() is_template = hw_file.exists() and "throw ''" in hw_file.read_text()
if hw_file.exists() and not force and not is_template: if hw_file.exists() and not force and not is_template:
msg = "File exists" msg = "File exists"