secret cli: accept a pattern in secrets list
This commit is contained in:
@@ -3,6 +3,7 @@ import getpass
|
|||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import sys
|
import sys
|
||||||
|
from dataclasses import dataclass
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import IO
|
from typing import IO
|
||||||
|
|
||||||
@@ -210,17 +211,31 @@ def has_secret(flake_dir: Path, secret: str) -> bool:
|
|||||||
return (sops_secrets_folder(flake_dir) / secret / "secret").exists()
|
return (sops_secrets_folder(flake_dir) / secret / "secret").exists()
|
||||||
|
|
||||||
|
|
||||||
def list_secrets(flake_dir: Path) -> list[str]:
|
def list_secrets(flake_dir: Path, pattern: str | None = None) -> list[str]:
|
||||||
path = sops_secrets_folder(flake_dir)
|
path = sops_secrets_folder(flake_dir)
|
||||||
|
|
||||||
def validate(name: str) -> bool:
|
def validate(name: str) -> bool:
|
||||||
return VALID_SECRET_NAME.match(name) is not None and has_secret(flake_dir, name)
|
return (
|
||||||
|
VALID_SECRET_NAME.match(name) is not None
|
||||||
|
and has_secret(flake_dir, name)
|
||||||
|
and (pattern is None or pattern in name)
|
||||||
|
)
|
||||||
|
|
||||||
return list_objects(path, validate)
|
return list_objects(path, validate)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class ListSecretsOptions:
|
||||||
|
flake: Path
|
||||||
|
pattern: str | None
|
||||||
|
|
||||||
|
|
||||||
def list_command(args: argparse.Namespace) -> None:
|
def list_command(args: argparse.Namespace) -> None:
|
||||||
lst = list_secrets(Path(args.flake))
|
options = ListSecretsOptions(
|
||||||
|
flake=args.flake,
|
||||||
|
pattern=args.pattern,
|
||||||
|
)
|
||||||
|
lst = list_secrets(options.flake, options.pattern)
|
||||||
if len(lst) > 0:
|
if len(lst) > 0:
|
||||||
print("\n".join(lst))
|
print("\n".join(lst))
|
||||||
|
|
||||||
@@ -268,6 +283,11 @@ def rename_command(args: argparse.Namespace) -> None:
|
|||||||
|
|
||||||
def register_secrets_parser(subparser: argparse._SubParsersAction) -> None:
|
def register_secrets_parser(subparser: argparse._SubParsersAction) -> None:
|
||||||
parser_list = subparser.add_parser("list", help="list secrets")
|
parser_list = subparser.add_parser("list", help="list secrets")
|
||||||
|
parser_list.add_argument(
|
||||||
|
"pattern",
|
||||||
|
nargs="?",
|
||||||
|
help="a pattern to filter the secrets. All secrets containing the pattern will be listed.",
|
||||||
|
)
|
||||||
parser_list.set_defaults(func=list_command)
|
parser_list.set_defaults(func=list_command)
|
||||||
|
|
||||||
parser_get = subparser.add_parser("get", help="get a secret")
|
parser_get = subparser.add_parser("get", help="get a secret")
|
||||||
|
|||||||
@@ -275,6 +275,14 @@ def test_secrets(
|
|||||||
cli.run(["--flake", str(test_flake.path), "secrets", "list"])
|
cli.run(["--flake", str(test_flake.path), "secrets", "list"])
|
||||||
assert capsys.readouterr().out == "key\n"
|
assert capsys.readouterr().out == "key\n"
|
||||||
|
|
||||||
|
capsys.readouterr() # empty the buffer
|
||||||
|
cli.run(["--flake", str(test_flake.path), "secrets", "list", "nonexisting"])
|
||||||
|
assert capsys.readouterr().out == ""
|
||||||
|
|
||||||
|
capsys.readouterr() # empty the buffer
|
||||||
|
cli.run(["--flake", str(test_flake.path), "secrets", "list", "key"])
|
||||||
|
assert capsys.readouterr().out == "key\n"
|
||||||
|
|
||||||
cli.run(
|
cli.run(
|
||||||
[
|
[
|
||||||
"--flake",
|
"--flake",
|
||||||
|
|||||||
Reference in New Issue
Block a user