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

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()