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

Working test_secrets_generate

Browse Source
This commit is contained in:
Qubasa
2024-01-11 21:48:39 +01:00
parent 038aa769aa
commit 6647c38417
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checks/impure/flake-module.nix
View File

@@ -12,7 +12,7 @@
]}" ]}"
ROOT=$(git rev-parse --show-toplevel) ROOT=$(git rev-parse --show-toplevel)
cd "$ROOT/pkgs/clan-cli" cd "$ROOT/pkgs/clan-cli"
nix develop "$ROOT#clan-cli" -c bash -c "TMPDIR=/tmp python -m pytest -m impure ./tests $@" nix develop "$ROOT#clan-cli" -c bash -c "TMPDIR=/tmp python -m pytest -s -m impure ./tests $@"
''; '';
}; };
} }

1
pkgs/clan-cli/clan_cli/__init__.py
View File

@@ -124,6 +124,7 @@ def main() -> None:
if args.debug: if args.debug:
setup_logging(logging.DEBUG) setup_logging(logging.DEBUG)
log.debug("Debug log activated") log.debug("Debug log activated")
setup_logging(logging.INFO)
if not hasattr(args, "func"): if not hasattr(args, "func"):
return return

4
pkgs/clan-cli/clan_cli/cmd.py
View File

@@ -8,9 +8,10 @@ from enum import Enum
from pathlib import Path from pathlib import Path
from typing import IO, Any from typing import IO, Any
from .custom_logger import get_caller
from .errors import ClanCmdError, CmdOut from .errors import ClanCmdError, CmdOut
log = logging.getLogger(__name__) glog = logging.getLogger(__name__)
class Log(Enum): class Log(Enum):
@@ -59,6 +60,7 @@ def run(
check: bool = True, check: bool = True,
error_msg: str | None = None, error_msg: str | None = None,
) -> CmdOut: ) -> CmdOut:
glog.debug(f"running command: {shlex.join(cmd)}. Caller: {get_caller()}")
# Start the subprocess # Start the subprocess
process = subprocess.Popen( process = subprocess.Popen(
cmd, cmd,

19
pkgs/clan-cli/clan_cli/custom_logger.py
View File

@@ -63,11 +63,18 @@ def get_caller() -> str:
def setup_logging(level: Any) -> None: def setup_logging(level: Any) -> None:
handler = logging.StreamHandler() # Get the root logger and set its level
handler.setLevel(level) root_logger = logging.getLogger()
handler.setFormatter(CustomFormatter()) root_logger.setLevel(level)
logger = logging.getLogger("registerHandler")
# Create and add the default handler
default_handler = logging.StreamHandler()
# Create and add your custom handler
default_handler.setLevel(level)
default_handler.setFormatter(CustomFormatter())
root_logger.addHandler(default_handler)
# Set logging level for other modules used by this module
logging.getLogger("asyncio").setLevel(logging.INFO) logging.getLogger("asyncio").setLevel(logging.INFO)
logging.getLogger("httpx").setLevel(level=logging.WARNING) logging.getLogger("httpx").setLevel(level=logging.WARNING)
logger.addHandler(handler)
# logging.basicConfig(level=level, handlers=[handler])

3
pkgs/clan-cli/tests/test_secrets_generate.py
View File

@@ -33,7 +33,8 @@ def test_generate_secret(
age_keys[0].pubkey, age_keys[0].pubkey,
] ]
) )
cli.run(["--flake", str(test_flake_with_core.path), "secrets", "generate", "vm1"]) cmd = ["--flake", str(test_flake_with_core.path), "secrets", "generate", "vm1"]
cli.run(cmd)
has_secret(test_flake_with_core.path, "vm1-age.key") has_secret(test_flake_with_core.path, "vm1-age.key")
has_secret(test_flake_with_core.path, "vm1-zerotier-identity-secret") has_secret(test_flake_with_core.path, "vm1-zerotier-identity-secret")
has_secret(test_flake_with_core.path, "vm1-zerotier-subnet") has_secret(test_flake_with_core.path, "vm1-zerotier-subnet")