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

Merge pull request 'generate_test_vars: fix it' (#4289) from generate_test_vars-fix-it into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4289
This commit is contained in:
Mic92
2025-07-09 11:49:06 +00:00
parent 4cb4a1b81c 8ed2adbc5b
commit 6ced2eac05
2 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,19 +62,18 @@ class Generator:
def generators_from_flake(
cls: type["Generator"], machine_name: str, flake: "Flake"
) -> list["Generator"]:
config = nix_config()
system = config["system"]
# Get all generator metadata in one select (safe fields only)
generators_data = flake.select(
f'clanInternals.machines."{system}"."{machine_name}".config.clan.core.vars.generators.*.{{share,dependencies,migrateFact,prompts}}'
generators_data = flake.select_machine(
machine_name,
"config.clan.core.vars.generators.*.{share,dependencies,migrateFact,prompts}",
)
if not generators_data:
return []
# Get all file metadata in one select
files_data = flake.select(
f'clanInternals.machines."{system}"."{machine_name}".config.clan.core.vars.generators.*.files.*.{{secret,deploy,owner,group,mode,neededFor}}'
files_data = flake.select_machine(
machine_name,
"config.clan.core.vars.generators.*.files.*.{secret,deploy,owner,group,mode,neededFor}",
)
generators = []