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

vars generate: show prompts only if not migrating

Browse Source
This commit is contained in:
lassulus
2024-12-03 22:25:16 +01:00
parent 70c4da9011
commit 2916798e84
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,15 +233,12 @@ def execute_generator(
def _ask_prompts( def _ask_prompts(
generators: list[Generator], generator: Generator,
) -> dict[str, dict[str, str]]: ) -> dict[str, str]:
prompt_values: dict[str, dict[str, str]] = {} prompt_values: dict[str, str] = {}
for generator in generators:
for prompt in generator.prompts: for prompt in generator.prompts:
if generator.name not in prompt_values:
prompt_values[generator.name] = {}
var_id = f"{generator.name}/{prompt.name}" var_id = f"{generator.name}/{prompt.name}"
prompt_values[generator.name][prompt.name] = ask(var_id, prompt.prompt_type) prompt_values[prompt.name] = ask(var_id, prompt.prompt_type)
return prompt_values return prompt_values
@@ -422,17 +419,16 @@ def generate_vars_for_machine(
closure = get_closure(machine, generator_name, regenerate) closure = get_closure(machine, generator_name, regenerate)
if len(closure) == 0: if len(closure) == 0:
return False return False
prompt_values = _ask_prompts(closure)
for generator in closure: for generator in closure:
if _check_can_migrate(machine, generator): if _check_can_migrate(machine, generator):
_migrate_files(machine, generator) _migrate_files(machine, generator)
else: else:
execute_generator( execute_generator(
machine, machine=machine,
generator, generator=generator,
machine.secret_vars_store, secret_vars_store=machine.secret_vars_store,
machine.public_vars_store, public_vars_store=machine.public_vars_store,
prompt_values.get(generator.name, {}), prompt_values=_ask_prompts(generator),
) )
# flush caches to make sure the new secrets are available in evaluation # flush caches to make sure the new secrets are available in evaluation
machine.flush_caches() machine.flush_caches()