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

Merge pull request 'vars: add VarStatus dataclass to make return type more readable' (#2446) from Mic92-main into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/2446
Reviewed-by: kenji <aks.kenji@protonmail.com>
This commit is contained in:
Mic92
2024-11-20 10:20:06 +00:00
parent 8609e90edc 5bf2afdf0e
commit 32e3b78e20
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/clan-cli/clan_cli/vars/check.py
View File

@@ -1,6 +1,7 @@
import argparse import argparse
import importlib import importlib
import logging import logging
from dataclasses import dataclass
from clan_cli.completions import add_dynamic_completer, complete_machines from clan_cli.completions import add_dynamic_completer, complete_machines
from clan_cli.machines.machines import Machine from clan_cli.machines.machines import Machine
@@ -8,11 +9,21 @@ from clan_cli.machines.machines import Machine
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def vars_status( @dataclass
machine: Machine, generator_name: None | str = None class Var:
) -> tuple[ generator: str
list[tuple[str, str]], list[tuple[str, str]], list[tuple[str, str]], list[str] name: str
]:
@dataclass
class VarStatus:
missing_secret_vars: list[Var]
missing_public_vars: list[Var]
unfixed_secret_vars: list[Var]
invalid_generators: list[str]
def vars_status(machine: Machine, generator_name: None | str = None) -> VarStatus:
secret_vars_module = importlib.import_module(machine.secret_vars_module) secret_vars_module = importlib.import_module(machine.secret_vars_module)
secret_vars_store = secret_vars_module.SecretStore(machine=machine) secret_vars_store = secret_vars_module.SecretStore(machine=machine)
public_vars_module = importlib.import_module(machine.public_vars_module) public_vars_module = importlib.import_module(machine.public_vars_module)
@@ -35,7 +46,7 @@ def vars_status(
log.info( log.info(
f"Secret var '{name}' for service '{generator_name}' in machine {machine.name} is missing." f"Secret var '{name}' for service '{generator_name}' in machine {machine.name} is missing."
) )
missing_secret_vars.append((generator_name, name)) missing_secret_vars.append(Var(generator_name, name))
else: else:
needs_fix, msg = secret_vars_store.needs_fix( needs_fix, msg = secret_vars_store.needs_fix(
generator_name, name, shared=shared generator_name, name, shared=shared
@@ -44,13 +55,13 @@ def vars_status(
log.info( log.info(
f"Secret var '{name}' for service '{generator_name}' in machine {machine.name} needs update: {msg}" f"Secret var '{name}' for service '{generator_name}' in machine {machine.name} needs update: {msg}"
) )
unfixed_secret_vars.append((generator_name, name)) unfixed_secret_vars.append(Var(generator_name, name))
elif not public_vars_store.exists(generator_name, name, shared=shared): elif not public_vars_store.exists(generator_name, name, shared=shared):
log.info( log.info(
f"Public var '{name}' for service '{generator_name}' in machine {machine.name} is missing." f"Public var '{name}' for service '{generator_name}' in machine {machine.name} is missing."
) )
missing_public_vars.append((generator_name, name)) missing_public_vars.append(Var(generator_name, name))
# check if invalidation hash is up to date # check if invalidation hash is up to date
if not ( if not (
secret_vars_store.hash_is_valid(generator_name) secret_vars_store.hash_is_valid(generator_name)
@@ -64,7 +75,7 @@ def vars_status(
log.debug(f"missing_public_vars: {missing_public_vars}") log.debug(f"missing_public_vars: {missing_public_vars}")
log.debug(f"unfixed_secret_vars: {unfixed_secret_vars}") log.debug(f"unfixed_secret_vars: {unfixed_secret_vars}")
log.debug(f"invalid_generators: {invalid_generators}") log.debug(f"invalid_generators: {invalid_generators}")
return ( return VarStatus(
missing_secret_vars, missing_secret_vars,
missing_public_vars, missing_public_vars,
unfixed_secret_vars, unfixed_secret_vars,
@@ -73,17 +84,12 @@ def vars_status(
def check_vars(machine: Machine, generator_name: None | str = None) -> bool: def check_vars(machine: Machine, generator_name: None | str = None) -> bool:
( status = vars_status(machine, generator_name=generator_name)
missing_secret_vars,
missing_public_vars,
unfixed_secret_vars,
invalid_generators,
) = vars_status(machine, generator_name=generator_name)
return not ( return not (
missing_secret_vars status.missing_secret_vars
or missing_public_vars or status.missing_public_vars
or unfixed_secret_vars or status.unfixed_secret_vars
or invalid_generators or status.invalid_generators
) )