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

Merge pull request 'clan-cli/secrets: refactor: rename secret -> secret_path' (#1796) from DavHau/clan-core:DavHau-vars into main

Browse Source
This commit is contained in:
clan-bot
2024-07-23 11:24:05 +00:00
parent 4f482ed8a6 cee0e74476
commit 5598350ac9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/clan-cli/clan_cli/secrets/secrets.py
View File

@@ -82,7 +82,7 @@ def collect_keys_for_path(path: Path) -> set[str]:
def encrypt_secret( def encrypt_secret(
flake_dir: Path, flake_dir: Path,
secret: Path, secret_path: Path,
value: IO[str] | str | bytes | None, value: IO[str] | str | bytes | None,
add_users: list[str] = [], add_users: list[str] = [],
add_machines: list[str] = [], add_machines: list[str] = [],
@@ -95,7 +95,7 @@ def encrypt_secret(
for user in add_users: for user in add_users:
files_to_commit.extend( files_to_commit.extend(
allow_member( allow_member(
users_folder(flake_dir, secret.name), users_folder(flake_dir, secret_path.name),
sops_users_folder(flake_dir), sops_users_folder(flake_dir),
user, user,
False, False,
@@ -105,7 +105,7 @@ def encrypt_secret(
for machine in add_machines: for machine in add_machines:
files_to_commit.extend( files_to_commit.extend(
allow_member( allow_member(
machines_folder(flake_dir, secret.name), machines_folder(flake_dir, secret_path.name),
sops_machines_folder(flake_dir), sops_machines_folder(flake_dir),
machine, machine,
False, False,
@@ -115,33 +115,33 @@ def encrypt_secret(
for group in add_groups: for group in add_groups:
files_to_commit.extend( files_to_commit.extend(
allow_member( allow_member(
groups_folder(flake_dir, secret.name), groups_folder(flake_dir, secret_path.name),
sops_groups_folder(flake_dir), sops_groups_folder(flake_dir),
group, group,
False, False,
) )
) )
keys = collect_keys_for_path(secret) keys = collect_keys_for_path(secret_path)
if key.pubkey not in keys: if key.pubkey not in keys:
keys.add(key.pubkey) keys.add(key.pubkey)
files_to_commit.extend( files_to_commit.extend(
allow_member( allow_member(
users_folder(flake_dir, secret.name), users_folder(flake_dir, secret_path.name),
sops_users_folder(flake_dir), sops_users_folder(flake_dir),
key.username, key.username,
False, False,
) )
) )
secret_path = secret / "secret" secret_path = secret_path / "secret"
encrypt_file(secret_path, value, list(sorted(keys))) encrypt_file(secret_path, value, list(sorted(keys)))
files_to_commit.append(secret_path) files_to_commit.append(secret_path)
commit_files( commit_files(
files_to_commit, files_to_commit,
flake_dir, flake_dir,
f"Update secret {secret.name}", f"Update secret {secret_path.name}",
) )