api/generators: remove term 'vars' interact purely with 'generators'
This commit is contained in:
@@ -173,7 +173,7 @@ export const VarsStep = (props: VarsStepProps) => {
|
||||
toast.error("Error fetching data");
|
||||
return;
|
||||
}
|
||||
const result = await callApi("generate_vars_for_machine", {
|
||||
const result = await callApi("run_generators", {
|
||||
machine_name: props.machine_id,
|
||||
base_dir: props.dir,
|
||||
generators: generatorsQuery.data.map((generator) => generator.name),
|
||||
|
||||
@@ -10,9 +10,9 @@ from clan_cli.tests.helpers import cli
|
||||
from clan_cli.vars.check import check_vars
|
||||
from clan_cli.vars.generate import (
|
||||
Generator,
|
||||
create_machine_vars,
|
||||
run_generators,
|
||||
create_machine_vars_interactive,
|
||||
get_machine_generators,
|
||||
get_generators,
|
||||
)
|
||||
from clan_cli.vars.get import get_machine_var
|
||||
from clan_cli.vars.graph import all_missing_closure, requested_closure
|
||||
@@ -668,7 +668,7 @@ def test_api_set_prompts(
|
||||
|
||||
monkeypatch.chdir(flake.path)
|
||||
|
||||
create_machine_vars(
|
||||
run_generators(
|
||||
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"
|
||||
create_machine_vars(
|
||||
run_generators(
|
||||
machine_name="my_machine",
|
||||
base_dir=flake.path,
|
||||
generators=["my_generator"],
|
||||
@@ -694,7 +694,7 @@ def test_api_set_prompts(
|
||||
)
|
||||
assert store.get(Generator("my_generator"), "prompt1").decode() == "input2"
|
||||
|
||||
generators = get_machine_generators(
|
||||
generators = get_generators(
|
||||
machine_name="my_machine",
|
||||
base_dir=flake.path,
|
||||
full_closure=True,
|
||||
|
||||
@@ -423,7 +423,7 @@ def get_closure(
|
||||
|
||||
|
||||
@API.register
|
||||
def get_machine_generators(
|
||||
def get_generators(
|
||||
machine_name: str,
|
||||
base_dir: Path,
|
||||
full_closure: bool = False,
|
||||
@@ -461,7 +461,7 @@ def _generate_vars_for_machine(
|
||||
|
||||
|
||||
@API.register
|
||||
def create_machine_vars(
|
||||
def run_generators(
|
||||
machine_name: str,
|
||||
generators: list[str],
|
||||
all_prompt_values: dict[str, dict[str, str]],
|
||||
|
||||
@@ -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 create_machine_vars, get_machine_generators
|
||||
from clan_cli.vars.generate import run_generators, get_generators
|
||||
|
||||
from clan_lib.api.disk import hw_main_disk_options, set_machine_disk_schema
|
||||
from clan_lib.api.modules import list_modules
|
||||
@@ -222,7 +222,7 @@ def test_clan_create_api(
|
||||
# Invalidate cache because of new inventory
|
||||
clan_dir_flake.invalidate_cache()
|
||||
|
||||
generators = get_machine_generators(machine.name, machine.flake.path)
|
||||
generators = get_generators(machine.name, machine.flake.path)
|
||||
all_prompt_values = {}
|
||||
for generator in generators:
|
||||
prompt_values = {}
|
||||
@@ -235,7 +235,7 @@ def test_clan_create_api(
|
||||
raise ClanError(msg)
|
||||
all_prompt_values[generator.name] = prompt_values
|
||||
|
||||
create_machine_vars(
|
||||
run_generators(
|
||||
machine_name=machine.name,
|
||||
base_dir=machine.flake.path,
|
||||
generators=[gen.name for gen in generators],
|
||||
|
||||
Reference in New Issue
Block a user