From bcdde990ff78a0ac9af7acc4d2ed552213f7dcda Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 2 Feb 2024 17:28:33 +0100 Subject: [PATCH] clan-cli secrets: add check command --- pkgs/clan-cli/clan_cli/secrets/__init__.py | 4 +++ pkgs/clan-cli/clan_cli/secrets/check.py | 42 ++++++++++++++++++++++ pkgs/clan-cli/clan_cli/secrets/generate.py | 9 ++--- 3 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 pkgs/clan-cli/clan_cli/secrets/check.py diff --git a/pkgs/clan-cli/clan_cli/secrets/__init__.py b/pkgs/clan-cli/clan_cli/secrets/__init__.py index 01ac958d..54be7b9c 100644 --- a/pkgs/clan-cli/clan_cli/secrets/__init__.py +++ b/pkgs/clan-cli/clan_cli/secrets/__init__.py @@ -1,6 +1,7 @@ # !/usr/bin/env python3 import argparse +from .check import register_check_parser from .generate import register_generate_parser from .groups import register_groups_parser from .import_sops import register_import_sops_parser @@ -32,6 +33,9 @@ def register_parser(parser: argparse.ArgumentParser) -> None: import_sops_parser = subparser.add_parser("import-sops", help="import a sops file") register_import_sops_parser(import_sops_parser) + check_parser = subparser.add_parser("check", help="check if secrets are up to date") + register_check_parser(check_parser) + parser_generate = subparser.add_parser( "generate", help="generate secrets for machines if they don't exist yet" ) diff --git a/pkgs/clan-cli/clan_cli/secrets/check.py b/pkgs/clan-cli/clan_cli/secrets/check.py new file mode 100644 index 00000000..facf13c6 --- /dev/null +++ b/pkgs/clan-cli/clan_cli/secrets/check.py @@ -0,0 +1,42 @@ +import argparse +import importlib +import logging + +from ..machines.machines import Machine + +log = logging.getLogger(__name__) + + +def check_secrets(machine: Machine) -> bool: + secrets_module = importlib.import_module(machine.secrets_module) + secret_store = secrets_module.SecretStore(machine=machine) + + missing_secrets = [] + missing_facts = [] + for service in machine.secrets_data: + for secret in machine.secrets_data[service]["secrets"]: + if not secret_store.exists(service, secret): + log.info(f"Secret {secret} for service {service} is missing") + missing_secrets.append((service, secret)) + + for fact in machine.secrets_data[service]["facts"].values(): + if not (machine.flake / fact).exists(): + log.info(f"Fact {fact} for service {service} is missing") + missing_facts.append((service, fact)) + + if missing_secrets or missing_facts: + return False + return True + + +def check_command(args: argparse.Namespace) -> None: + machine = Machine(name=args.machine, flake=args.flake) + check_secrets(machine) + + +def register_check_parser(parser: argparse.ArgumentParser) -> None: + parser.add_argument( + "machine", + help="The machine to check secrets for", + ) + parser.set_defaults(func=check_command) diff --git a/pkgs/clan-cli/clan_cli/secrets/generate.py b/pkgs/clan-cli/clan_cli/secrets/generate.py index f9e07dcb..ead23e84 100644 --- a/pkgs/clan-cli/clan_cli/secrets/generate.py +++ b/pkgs/clan-cli/clan_cli/secrets/generate.py @@ -11,6 +11,7 @@ from clan_cli.cmd import run from ..errors import ClanError from ..machines.machines import Machine from ..nix import nix_shell +from .check import check_secrets log = logging.getLogger(__name__) @@ -24,13 +25,7 @@ def generate_secrets(machine: Machine) -> None: print(service) tmpdir = Path(d) / service # check if all secrets exist and generate them if at least one is missing - needs_regeneration = any( - not secret_store.exists(service, secret) - for secret in machine.secrets_data[service]["secrets"] - ) or any( - not (machine.flake / fact).exists() - for fact in machine.secrets_data[service]["facts"].values() - ) + needs_regeneration = not check_secrets(machine) for fact in machine.secrets_data[service]["facts"].values(): if not (machine.flake / fact).exists(): print(f"fact {fact} is missing")