Added flake_name:str argument everywhere, nix fmt doesn't complain anymore

pkgs/clan-cli/tests/fixtures_flakes.py

@@ -2,7 +2,7 @@ import fileinput
 import shutil
 import tempfile
 from pathlib import Path
-from typing import Iterator
+from typing import Iterator, NamedTuple
 
 import pytest
 from root import CLAN_CORE
@@ -27,22 +27,27 @@ def substitute(
         print(line, end="")
 
 
+class TestFlake(NamedTuple):
+    name: str
+    path: Path
+
+
 def create_flake(
     monkeypatch: pytest.MonkeyPatch,
-    name: str,
+    flake_name: str,
     clan_core_flake: Path | None = None,
     machines: list[str] = [],
     remote: bool = False,
-) -> Iterator[Path]:
+) -> Iterator[TestFlake]:
     """
     Creates a flake with the given name and machines.
     The machine names map to the machines in ./test_machines
     """
-    template = Path(__file__).parent / name
+    template = Path(__file__).parent / flake_name
     # copy the template to a new temporary location
     with tempfile.TemporaryDirectory() as tmpdir_:
         home = Path(tmpdir_)
-        flake = home / name
+        flake = home / flake_name
         shutil.copytree(template, flake)
         # lookup the requested machines in ./test_machines and include them
         if machines:
@@ -60,20 +65,20 @@ def create_flake(
             with tempfile.TemporaryDirectory() as workdir:
                 monkeypatch.chdir(workdir)
                 monkeypatch.setenv("HOME", str(home))
-                yield flake
+                yield TestFlake(flake_name, flake)
         else:
             monkeypatch.chdir(flake)
             monkeypatch.setenv("HOME", str(home))
-            yield flake
+            yield TestFlake(flake_name, flake)
 
 
 @pytest.fixture
-def test_flake(monkeypatch: pytest.MonkeyPatch) -> Iterator[Path]:
+def test_flake(monkeypatch: pytest.MonkeyPatch) -> Iterator[TestFlake]:
     yield from create_flake(monkeypatch, "test_flake")
 
 
 @pytest.fixture
-def test_flake_with_core(monkeypatch: pytest.MonkeyPatch) -> Iterator[Path]:
+def test_flake_with_core(monkeypatch: pytest.MonkeyPatch) -> Iterator[TestFlake]:
     if not (CLAN_CORE / "flake.nix").exists():
         raise Exception(
             "clan-core flake not found. This test requires the clan-core flake to be present"
@@ -82,7 +87,9 @@ def test_flake_with_core(monkeypatch: pytest.MonkeyPatch) -> Iterator[Path]:
 
 
 @pytest.fixture
-def test_flake_with_core_and_pass(monkeypatch: pytest.MonkeyPatch) -> Iterator[Path]:
+def test_flake_with_core_and_pass(
+    monkeypatch: pytest.MonkeyPatch,
+) -> Iterator[TestFlake]:
     if not (CLAN_CORE / "flake.nix").exists():
         raise Exception(
             "clan-core flake not found. This test requires the clan-core flake to be present"

pkgs/clan-cli/tests/test_dirs.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 import pytest
 
-from clan_cli.dirs import get_clan_flake_toplevel
+from clan_cli.dirs import _get_clan_flake_toplevel
 from clan_cli.errors import ClanError
 
 
@@ -11,12 +11,12 @@ def test_get_clan_flake_toplevel(
 ) -> None:
     monkeypatch.chdir(temporary_dir)
     with pytest.raises(ClanError):
-        print(get_clan_flake_toplevel())
+        print(_get_clan_flake_toplevel())
     (temporary_dir / ".git").touch()
-    assert get_clan_flake_toplevel() == temporary_dir
+    assert _get_clan_flake_toplevel() == temporary_dir
 
     subdir = temporary_dir / "subdir"
     subdir.mkdir()
     monkeypatch.chdir(subdir)
     (subdir / ".clan-flake").touch()
-    assert get_clan_flake_toplevel() == subdir
+    assert _get_clan_flake_toplevel() == subdir

pkgs/clan-cli/tests/test_machines_config.py

@@ -1,8 +1,8 @@
-from pathlib import Path
+from fixtures_flakes import TestFlake
 
 from clan_cli.config import machine
 
 
-def test_schema_for_machine(test_flake: Path) -> None:
-    schema = machine.schema_for_machine("machine1", flake=test_flake)
+def test_schema_for_machine(test_flake: TestFlake) -> None:
+    schema = machine.schema_for_machine(test_flake.name, "machine1")
     assert "properties" in schema

pkgs/clan-cli/tests/test_secrets_generate.py

@@ -1,8 +1,8 @@
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 import pytest
 from cli import Cli
+from fixtures_flakes import TestFlake
 
 from clan_cli.machines.facts import machine_get_fact
 from clan_cli.secrets.folders import sops_secrets_folder
@@ -15,21 +15,27 @@ if TYPE_CHECKING:
 @pytest.mark.impure
 def test_generate_secret(
     monkeypatch: pytest.MonkeyPatch,
-    test_flake_with_core: Path,
+    test_flake_with_core: TestFlake,
     age_keys: list["KeyPair"],
 ) -> None:
-    monkeypatch.chdir(test_flake_with_core)
+    monkeypatch.chdir(test_flake_with_core.path)
     monkeypatch.setenv("SOPS_AGE_KEY", age_keys[0].privkey)
     cli = Cli()
     cli.run(["secrets", "users", "add", "user1", age_keys[0].pubkey])
     cli.run(["secrets", "generate", "vm1"])
-    has_secret("vm1-age.key")
-    has_secret("vm1-zerotier-identity-secret")
-    network_id = machine_get_fact("vm1", "zerotier-network-id")
+    has_secret(test_flake_with_core.name, "vm1-age.key")
+    has_secret(test_flake_with_core.name, "vm1-zerotier-identity-secret")
+    network_id = machine_get_fact(
+        test_flake_with_core.name, "vm1", "zerotier-network-id"
+    )
     assert len(network_id) == 16
-    age_key = sops_secrets_folder().joinpath("vm1-age.key").joinpath("secret")
+    age_key = (
+        sops_secrets_folder(test_flake_with_core.name)
+        .joinpath("vm1-age.key")
+        .joinpath("secret")
+    )
     identity_secret = (
-        sops_secrets_folder()
+        sops_secrets_folder(test_flake_with_core.name)
         .joinpath("vm1-zerotier-identity-secret")
         .joinpath("secret")
     )
@@ -42,7 +48,7 @@ def test_generate_secret(
     assert identity_secret.lstat().st_mtime_ns == secret1_mtime
 
     machine_path = (
-        sops_secrets_folder()
+        sops_secrets_folder(test_flake_with_core.name)
         .joinpath("vm1-zerotier-identity-secret")
         .joinpath("machines")
         .joinpath("vm1")

pkgs/clan-cli/tests/test_secrets_password_store.py

@@ -3,6 +3,7 @@ from pathlib import Path
 
 import pytest
 from cli import Cli
+from fixtures_flakes import TestFlake
 
 from clan_cli.machines.facts import machine_get_fact
 from clan_cli.nix import nix_shell
@@ -12,11 +13,11 @@ from clan_cli.ssh import HostGroup
 @pytest.mark.impure
 def test_upload_secret(
     monkeypatch: pytest.MonkeyPatch,
-    test_flake_with_core_and_pass: Path,
+    test_flake_with_core_and_pass: TestFlake,
     temporary_dir: Path,
     host_group: HostGroup,
 ) -> None:
-    monkeypatch.chdir(test_flake_with_core_and_pass)
+    monkeypatch.chdir(test_flake_with_core_and_pass.path)
     gnupghome = temporary_dir / "gpg"
     gnupghome.mkdir(mode=0o700)
     monkeypatch.setenv("GNUPGHOME", str(gnupghome))
@@ -39,7 +40,9 @@ def test_upload_secret(
     )
     subprocess.run(nix_shell(["pass"], ["pass", "init", "test@local"]), check=True)
     cli.run(["secrets", "generate", "vm1"])
-    network_id = machine_get_fact("vm1", "zerotier-network-id")
+    network_id = machine_get_fact(
+        test_flake_with_core_and_pass.name, "vm1", "zerotier-network-id"
+    )
     assert len(network_id) == 16
     identity_secret = (
         temporary_dir / "pass" / "machines" / "vm1" / "zerotier-identity-secret.gpg"
@@ -50,13 +53,13 @@ def test_upload_secret(
     cli.run(["secrets", "generate", "vm1"])
     assert identity_secret.lstat().st_mtime_ns == secret1_mtime
 
-    flake = test_flake_with_core_and_pass.joinpath("flake.nix")
+    flake = test_flake_with_core_and_pass.path.joinpath("flake.nix")
     host = host_group.hosts[0]
     addr = f"{host.user}@{host.host}:{host.port}?StrictHostKeyChecking=no&UserKnownHostsFile=/dev/null&IdentityFile={host.key}"
     new_text = flake.read_text().replace("__CLAN_DEPLOYMENT_ADDRESS__", addr)
     flake.write_text(new_text)
     cli.run(["secrets", "upload", "vm1"])
     zerotier_identity_secret = (
-        test_flake_with_core_and_pass / "secrets" / "zerotier-identity-secret"
+        test_flake_with_core_and_pass.path / "secrets" / "zerotier-identity-secret"
     )
     assert zerotier_identity_secret.exists()

pkgs/clan-cli/tests/test_vms_api_create.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Iterator
 import pytest
 from api import TestClient
 from cli import Cli
-from fixtures_flakes import create_flake
+from fixtures_flakes import TestFlake, create_flake
 from httpx import SyncByteStream
 from root import CLAN_CORE
 
@@ -14,7 +14,7 @@ if TYPE_CHECKING:
 
 
 @pytest.fixture
-def flake_with_vm_with_secrets(monkeypatch: pytest.MonkeyPatch) -> Iterator[Path]:
+def flake_with_vm_with_secrets(monkeypatch: pytest.MonkeyPatch) -> Iterator[TestFlake]:
     yield from create_flake(
         monkeypatch,
         "test_flake_with_core_dynamic_machines",
@@ -26,7 +26,7 @@ def flake_with_vm_with_secrets(monkeypatch: pytest.MonkeyPatch) -> Iterator[Path
 @pytest.fixture
 def remote_flake_with_vm_without_secrets(
     monkeypatch: pytest.MonkeyPatch,
-) -> Iterator[Path]:
+) -> Iterator[TestFlake]:
     yield from create_flake(
         monkeypatch,
         "test_flake_with_core_dynamic_machines",