From 7370212ec20cc4d5a6770fbd092f8452901a2f12 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 6 Jul 2025 20:04:02 +0200 Subject: [PATCH] Vars: rename public functions into 'create_machine_vars' --- pkgs/clan-cli/clan_cli/tests/test_vars.py | 26 ++++++++++----------- pkgs/clan-cli/clan_cli/vars/generate.py | 14 ++++++----- pkgs/clan-cli/clan_lib/tests/test_create.py | 4 ++-- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/tests/test_vars.py b/pkgs/clan-cli/clan_cli/tests/test_vars.py index fa084f6f1..08d4f095d 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_vars.py +++ b/pkgs/clan-cli/clan_cli/tests/test_vars.py @@ -10,8 +10,8 @@ from clan_cli.tests.helpers import cli from clan_cli.vars.check import check_vars from clan_cli.vars.generate import ( Generator, - generate_vars_for_machine, - generate_vars_for_machine_interactive, + create_machine_vars, + create_machine_vars_interactive, get_generators_closure, ) from clan_cli.vars.get import get_var @@ -668,7 +668,7 @@ def test_api_set_prompts( monkeypatch.chdir(flake.path) - generate_vars_for_machine( + create_machine_vars( machine_name="my_machine", base_dir=flake.path, generators=["my_generator"], @@ -682,7 +682,7 @@ def test_api_set_prompts( store = in_repo.FactStore(machine) assert store.exists(Generator("my_generator"), "prompt1") assert store.get(Generator("my_generator"), "prompt1").decode() == "input1" - generate_vars_for_machine( + create_machine_vars( machine_name="my_machine", base_dir=flake.path, generators=["my_generator"], @@ -727,11 +727,11 @@ def test_stdout_of_generate( flake_.refresh() monkeypatch.chdir(flake_.path) flake = Flake(str(flake_.path)) - from clan_cli.vars.generate import generate_vars_for_machine_interactive + from clan_cli.vars.generate import create_machine_vars_interactive # with capture_output as output: with caplog.at_level(logging.INFO): - generate_vars_for_machine_interactive( + create_machine_vars_interactive( Machine(name="my_machine", flake=flake), "my_generator", regenerate=False, @@ -744,7 +744,7 @@ def test_stdout_of_generate( set_var("my_machine", "my_generator/my_value", b"world", flake) with caplog.at_level(logging.INFO): - generate_vars_for_machine_interactive( + create_machine_vars_interactive( Machine(name="my_machine", flake=flake), "my_generator", regenerate=True, @@ -755,7 +755,7 @@ def test_stdout_of_generate( caplog.clear() # check the output when nothing gets regenerated with caplog.at_level(logging.INFO): - generate_vars_for_machine_interactive( + create_machine_vars_interactive( Machine(name="my_machine", flake=flake), "my_generator", regenerate=True, @@ -764,7 +764,7 @@ def test_stdout_of_generate( assert "hello" in caplog.text caplog.clear() with caplog.at_level(logging.INFO): - generate_vars_for_machine_interactive( + create_machine_vars_interactive( Machine(name="my_machine", flake=flake), "my_secret_generator", regenerate=False, @@ -779,7 +779,7 @@ def test_stdout_of_generate( Flake(str(flake.path)), ) with caplog.at_level(logging.INFO): - generate_vars_for_machine_interactive( + create_machine_vars_interactive( Machine(name="my_machine", flake=flake), "my_secret_generator", regenerate=True, @@ -869,7 +869,7 @@ def test_fails_when_files_are_left_from_other_backend( flake.refresh() monkeypatch.chdir(flake.path) for generator in ["my_secret_generator", "my_value_generator"]: - generate_vars_for_machine_interactive( + create_machine_vars_interactive( Machine(name="my_machine", flake=Flake(str(flake.path))), generator, regenerate=False, @@ -886,13 +886,13 @@ def test_fails_when_files_are_left_from_other_backend( # This should raise an error if generator == "my_secret_generator": with pytest.raises(ClanError): - generate_vars_for_machine_interactive( + create_machine_vars_interactive( Machine(name="my_machine", flake=Flake(str(flake.path))), generator, regenerate=False, ) else: - generate_vars_for_machine_interactive( + create_machine_vars_interactive( Machine(name="my_machine", flake=Flake(str(flake.path))), generator, regenerate=False, diff --git a/pkgs/clan-cli/clan_cli/vars/generate.py b/pkgs/clan-cli/clan_cli/vars/generate.py index 2d1ef9c08..b70f18223 100644 --- a/pkgs/clan-cli/clan_cli/vars/generate.py +++ b/pkgs/clan-cli/clan_cli/vars/generate.py @@ -89,9 +89,11 @@ class Generator: deploy=file_data["deploy"], owner=file_data["owner"], group=file_data["group"], - mode=file_data["mode"] - if isinstance(file_data["mode"], int) - else int(file_data["mode"], 8), + mode=( + file_data["mode"] + if isinstance(file_data["mode"], int) + else int(file_data["mode"], 8) + ), needed_for=file_data["neededFor"], ) files.append(var) @@ -459,7 +461,7 @@ def _generate_vars_for_machine( @API.register -def generate_vars_for_machine( +def create_machine_vars( machine_name: str, generators: list[str], all_prompt_values: dict[str, dict[str, str]], @@ -484,7 +486,7 @@ def generate_vars_for_machine( ) -def generate_vars_for_machine_interactive( +def create_machine_vars_interactive( machine: "Machine", generator_name: str | None, regenerate: bool, @@ -538,7 +540,7 @@ def generate_vars( for machine in machines: errors = [] try: - was_regenerated |= generate_vars_for_machine_interactive( + was_regenerated |= create_machine_vars_interactive( machine, generator_name, regenerate, diff --git a/pkgs/clan-cli/clan_lib/tests/test_create.py b/pkgs/clan-cli/clan_lib/tests/test_create.py index ed43e442f..4f56a3192 100644 --- a/pkgs/clan-cli/clan_lib/tests/test_create.py +++ b/pkgs/clan-cli/clan_lib/tests/test_create.py @@ -14,7 +14,7 @@ from clan_cli.machines.create import create_machine from clan_cli.secrets.key import generate_key from clan_cli.secrets.sops import maybe_get_admin_public_keys from clan_cli.secrets.users import add_user -from clan_cli.vars.generate import generate_vars_for_machine, get_generators_closure +from clan_cli.vars.generate import create_machine_vars, get_generators_closure from clan_lib.api.disk import hw_main_disk_options, set_machine_disk_schema from clan_lib.api.modules import list_modules @@ -234,7 +234,7 @@ def test_clan_create_api( raise ClanError(msg) all_prompt_values[generator.name] = prompt_values - generate_vars_for_machine( + create_machine_vars( machine_name=machine.name, base_dir=machine.flake.path, generators=[gen.name for gen in generators],