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

secret_store: drop update_check and generate_hash as abstract methods

Browse Source 
Only password implements those just now
This commit is contained in:
Jörg Thalheim
2024-02-20 13:11:38 +01:00
parent 77c84e7471
commit 4d404cfc50
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/clan-cli/clan_cli/secrets/modules/__init__.py
View File

@@ -23,13 +23,8 @@ class SecretStoreBase(ABC):
def exists(self, service: str, name: str) -> bool: def exists(self, service: str, name: str) -> bool:
pass pass
@abstractmethod
def generate_hash(self) -> bytes:
pass
@abstractmethod
def update_check(self) -> bool: def update_check(self) -> bool:
pass return False
@abstractmethod @abstractmethod
def upload(self, output_dir: Path) -> None: def upload(self, output_dir: Path) -> None:

2
pkgs/clan-cli/clan_cli/secrets/modules/password_store.py
View File

@@ -88,6 +88,8 @@ class SecretStore(SecretStoreBase):
hashes.sort() hashes.sort()
return b"\n".join(hashes) return b"\n".join(hashes)
# FIXME: add this when we switch to python3.12
# @override
def update_check(self) -> bool: def update_check(self) -> bool:
local_hash = self.generate_hash() local_hash = self.generate_hash()
remote_hash = self.machine.target_host.run( remote_hash = self.machine.target_host.run(

7
pkgs/clan-cli/clan_cli/secrets/modules/sops.py
View File

@@ -6,8 +6,10 @@ from clan_cli.secrets.machines import add_machine, has_machine
from clan_cli.secrets.secrets import decrypt_secret, encrypt_secret, has_secret from clan_cli.secrets.secrets import decrypt_secret, encrypt_secret, has_secret
from clan_cli.secrets.sops import generate_private_key from clan_cli.secrets.sops import generate_private_key
from . import SecretStoreBase
class SecretStore:
class SecretStore(SecretStoreBase):
def __init__(self, machine: Machine) -> None: def __init__(self, machine: Machine) -> None:
self.machine = machine self.machine = machine
@@ -52,9 +54,6 @@ class SecretStore:
f"{self.machine.name}-{name}", f"{self.machine.name}-{name}",
) )
def update_check(self) -> bool:
return False
def upload(self, output_dir: Path) -> None: def upload(self, output_dir: Path) -> None:
key_name = f"{self.machine.name}-age.key" key_name = f"{self.machine.name}-age.key"
if not has_secret(self.machine.flake_dir, key_name): if not has_secret(self.machine.flake_dir, key_name):

3
pkgs/clan-cli/clan_cli/secrets/modules/vm.py
View File

@@ -29,9 +29,6 @@ class SecretStore(SecretStoreBase):
def exists(self, service: str, name: str) -> bool: def exists(self, service: str, name: str) -> bool:
return (self.dir / service / name).exists() return (self.dir / service / name).exists()
def update_check(self) -> bool:
return False
def upload(self, output_dir: Path) -> None: def upload(self, output_dir: Path) -> None:
if os.path.exists(output_dir): if os.path.exists(output_dir):
shutil.rmtree(output_dir) shutil.rmtree(output_dir)