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

sops: refactor some function names for clarity

Browse Source
This commit is contained in:
DavHau
2024-10-02 13:56:43 +02:00
parent 3e0d1d21f5
commit 4a0207f0b3
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ def ensure_user_or_machine(flake_dir: Path, pub_key: str) -> SopsKey:
return key
def default_sops_key_path() -> Path:
def default_admin_key_path() -> Path:
raw_path = os.environ.get("SOPS_AGE_KEY_FILE")
if raw_path:
return Path(raw_path)
@@ -111,11 +111,11 @@ def default_sops_key_path() -> Path:
@API.register
def maybe_get_public_key() -> str | None:
def maybe_get_admin_public_key() -> str | None:
key = os.environ.get("SOPS_AGE_KEY")
if key:
return get_public_key(key)
path = default_sops_key_path()
path = default_admin_key_path()
if path.exists():
return get_public_key(path.read_text())
@@ -123,14 +123,14 @@ def maybe_get_public_key() -> str | None:
def maybe_get_sops_key(flake_dir: Path) -> SopsKey | None:
pub_key = maybe_get_public_key()
pub_key = maybe_get_admin_public_key()
if pub_key:
return maybe_get_user_or_machine(flake_dir, pub_key)
return None
def ensure_sops_key(flake_dir: Path) -> SopsKey:
pub_key = maybe_get_public_key()
def ensure_admin_key(flake_dir: Path) -> SopsKey:
pub_key = maybe_get_admin_public_key()
if not pub_key:
msg = "No sops key found. Please generate one with 'clan secrets key generate'."
raise ClanError(msg)