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

Merge pull request 'vars: cleanup + fix wording' (#5442) from dave into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5442
This commit is contained in:
DavHau
2025-10-09 05:44:14 +00:00
parent 4a6d46198c 744f35e0cc
commit 061b598adf
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,7 +432,6 @@ def test_generated_shared_secret_sops(
assert check_vars(machine1.name, machine1.flake)
cli.run(["vars", "generate", "--flake", str(flake.path), "machine2"])
assert check_vars(machine2.name, machine2.flake)
assert check_vars(machine2.name, machine2.flake)
m1_sops_store = sops.SecretStore(machine1.flake)
m2_sops_store = sops.SecretStore(machine2.flake)
# Create generators with machine context for testing

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

@@ -93,21 +93,21 @@ def _ensure_healthy(
if generators is None:
generators = Generator.get_machine_generators([machine.name], machine.flake)
pub_healtcheck_msg = machine.public_vars_store.health_check(
public_health_check_msg = machine.public_vars_store.health_check(
machine.name,
generators,
)
sec_healtcheck_msg = machine.secret_vars_store.health_check(
secret_health_check_msg = machine.secret_vars_store.health_check(
machine.name,
generators,
)
if pub_healtcheck_msg or sec_healtcheck_msg:
if public_health_check_msg or secret_health_check_msg:
msg = f"Health check failed for machine {machine.name}:\n"
if pub_healtcheck_msg:
msg += f"Public vars store: {pub_healtcheck_msg}\n"
if sec_healtcheck_msg:
msg += f"Secret vars store: {sec_healtcheck_msg}"
if public_health_check_msg:
msg += f"Public vars store: {public_health_check_msg}\n"
if secret_health_check_msg:
msg += f"Secret vars store: {secret_health_check_msg}"
raise ClanError(msg)