From 915178765bdf3e985001beb803ee6b584dad87a5 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 7 Aug 2025 15:31:17 +0200 Subject: [PATCH] Vars: rename classmethod to get_machine_generators --- pkgs/clan-cli/clan_cli/tests/test_modules.py | 2 +- pkgs/clan-cli/clan_cli/vars/check.py | 2 +- pkgs/clan-cli/clan_cli/vars/fix.py | 2 +- pkgs/clan-cli/clan_cli/vars/generate.py | 12 ++++++------ .../clan_cli/vars/secret_modules/password_store.py | 4 ++-- pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py | 8 ++++---- pkgs/clan-cli/clan_lib/flash/flash.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/tests/test_modules.py b/pkgs/clan-cli/clan_cli/tests/test_modules.py index 0c1c9557a..43aa072e8 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_modules.py +++ b/pkgs/clan-cli/clan_cli/tests/test_modules.py @@ -117,7 +117,7 @@ def test_add_module_to_inventory( generator = None - generators = Generator.generators_from_flake(machine.name, machine.flake) + generators = Generator.get_machine_generators(machine.name, machine.flake) for gen in generators: if gen.name == "borgbackup": generator = gen diff --git a/pkgs/clan-cli/clan_cli/vars/check.py b/pkgs/clan-cli/clan_cli/vars/check.py index 90ff28704..6636851cb 100644 --- a/pkgs/clan-cli/clan_cli/vars/check.py +++ b/pkgs/clan-cli/clan_cli/vars/check.py @@ -38,7 +38,7 @@ def vars_status( invalid_generators = [] from clan_cli.vars.generate import Generator - generators = Generator.generators_from_flake(machine.name, machine.flake) + generators = Generator.get_machine_generators(machine.name, machine.flake) if generator_name: for generator in generators: if generator_name == generator.name: diff --git a/pkgs/clan-cli/clan_cli/vars/fix.py b/pkgs/clan-cli/clan_cli/vars/fix.py index 38b9dbab8..63283e12f 100644 --- a/pkgs/clan-cli/clan_cli/vars/fix.py +++ b/pkgs/clan-cli/clan_cli/vars/fix.py @@ -12,7 +12,7 @@ log = logging.getLogger(__name__) def fix_vars(machine: Machine, generator_name: None | str = None) -> None: from clan_cli.vars.generate import Generator - generators = Generator.generators_from_flake(machine.name, machine.flake) + generators = Generator.get_machine_generators(machine.name, machine.flake) if generator_name: for generator in generators: if generator_name == generator.name: diff --git a/pkgs/clan-cli/clan_cli/vars/generate.py b/pkgs/clan-cli/clan_cli/vars/generate.py index 5bfd6708e..4617df09e 100644 --- a/pkgs/clan-cli/clan_cli/vars/generate.py +++ b/pkgs/clan-cli/clan_cli/vars/generate.py @@ -60,7 +60,7 @@ class Generator: return check_vars(self.machine, self._flake, generator_name=self.name) @classmethod - def generators_from_flake( + def get_machine_generators( cls: type["Generator"], machine_name: str, flake: "Flake", @@ -213,7 +213,7 @@ def decrypt_dependencies( secret_vars_store: StoreBase, public_vars_store: StoreBase, ) -> dict[str, dict[str, bytes]]: - generators = Generator.generators_from_flake(machine.name, machine.flake) + generators = Generator.get_machine_generators(machine.name, machine.flake) result: dict[str, dict[str, bytes]] = {} @@ -430,7 +430,7 @@ def get_closure( ) -> list[Generator]: from . import graph - vars_generators = Generator.generators_from_flake(machine.name, machine.flake) + vars_generators = Generator.get_machine_generators(machine.name, machine.flake) generators: dict[str, Generator] = { generator.name: generator for generator in vars_generators } @@ -473,7 +473,7 @@ def get_generators( list[Generator]: A list of generators for the machine. """ - return Generator.generators_from_flake( + return Generator.get_machine_generators( machine_name, Flake(str(base_dir)), include_previous_values, @@ -529,7 +529,7 @@ def run_generators( generators_set = set(generators) generators_ = [ g - for g in Generator.generators_from_flake(machine_name, machine.flake) + for g in Generator.get_machine_generators(machine_name, machine.flake) if g.name in generators_set ] @@ -550,7 +550,7 @@ def create_machine_vars_interactive( ) -> bool: _generator = None if generator_name: - generators = Generator.generators_from_flake(machine.name, machine.flake) + generators = Generator.get_machine_generators(machine.name, machine.flake) for generator in generators: if generator.name == generator_name: _generator = generator diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py index 01d242b6d..d32b8a225 100644 --- a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py +++ b/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py @@ -149,7 +149,7 @@ class SecretStore(StoreBase): from clan_cli.vars.generate import Generator manifest = [] - generators = Generator.generators_from_flake(machine, self.flake) + generators = Generator.get_machine_generators(machine, self.flake) for generator in generators: for file in generator.files: manifest.append(f"{generator.name}/{file.name}".encode()) @@ -180,7 +180,7 @@ class SecretStore(StoreBase): def populate_dir(self, machine: str, output_dir: Path, phases: list[str]) -> None: from clan_cli.vars.generate import Generator - vars_generators = Generator.generators_from_flake(machine, self.flake) + vars_generators = Generator.get_machine_generators(machine, self.flake) if "users" in phases: with tarfile.open( output_dir / "secrets_for_users.tar.gz", "w:gz" diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py index 5d25a5a87..8c7876e63 100644 --- a/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py +++ b/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py @@ -56,7 +56,7 @@ class SecretStore(StoreBase): # no need to generate keys if we don't manage secrets from clan_cli.vars.generate import Generator - vars_generators = Generator.generators_from_flake(machine, self.flake) + vars_generators = Generator.get_machine_generators(machine, self.flake) if not vars_generators: return has_secrets = False @@ -123,7 +123,7 @@ class SecretStore(StoreBase): if generator is None: from clan_cli.vars.generate import Generator - generators = Generator.generators_from_flake(machine, self.flake) + generators = Generator.get_machine_generators(machine, self.flake) else: generators = [generator] file_found = False @@ -202,7 +202,7 @@ class SecretStore(StoreBase): def populate_dir(self, machine: str, output_dir: Path, phases: list[str]) -> None: from clan_cli.vars.generate import Generator - vars_generators = Generator.generators_from_flake(machine, self.flake) + vars_generators = Generator.get_machine_generators(machine, self.flake) if "users" in phases or "services" in phases: key_name = f"{machine}-age.key" if not has_secret(sops_secrets_folder(self.flake.path) / key_name): @@ -322,7 +322,7 @@ class SecretStore(StoreBase): if generator is None: from clan_cli.vars.generate import Generator - generators = Generator.generators_from_flake(machine, self.flake) + generators = Generator.get_machine_generators(machine, self.flake) else: generators = [generator] file_found = False diff --git a/pkgs/clan-cli/clan_lib/flash/flash.py b/pkgs/clan-cli/clan_lib/flash/flash.py index 5dfd50da4..e73a8471a 100644 --- a/pkgs/clan-cli/clan_lib/flash/flash.py +++ b/pkgs/clan-cli/clan_lib/flash/flash.py @@ -108,7 +108,7 @@ def run_machine_flash( from clan_cli.vars.generate import Generator - for generator in Generator.generators_from_flake(machine.name, machine.flake): + for generator in Generator.get_machine_generators(machine.name, machine.flake): for file in generator.files: if file.needed_for == "partitioning": msg = f"Partitioning time secrets are not supported with `clan flash write`: clan.core.vars.generators.{generator.name}.files.{file.name}"