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

Vars: rename public functions into 'create_machine_vars'

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-07-06 20:04:02 +02:00
parent 3af529d76e
commit 7370212ec2
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/clan-cli/clan_cli/tests/test_vars.py
View File

@@ -10,8 +10,8 @@ from clan_cli.tests.helpers import cli
from clan_cli.vars.check import check_vars from clan_cli.vars.check import check_vars
from clan_cli.vars.generate import ( from clan_cli.vars.generate import (
Generator, Generator,
generate_vars_for_machine, create_machine_vars,
generate_vars_for_machine_interactive, create_machine_vars_interactive,
get_generators_closure, get_generators_closure,
) )
from clan_cli.vars.get import get_var from clan_cli.vars.get import get_var
@@ -668,7 +668,7 @@ def test_api_set_prompts(
monkeypatch.chdir(flake.path) monkeypatch.chdir(flake.path)
generate_vars_for_machine( create_machine_vars(
machine_name="my_machine", machine_name="my_machine",
base_dir=flake.path, base_dir=flake.path,
generators=["my_generator"], generators=["my_generator"],
@@ -682,7 +682,7 @@ def test_api_set_prompts(
store = in_repo.FactStore(machine) store = in_repo.FactStore(machine)
assert store.exists(Generator("my_generator"), "prompt1") assert store.exists(Generator("my_generator"), "prompt1")
assert store.get(Generator("my_generator"), "prompt1").decode() == "input1" assert store.get(Generator("my_generator"), "prompt1").decode() == "input1"
generate_vars_for_machine( create_machine_vars(
machine_name="my_machine", machine_name="my_machine",
base_dir=flake.path, base_dir=flake.path,
generators=["my_generator"], generators=["my_generator"],
@@ -727,11 +727,11 @@ def test_stdout_of_generate(
flake_.refresh() flake_.refresh()
monkeypatch.chdir(flake_.path) monkeypatch.chdir(flake_.path)
flake = Flake(str(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 capture_output as output:
with caplog.at_level(logging.INFO): with caplog.at_level(logging.INFO):
generate_vars_for_machine_interactive( create_machine_vars_interactive(
Machine(name="my_machine", flake=flake), Machine(name="my_machine", flake=flake),
"my_generator", "my_generator",
regenerate=False, regenerate=False,
@@ -744,7 +744,7 @@ def test_stdout_of_generate(
set_var("my_machine", "my_generator/my_value", b"world", flake) set_var("my_machine", "my_generator/my_value", b"world", flake)
with caplog.at_level(logging.INFO): with caplog.at_level(logging.INFO):
generate_vars_for_machine_interactive( create_machine_vars_interactive(
Machine(name="my_machine", flake=flake), Machine(name="my_machine", flake=flake),
"my_generator", "my_generator",
regenerate=True, regenerate=True,
@@ -755,7 +755,7 @@ def test_stdout_of_generate(
caplog.clear() caplog.clear()
# check the output when nothing gets regenerated # check the output when nothing gets regenerated
with caplog.at_level(logging.INFO): with caplog.at_level(logging.INFO):
generate_vars_for_machine_interactive( create_machine_vars_interactive(
Machine(name="my_machine", flake=flake), Machine(name="my_machine", flake=flake),
"my_generator", "my_generator",
regenerate=True, regenerate=True,
@@ -764,7 +764,7 @@ def test_stdout_of_generate(
assert "hello" in caplog.text assert "hello" in caplog.text
caplog.clear() caplog.clear()
with caplog.at_level(logging.INFO): with caplog.at_level(logging.INFO):
generate_vars_for_machine_interactive( create_machine_vars_interactive(
Machine(name="my_machine", flake=flake), Machine(name="my_machine", flake=flake),
"my_secret_generator", "my_secret_generator",
regenerate=False, regenerate=False,
@@ -779,7 +779,7 @@ def test_stdout_of_generate(
Flake(str(flake.path)), Flake(str(flake.path)),
) )
with caplog.at_level(logging.INFO): with caplog.at_level(logging.INFO):
generate_vars_for_machine_interactive( create_machine_vars_interactive(
Machine(name="my_machine", flake=flake), Machine(name="my_machine", flake=flake),
"my_secret_generator", "my_secret_generator",
regenerate=True, regenerate=True,
@@ -869,7 +869,7 @@ def test_fails_when_files_are_left_from_other_backend(
flake.refresh() flake.refresh()
monkeypatch.chdir(flake.path) monkeypatch.chdir(flake.path)
for generator in ["my_secret_generator", "my_value_generator"]: 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))), Machine(name="my_machine", flake=Flake(str(flake.path))),
generator, generator,
regenerate=False, regenerate=False,
@@ -886,13 +886,13 @@ def test_fails_when_files_are_left_from_other_backend(
# This should raise an error # This should raise an error
if generator == "my_secret_generator": if generator == "my_secret_generator":
with pytest.raises(ClanError): with pytest.raises(ClanError):
generate_vars_for_machine_interactive( create_machine_vars_interactive(
Machine(name="my_machine", flake=Flake(str(flake.path))), Machine(name="my_machine", flake=Flake(str(flake.path))),
generator, generator,
regenerate=False, regenerate=False,
) )
else: else:
generate_vars_for_machine_interactive( create_machine_vars_interactive(
Machine(name="my_machine", flake=Flake(str(flake.path))), Machine(name="my_machine", flake=Flake(str(flake.path))),
generator, generator,
regenerate=False, regenerate=False,

14
pkgs/clan-cli/clan_cli/vars/generate.py
View File

@@ -89,9 +89,11 @@ class Generator:
deploy=file_data["deploy"], deploy=file_data["deploy"],
owner=file_data["owner"], owner=file_data["owner"],
group=file_data["group"], group=file_data["group"],
mode=file_data["mode"] mode=(
if isinstance(file_data["mode"], int) file_data["mode"]
else int(file_data["mode"], 8), if isinstance(file_data["mode"], int)
else int(file_data["mode"], 8)
),
needed_for=file_data["neededFor"], needed_for=file_data["neededFor"],
) )
files.append(var) files.append(var)
@@ -459,7 +461,7 @@ def _generate_vars_for_machine(
@API.register @API.register
def generate_vars_for_machine( def create_machine_vars(
machine_name: str, machine_name: str,
generators: list[str], generators: list[str],
all_prompt_values: dict[str, dict[str, 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", machine: "Machine",
generator_name: str | None, generator_name: str | None,
regenerate: bool, regenerate: bool,
@@ -538,7 +540,7 @@ def generate_vars(
for machine in machines: for machine in machines:
errors = [] errors = []
try: try:
was_regenerated |= generate_vars_for_machine_interactive( was_regenerated |= create_machine_vars_interactive(
machine, machine,
generator_name, generator_name,
regenerate, regenerate,

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

@@ -14,7 +14,7 @@ from clan_cli.machines.create import create_machine
from clan_cli.secrets.key import generate_key from clan_cli.secrets.key import generate_key
from clan_cli.secrets.sops import maybe_get_admin_public_keys 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 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.disk import hw_main_disk_options, set_machine_disk_schema
from clan_lib.api.modules import list_modules from clan_lib.api.modules import list_modules
@@ -234,7 +234,7 @@ def test_clan_create_api(
raise ClanError(msg) raise ClanError(msg)
all_prompt_values[generator.name] = prompt_values all_prompt_values[generator.name] = prompt_values
generate_vars_for_machine( create_machine_vars(
machine_name=machine.name, machine_name=machine.name,
base_dir=machine.flake.path, base_dir=machine.flake.path,
generators=[gen.name for gen in generators], generators=[gen.name for gen in generators],