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

Merge branch 'main' into flake-update-2025-01-13

Browse Source
This commit is contained in:
Mic92
2025-01-14 14:46:25 +00:00
parent 1f7515d452 2588e5df5b
commit c04c7cdfb5
19 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
checks/lib/container-driver/test_driver/__init__.py
View File

@@ -102,9 +102,9 @@ class Machine:
.read_text()
.split()
)
assert (
len(childs) == 1
), f"Expected exactly one child process for systemd-nspawn, got {childs}"
assert len(childs) == 1, (
f"Expected exactly one child process for systemd-nspawn, got {childs}"
)
try:
return int(childs[0])
except ValueError as e:

4
docs/nix/render_options/__init__.py
View File

@@ -103,7 +103,7 @@ def render_option(
read_only = option.get("readOnly")
res = f"""
{"#" * level} {sanitize(name) if short_head is None else sanitize(short_head)} {"{: #"+sanitize_anchor(name)+"}" if level > 1 else ""}
{"#" * level} {sanitize(name) if short_head is None else sanitize(short_head)} {"{: #" + sanitize_anchor(name) + "}" if level > 1 else ""}
"""
@@ -125,7 +125,7 @@ def render_option(
**Default**:
```nix
{option.get("default",{}).get("text") if option.get("default") else "No default set."}
{option.get("default", {}).get("text") if option.get("default") else "No default set."}
```
"""
example = option.get("example", {}).get("text")

2
docs/site/getting-started/index.md
View File

@@ -54,6 +54,8 @@ clan --help
### Step 2: Initialize Your Project
If you want to migrate an existing project, follow this [guide](https://docs.clan.lol/manual/migration-guide/).
Set the foundation of your Clan project by initializing it as follows:
```bash

12
nixosModules/clanCore/zerotier/generate.py
View File

@@ -55,9 +55,9 @@ class Identity:
def node_id(self) -> str:
nid = self.public.split(":")[0]
assert (
len(nid) == 10
), f"node_id must be 10 characters long, got {len(nid)}: {nid}"
assert len(nid) == 10, (
f"node_id must be 10 characters long, got {len(nid)}: {nid}"
)
return nid
@@ -172,9 +172,9 @@ def create_identity() -> Identity:
def compute_zerotier_ip(network_id: str, identity: Identity) -> ipaddress.IPv6Address:
assert (
len(network_id) == 16
), "network_id must be 16 characters long, got {network_id}"
assert len(network_id) == 16, (
"network_id must be 16 characters long, got {network_id}"
)
nwid = int(network_id, 16)
node_id = int(identity.node_id(), 16)
addr_parts = bytearray(

2
pkgs/clan-app/tests/helpers/cli.py
View File

@@ -14,7 +14,7 @@ def print_trace(msg: str) -> None:
if "run_no_stdout" in callers[0]:
callers = get_callers(3, 3 + trace_depth)
callers_str = "\n".join(f"{i+1}: {caller}" for i, caller in enumerate(callers))
callers_str = "\n".join(f"{i + 1}: {caller}" for i, caller in enumerate(callers))
log.debug(f"{msg} \nCallers: \n{callers_str}")

6
pkgs/clan-cli/clan_cli/api/util.py
View File

@@ -115,9 +115,9 @@ def type_to_dict(
for f in fields:
if f.name.startswith("_"):
continue
assert not isinstance(
f.type, str
), f"Expected field type to be a type, got {f.type}, Have you imported `from __future__ import annotations`?"
assert not isinstance(f.type, str), (
f"Expected field type to be a type, got {f.type}, Have you imported `from __future__ import annotations`?"
)
properties[f.metadata.get("alias", f.name)] = type_to_dict(
f.type,
f"{scope} {t.__name__}.{f.name}", # type: ignore

6
pkgs/clan-cli/clan_cli/clan/show.py
View File

@@ -75,9 +75,9 @@ def show_command(args: argparse.Namespace) -> None:
flake_path = args.flake.path
meta = show_clan_meta(flake_path)
print(f"Name: {meta.get("name")}")
print(f"Description: {meta.get("description", '-')}")
print(f"Icon: {meta.get("icon", '-')}")
print(f"Name: {meta.get('name')}")
print(f"Description: {meta.get('description', '-')}")
print(f"Icon: {meta.get('icon', '-')}")
def register_parser(parser: argparse.ArgumentParser) -> None:

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

@@ -146,7 +146,9 @@ def print_trace(msg: str, logger: logging.Logger, prefix: str | None) -> None:
if len(callers) == 1:
callers_str = f"Caller: {callers[0]}\n"
else:
callers_str = "\n".join(f"{i+1}: {caller}" for i, caller in enumerate(callers))
callers_str = "\n".join(
f"{i + 1}: {caller}" for i, caller in enumerate(callers)
)
callers_str = f"Callers:\n{callers_str}"
logger.debug(f"{msg} \n{callers_str}", extra={"command_prefix": prefix})

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

@@ -116,7 +116,7 @@ class CmdOut:
{optional_text("Command", self.command)}
{optional_text("Stdout", self.stdout)}
{optional_text("Stderr", self.stderr)}
{'Return Code:':<{label_width}} {self.returncode}
{"Return Code:":<{label_width}} {self.returncode}
"""
]
if self.msg:
@@ -135,7 +135,7 @@ class CmdOut:
f"""
{optional_text("Environment", diffed_dict_str)}
{text_heading(heading="Metadata")}
{'Work Dir:':<{label_width}} '{self.cwd}'
{"Work Dir:":<{label_width}} '{self.cwd}'
"""
]
return "\n".join(error_msg)

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

@@ -492,7 +492,7 @@ def read_key(path: Path) -> tuple[str, KeyType]:
raise ClanError(msg) from e
key_type = KeyType.validate(key.get("type"))
if key_type is None:
msg = f"Invalid key type in {path.name}: \"{key_type}\" (expected one of {', '.join(KeyType.__members__.keys())})."
msg = f'Invalid key type in {path.name}: "{key_type}" (expected one of {", ".join(KeyType.__members__.keys())}).'
raise ClanError(msg)
publickey = key.get("publickey")
if not publickey:

2
pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py
View File

@@ -141,7 +141,7 @@ class SecretStore(StoreBase):
# TODO get the path to the secrets from the machine
[
"cat",
f"{self.machine.deployment["password-store"]["secretLocation"]}/.pass_info",
f"{self.machine.deployment['password-store']['secretLocation']}/.pass_info",
],
RunOpts(log=Log.STDERR, check=False),
).stdout.strip()

2
pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py
View File

@@ -238,7 +238,7 @@ class SecretStore(StoreBase):
msg = (
f"One or more recipient keys were added to secret{' shared' if generator.share else ''} var '{var_id}', but it was never re-encrypted.\n"
f"This could have been a malicious actor trying to add their keys, please investigate.\n"
f"Added keys: {', '.join(f"{r.key_type.name}:{r.pubkey}" for r in recipients_to_add)}\n"
f"Added keys: {', '.join(f'{r.key_type.name}:{r.pubkey}' for r in recipients_to_add)}\n"
f"If this is intended, run 'clan vars fix' to re-encrypt the secret."
)
return needs_update, msg

4
pkgs/clan-cli/clan_cli/vms/qemu.py
View File

@@ -99,8 +99,8 @@ def qemu_command(
portmap = {}
kernel_cmdline = [
(Path(nixos_config["toplevel"]) / "kernel-params").read_text(),
f'init={nixos_config["toplevel"]}/init',
f'regInfo={nixos_config["regInfo"]}/registration',
f"init={nixos_config['toplevel']}/init",
f"regInfo={nixos_config['regInfo']}/registration",
"console=hvc0",
]
if not vm.waypipe.enable:

2
pkgs/clan-cli/clan_cli/vms/waypipe.py
View File

@@ -16,7 +16,7 @@ def test_vsock_port(port: int) -> bool:
msg = "vsock is only supported on Linux"
raise NotImplementedError(msg)
try:
with socket.socket(socket.AF_VSOCK, socket.SOCK_STREAM) as s:
with socket.socket(socket.AF_VSOCK, socket.SOCK_STREAM) as s: # type: ignore[attr-defined]
s.connect((VMADDR_CID_HYPERVISOR, port))
except OSError:
return False

2
pkgs/clan-cli/docs.py
View File

@@ -327,7 +327,7 @@ def build_command_reference() -> None:
filename = cmd.title.split(" ")[0]
markdown = files.get(folder / f"{filename}.md", "")
markdown += f"{'#'*(cmd.level)} {cmd.title.capitalize()}\n\n"
markdown += f"{'#' * (cmd.level)} {cmd.title.capitalize()}\n\n"
markdown += f"{cmd.description}\n\n" if cmd.description else ""

6
pkgs/clan-cli/tests/sshd.py
View File

@@ -76,9 +76,9 @@ exec {bash} -l "${{@}}"
login_shell.chmod(0o755)
lib_path = None
assert (
platform == "linux"
), f"we do not support the ld_preload trick on non-linux just now. Got {platform}"
assert platform == "linux", (
f"we do not support the ld_preload trick on non-linux just now. Got {platform}"
)
# This enforces a login shell by overriding the login shell of `getpwnam(3)`
lib_path = tmpdir / "libgetpwnam-preload.so"

2
pkgs/clan-vm-manager/tests/helpers/cli.py
View File

@@ -14,7 +14,7 @@ def print_trace(msg: str) -> None:
if "run_no_stdout" in callers[0]:
callers = get_callers(3, 3 + trace_depth)
callers_str = "\n".join(f"{i+1}: {caller}" for i, caller in enumerate(callers))
callers_str = "\n".join(f"{i + 1}: {caller}" for i, caller in enumerate(callers))
log.debug(f"{msg} \nCallers: \n{callers_str}")

6
pkgs/zerotier-members/zerotier-members.py
View File

@@ -14,9 +14,9 @@ class ClanError(Exception):
def compute_zerotier_ip(network_id: str, identity: str) -> ipaddress.IPv6Address:
assert (
len(network_id) == 16
), "network_id must be 16 characters long, got {network_id}"
assert len(network_id) == 16, (
"network_id must be 16 characters long, got {network_id}"
)
nwid = int(network_id, 16)
node_id = int(identity, 16)
addr_parts = bytearray(

3
pyproject.toml
View File

@@ -46,6 +46,9 @@ lint.select = [
]
lint.ignore = [
"A003",
# A005 Module `inspect` shadows a Python standard-library module
# We might asctually wants to fix this.
"A005",
"ANN401",
"TRY400",
"E402",