use machine.{secrets,public}_{vars,fact}_store everywhere

pkgs/clan-cli/clan_cli/facts/check.py

@@ -1,5 +1,4 @@
 import argparse
-import importlib
 import logging
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
@@ -9,11 +8,6 @@ log = logging.getLogger(__name__)
 
 
 def check_secrets(machine: Machine, service: None | str = None) -> bool:
-    secret_facts_module = importlib.import_module(machine.secret_facts_module)
-    secret_facts_store = secret_facts_module.SecretStore(machine=machine)
-    public_facts_module = importlib.import_module(machine.public_facts_module)
-    public_facts_store = public_facts_module.FactStore(machine=machine)
-
     missing_secret_facts = []
     missing_public_facts = []
     services = [service] if service else list(machine.facts_data.keys())
@@ -23,14 +17,14 @@ def check_secrets(machine: Machine, service: None | str = None) -> bool:
                 secret_name = secret_fact
             else:
                 secret_name = secret_fact["name"]
-            if not secret_facts_store.exists(service, secret_name):
+            if not machine.secret_facts_store.exists(service, secret_name):
                 machine.info(
                     f"Secret fact '{secret_fact}' for service '{service}' is missing."
                 )
                 missing_secret_facts.append((service, secret_name))
 
         for public_fact in machine.facts_data[service]["public"]:
-            if not public_facts_store.exists(service, public_fact):
+            if not machine.public_facts_store.exists(service, public_fact):
                 machine.info(
                     f"Public fact '{public_fact}' for service '{service}' is missing."
                 )

pkgs/clan-cli/clan_cli/facts/generate.py

@@ -1,5 +1,4 @@
 import argparse
-import importlib
 import logging
 import os
 import sys
@@ -161,11 +160,6 @@ def _generate_facts_for_machine(
 ) -> bool:
     local_temp = tmpdir / machine.name
     local_temp.mkdir()
-    secret_facts_module = importlib.import_module(machine.secret_facts_module)
-    secret_facts_store = secret_facts_module.SecretStore(machine=machine)
-
-    public_facts_module = importlib.import_module(machine.public_facts_module)
-    public_facts_store = public_facts_module.FactStore(machine=machine)
 
     machine_updated = False
 
@@ -184,8 +178,8 @@ def _generate_facts_for_machine(
             machine=machine,
             service=service,
             regenerate=regenerate,
-            secret_facts_store=secret_facts_store,
-            public_facts_store=public_facts_store,
+            secret_facts_store=machine.secret_facts_store,
+            public_facts_store=machine.public_facts_store,
             tmpdir=local_temp,
             prompt=prompt,
         )

pkgs/clan-cli/clan_cli/facts/list.py

@@ -1,8 +1,6 @@
 import argparse
-import importlib
 import json
 import logging
-from typing import Any
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
 from clan_cli.machines.machines import Machine
@@ -10,24 +8,11 @@ from clan_cli.machines.machines import Machine
 log = logging.getLogger(__name__)
 
 
-# TODO get also secret facts
-def get_all_facts(machine: Machine) -> dict:
-    public_facts_store = get_public_facts_store(machine)
-
-    return public_facts_store.get_all()
-
-
-def get_public_facts_store(machine: Machine) -> Any:
-    public_facts_module = importlib.import_module(machine.public_facts_module)
-    public_facts_store = public_facts_module.FactStore(machine=machine)
-    return public_facts_store
-
-
 def get_command(args: argparse.Namespace) -> None:
     machine = Machine(name=args.machine, flake=args.flake)
 
     # the raw_facts are bytestrings making them not json serializable
-    raw_facts = get_all_facts(machine)
+    raw_facts = machine.public_facts_store.get_all()
     facts = {}
     for key in raw_facts["TODO"]:
         facts[key] = raw_facts["TODO"][key].decode("utf8")

pkgs/clan-cli/clan_cli/facts/upload.py

@@ -1,5 +1,4 @@
 import argparse
-import importlib
 import logging
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -12,16 +11,13 @@ log = logging.getLogger(__name__)
 
 
 def upload_secrets(machine: Machine) -> None:
-    secret_facts_module = importlib.import_module(machine.secret_facts_module)
-    secret_facts_store = secret_facts_module.SecretStore(machine=machine)
-
-    if not secret_facts_store.needs_upload():
+    if not machine.secret_facts_store.needs_upload():
         machine.info("Secrets already uploaded")
         return
 
     with TemporaryDirectory(prefix="facts-upload-") as _tempdir:
         local_secret_dir = Path(_tempdir).resolve()
-        secret_facts_store.upload(local_secret_dir)
+        machine.secret_facts_store.upload(local_secret_dir)
         remote_secret_dir = Path(machine.secrets_upload_directory)
 
         upload(machine.target_host, local_secret_dir, remote_secret_dir)