vars: improve check command and add tests

This commit is contained in:
DavHau
2024-09-01 16:43:33 +02:00
parent 015b61efe5
commit 64d29cd28c
3 changed files with 16 additions and 7 deletions

View File

@@ -8,7 +8,7 @@ from ..machines.machines import Machine
log = logging.getLogger(__name__)
def check_secrets(machine: Machine, generator_name: None | str = None) -> bool:
def check_vars(machine: Machine, generator_name: None | str = None) -> bool:
secret_vars_module = importlib.import_module(machine.secret_vars_module)
secret_vars_store = secret_vars_module.SecretStore(machine=machine)
public_vars_module = importlib.import_module(machine.public_vars_module)
@@ -47,7 +47,9 @@ def check_command(args: argparse.Namespace) -> None:
name=args.machine,
flake=args.flake,
)
check_secrets(machine, generator_name=args.service)
ok = check_vars(machine, generator_name=args.service)
if not ok:
raise SystemExit(1)
def register_check_parser(parser: argparse.ArgumentParser) -> None:

View File

@@ -21,7 +21,7 @@ from ..git import commit_files
from ..machines.inventory import get_all_machines, get_selected_machines
from ..machines.machines import Machine
from ..nix import nix_shell
from .check import check_secrets
from .check import check_vars
from .public_modules import FactStoreBase
from .secret_modules import SecretStoreBase
@@ -101,7 +101,7 @@ def execute_generator(
public_vars_store: FactStoreBase,
) -> bool:
# check if all secrets exist and generate them if at least one is missing
needs_regeneration = not check_secrets(machine, generator_name=generator_name)
needs_regeneration = not check_vars(machine, generator_name=generator_name)
log.debug(f"{generator_name} needs_regeneration: {needs_regeneration}")
if not (needs_regeneration or regenerate):
return False