nix fmt

pkgs/clan-cli/tests/fixtures_flakes.py

@@ -112,5 +112,4 @@ def test_flake_with_core_and_pass(
         temporary_home,
         FlakeName("test_flake_with_core_and_pass"),
         CLAN_CORE,
-
     )

pkgs/clan-cli/tests/test_config.py

@@ -5,11 +5,11 @@ from typing import Any, Optional
 
 import pytest
 from cli import Cli
+from fixtures_flakes import FlakeForTest
 
 from clan_cli import config
 from clan_cli.config import parsing
 from clan_cli.errors import ClanError
-from fixtures_flakes import FlakeForTest
 
 example_options = f"{Path(config.__file__).parent}/jsonschema/options.json"
 

pkgs/clan-cli/tests/test_flake_api.py

@@ -1,8 +1,8 @@
 import json
-from pathlib import Path
-from fixtures_flakes import FlakeForTest
+
 import pytest
 from api import TestClient
+from fixtures_flakes import FlakeForTest
 
 
 @pytest.mark.impure

pkgs/clan-cli/tests/test_import_sops_cli.py

@@ -1,10 +1,11 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
-from fixtures_flakes import FlakeForTest
-from clan_cli.debug import repro_env_break
 
 import pytest
 from cli import Cli
+from fixtures_flakes import FlakeForTest
+
+from clan_cli.debug import repro_env_break
 
 if TYPE_CHECKING:
     from age_keys import KeyPair
@@ -20,7 +21,9 @@ def test_import_sops(
     cli = Cli()
 
     monkeypatch.setenv("SOPS_AGE_KEY", age_keys[1].privkey)
-    cli.run(["secrets", "machines", "add", "machine1", age_keys[0].pubkey, test_flake.name])
+    cli.run(
+        ["secrets", "machines", "add", "machine1", age_keys[0].pubkey, test_flake.name]
+    )
     cli.run(["secrets", "users", "add", "user1", age_keys[1].pubkey, test_flake.name])
     cli.run(["secrets", "users", "add", "user2", age_keys[2].pubkey, test_flake.name])
     cli.run(["secrets", "groups", "add-user", "group1", "user1", test_flake.name])
@@ -29,19 +32,17 @@ def test_import_sops(
     # To edit:
     # SOPS_AGE_KEY=AGE-SECRET-KEY-1U5ENXZQAY62NC78Y2WC0SEGRRMAEEKH79EYY5TH4GPFWJKEAY0USZ6X7YQ sops --age age14tva0txcrl0zes05x7gkx56qd6wd9q3nwecjac74xxzz4l47r44sv3fz62 ./data/secrets.yaml
     cmd = [
-            "secrets",
-            "import-sops",
-            "--group",
-            "group1",
-            "--machine",
-            "machine1",
-            str(test_root.joinpath("data", "secrets.yaml")),
-            test_flake.name
-        ]
+        "secrets",
+        "import-sops",
+        "--group",
+        "group1",
+        "--machine",
+        "machine1",
+        str(test_root.joinpath("data", "secrets.yaml")),
+        test_flake.name,
+    ]
     repro_env_break(work_dir=test_flake.path, cmd=cmd)
-    cli.run(
-        cmd
-    )
+    cli.run(cmd)
     capsys.readouterr()
     cli.run(["secrets", "users", "list", test_flake.name])
     users = sorted(capsys.readouterr().out.rstrip().split())

pkgs/clan-cli/tests/test_machines_api.py

@@ -1,14 +1,13 @@
-from pathlib import Path
-
 from api import TestClient
 from fixtures_flakes import FlakeForTest
-from clan_cli.debug import repro_env_break
+
 
 def test_machines(api: TestClient, test_flake: FlakeForTest) -> None:
     response = api.get(f"/api/{test_flake.name}/machines")
     assert response.status_code == 200
     assert response.json() == {"machines": []}
 
+    # TODO: Fails because the test_flake fixture needs to init a git repo, which it currently does not
     response = api.post(f"/api/{test_flake.name}/machines", json={"name": "test"})
     assert response.status_code == 201
     assert response.json() == {"machine": {"name": "test", "status": "unknown"}}

pkgs/clan-cli/tests/test_secrets_generate.py

@@ -21,7 +21,16 @@ def test_generate_secret(
     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, test_flake_with_core.name])
+    cli.run(
+        [
+            "secrets",
+            "users",
+            "add",
+            "user1",
+            age_keys[0].pubkey,
+            test_flake_with_core.name,
+        ]
+    )
     cli.run(["secrets", "generate", "vm1", test_flake_with_core.name])
     has_secret(test_flake_with_core.name, "vm1-age.key")
     has_secret(test_flake_with_core.name, "vm1-zerotier-identity-secret")

pkgs/clan-cli/tests/test_secrets_upload.py

@@ -1,9 +1,9 @@
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 import pytest
 from cli import Cli
 from fixtures_flakes import FlakeForTest
+
 from clan_cli.ssh import HostGroup
 
 if TYPE_CHECKING:
@@ -21,9 +21,27 @@ def test_secrets_upload(
     monkeypatch.setenv("SOPS_AGE_KEY", age_keys[0].privkey)
 
     cli = Cli()
-    cli.run(["secrets", "users", "add", "user1", age_keys[0].pubkey, test_flake_with_core.name])
+    cli.run(
+        [
+            "secrets",
+            "users",
+            "add",
+            "user1",
+            age_keys[0].pubkey,
+            test_flake_with_core.name,
+        ]
+    )
 
-    cli.run(["secrets", "machines", "add", "vm1", age_keys[1].pubkey, test_flake_with_core.name])
+    cli.run(
+        [
+            "secrets",
+            "machines",
+            "add",
+            "vm1",
+            age_keys[1].pubkey,
+            test_flake_with_core.name,
+        ]
+    )
     monkeypatch.setenv("SOPS_NIX_SECRET", age_keys[0].privkey)
     cli.run(["secrets", "set", "vm1-age.key", test_flake_with_core.name])
 

pkgs/clan-cli/tests/test_vms_api.py

@@ -1,9 +1,8 @@
-from pathlib import Path
-
 import pytest
 from api import TestClient
 from fixtures_flakes import FlakeForTest
 
+
 @pytest.mark.impure
 def test_inspect(api: TestClient, test_flake_with_core: FlakeForTest) -> None:
     response = api.post(

pkgs/clan-cli/tests/test_vms_api_create.py

@@ -9,7 +9,6 @@ from fixtures_flakes import FlakeForTest, create_flake
 from httpx import SyncByteStream
 from root import CLAN_CORE
 
-from clan_cli.debug import repro_env_break
 from clan_cli.types import FlakeName
 
 if TYPE_CHECKING:
@@ -18,8 +17,7 @@ if TYPE_CHECKING:
 
 @pytest.fixture
 def flake_with_vm_with_secrets(
-    monkeypatch: pytest.MonkeyPatch,
-    temporary_home: Path
+    monkeypatch: pytest.MonkeyPatch, temporary_home: Path
 ) -> Iterator[FlakeForTest]:
     yield from create_flake(
         monkeypatch,
@@ -44,8 +42,6 @@ def remote_flake_with_vm_without_secrets(
     )
 
 
-
-
 def generic_create_vm_test(api: TestClient, flake: Path, vm: str) -> None:
     print(f"flake_url: {flake} ")
     response = api.post(
@@ -94,7 +90,14 @@ def test_create_local(
 ) -> None:
     monkeypatch.setenv("SOPS_AGE_KEY", age_keys[0].privkey)
     cli = Cli()
-    cmd = ["secrets", "users", "add", "user1", age_keys[0].pubkey, flake_with_vm_with_secrets.name]
+    cmd = [
+        "secrets",
+        "users",
+        "add",
+        "user1",
+        age_keys[0].pubkey,
+        flake_with_vm_with_secrets.name,
+    ]
     cli.run(cmd)
 
     generic_create_vm_test(api, flake_with_vm_with_secrets.path, "vm_with_secrets")

pkgs/clan-cli/tests/test_vms_cli.py

@@ -1,9 +1,9 @@
 import os
-from pathlib import Path
 from typing import TYPE_CHECKING
-from fixtures_flakes import FlakeForTest
+
 import pytest
 from cli import Cli
+from fixtures_flakes import FlakeForTest
 
 if TYPE_CHECKING:
     from age_keys import KeyPair
@@ -12,7 +12,9 @@ no_kvm = not os.path.exists("/dev/kvm")
 
 
 @pytest.mark.impure
-def test_inspect(test_flake_with_core: FlakeForTest, capsys: pytest.CaptureFixture) -> None:
+def test_inspect(
+    test_flake_with_core: FlakeForTest, capsys: pytest.CaptureFixture
+) -> None:
     cli = Cli()
     cli.run(["vms", "inspect", "vm1", test_flake_with_core.name])
     out = capsys.readouterr()  # empty the buffer
@@ -29,5 +31,14 @@ def test_create(
     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, test_flake_with_core.name])
+    cli.run(
+        [
+            "secrets",
+            "users",
+            "add",
+            "user1",
+            age_keys[0].pubkey,
+            test_flake_with_core.name,
+        ]
+    )
     cli.run(["vms", "create", "vm1", test_flake_with_core.name])