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

lib/disks: move from api to templates

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-07-13 12:01:58 +02:00
parent 86db003973
commit fb745beda5
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/templates/apply_disk.py
View File

@@ -3,8 +3,8 @@ import logging
from collections.abc import Sequence from collections.abc import Sequence
from typing import Any from typing import Any
from clan_lib.api.disk import set_machine_disk_schema
from clan_lib.machines.machines import Machine from clan_lib.machines.machines import Machine
from clan_lib.templates.disk import set_machine_disk_schema
from clan_cli.completions import ( from clan_cli.completions import (
add_dynamic_completer, add_dynamic_completer,

2
pkgs/clan-cli/clan_lib/machines/list.py
View File

@@ -5,13 +5,13 @@ from dataclasses import dataclass
from clan_cli.machines.hardware import HardwareConfig from clan_cli.machines.hardware import HardwareConfig
from clan_lib.api import API from clan_lib.api import API
from clan_lib.api.disk import MachineDiskMatter
from clan_lib.dirs import specific_machine_dir from clan_lib.dirs import specific_machine_dir
from clan_lib.flake import Flake from clan_lib.flake import Flake
from clan_lib.machines.actions import get_machine, list_machines from clan_lib.machines.actions import get_machine, list_machines
from clan_lib.machines.machines import Machine from clan_lib.machines.machines import Machine
from clan_lib.nix_models.clan import InventoryMachine from clan_lib.nix_models.clan import InventoryMachine
from clan_lib.services.modules import parse_frontmatter from clan_lib.services.modules import parse_frontmatter
from clan_lib.templates.disk import MachineDiskMatter
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

2
pkgs/clan-cli/clan_lib/api/disk.py → pkgs/clan-cli/clan_lib/templates/disk.py
View File

@@ -6,12 +6,12 @@ from typing import Any, TypedDict
from uuid import uuid4 from uuid import uuid4
from clan_lib.api import API from clan_lib.api import API
from clan_lib.api.modules import Frontmatter, extract_frontmatter
from clan_lib.dirs import TemplateType, clan_templates from clan_lib.dirs import TemplateType, clan_templates
from clan_lib.errors import ClanError from clan_lib.errors import ClanError
from clan_lib.git import commit_file from clan_lib.git import commit_file
from clan_lib.machines.hardware import HardwareConfig, get_machine_hardware_config from clan_lib.machines.hardware import HardwareConfig, get_machine_hardware_config
from clan_lib.machines.machines import Machine from clan_lib.machines.machines import Machine
from clan_lib.services.modules import Frontmatter, extract_frontmatter
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

2
pkgs/clan-cli/clan_lib/tests/test_create.py
View File

@@ -16,7 +16,6 @@ from clan_cli.secrets.sops import maybe_get_admin_public_keys
from clan_cli.secrets.users import add_user from clan_cli.secrets.users import add_user
from clan_cli.vars.generate import get_generators, run_generators from clan_cli.vars.generate import get_generators, run_generators
from clan_lib.api.disk import hw_main_disk_options, set_machine_disk_schema
from clan_lib.cmd import RunOpts, run from clan_lib.cmd import RunOpts, run
from clan_lib.dirs import specific_machine_dir from clan_lib.dirs import specific_machine_dir
from clan_lib.errors import ClanError from clan_lib.errors import ClanError
@@ -34,6 +33,7 @@ from clan_lib.persist.inventory_store import InventoryStore
from clan_lib.persist.util import set_value_by_path from clan_lib.persist.util import set_value_by_path
from clan_lib.services.modules import list_modules from clan_lib.services.modules import list_modules
from clan_lib.ssh.remote import Remote, check_machine_ssh_login from clan_lib.ssh.remote import Remote, check_machine_ssh_login
from clan_lib.templates.disk import hw_main_disk_options, set_machine_disk_schema
log = logging.getLogger(__name__) log = logging.getLogger(__name__)