From 237327ead34fb29bd8f228f8b1dd12df2ab2e38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 1 Oct 2024 18:48:25 +0200
Subject: [PATCH] start to name temporary directories in more places

---
 pkgs/clan-cli/clan_cli/flash/flash.py      | 2 +-
 pkgs/clan-cli/clan_cli/machines/install.py | 2 +-
 pkgs/clan-cli/clan_cli/nix/__init__.py     | 2 +-
 pkgs/clan-cli/clan_cli/vars/generate.py    | 2 +-
 pkgs/clan-cli/clan_cli/vms/run.py          | 6 ++++--
 pkgs/clan-cli/tests/fixtures_flakes.py     | 2 +-
 pkgs/clan-cli/tests/sshd.py                | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/flash/flash.py b/pkgs/clan-cli/clan_cli/flash/flash.py
index 6387be02c..0ca9b8378 100644
--- a/pkgs/clan-cli/clan_cli/flash/flash.py
+++ b/pkgs/clan-cli/clan_cli/flash/flash.py
@@ -100,7 +100,7 @@ def flash_machine(
         secret_facts_store: SecretStoreBase = secret_facts_module.SecretStore(
             machine=machine
         )
-        with TemporaryDirectory() as tmpdir_:
+        with TemporaryDirectory(prefix="disko-install-") as tmpdir_:
             tmpdir = Path(tmpdir_)
             upload_dir = machine.secrets_upload_directory
 
diff --git a/pkgs/clan-cli/clan_cli/machines/install.py b/pkgs/clan-cli/clan_cli/machines/install.py
index 120d6766b..14e67b079 100644
--- a/pkgs/clan-cli/clan_cli/machines/install.py
+++ b/pkgs/clan-cli/clan_cli/machines/install.py
@@ -45,7 +45,7 @@ def install_nixos(
     generate_facts([machine], None, False)
     generate_vars([machine], None, False)
 
-    with TemporaryDirectory() as tmpdir_:
+    with TemporaryDirectory(prefix="nixos-install-") as tmpdir_:
         tmpdir = Path(tmpdir_)
         upload_dir_ = machine.secrets_upload_directory
 
diff --git a/pkgs/clan-cli/clan_cli/nix/__init__.py b/pkgs/clan-cli/clan_cli/nix/__init__.py
index a1346eee5..abef3fb27 100644
--- a/pkgs/clan-cli/clan_cli/nix/__init__.py
+++ b/pkgs/clan-cli/clan_cli/nix/__init__.py
@@ -80,7 +80,7 @@ def nix_eval(flags: list[str]) -> list[str]:
         ]
     )
     if os.environ.get("IN_NIX_SANDBOX"):
-        with tempfile.TemporaryDirectory() as nix_store:
+        with tempfile.TemporaryDirectory(prefix="nix-store-") as nix_store:
             return [
                 *default_flags,
                 "--override-input",
diff --git a/pkgs/clan-cli/clan_cli/vars/generate.py b/pkgs/clan-cli/clan_cli/vars/generate.py
index d52b4ec22..144a0dd0e 100644
--- a/pkgs/clan-cli/clan_cli/vars/generate.py
+++ b/pkgs/clan-cli/clan_cli/vars/generate.py
@@ -121,7 +121,7 @@ def execute_generator(
             raise ClanError(msg) from e
 
     env = os.environ.copy()
-    with TemporaryDirectory() as tmp:
+    with TemporaryDirectory(prefix="vars-") as tmp:
         tmpdir = Path(tmp)
         tmpdir_in = tmpdir / "in"
         tmpdir_prompts = tmpdir / "prompts"
diff --git a/pkgs/clan-cli/clan_cli/vms/run.py b/pkgs/clan-cli/clan_cli/vms/run.py
index 363d5207a..73dd2ecf2 100644
--- a/pkgs/clan-cli/clan_cli/vms/run.py
+++ b/pkgs/clan-cli/clan_cli/vms/run.py
@@ -129,11 +129,13 @@ def run_vm(
         cache.mkdir(exist_ok=True)
 
         if cachedir is None:
-            cache_tmp = stack.enter_context(TemporaryDirectory(dir=cache))
+            cache_tmp = stack.enter_context(
+                TemporaryDirectory(prefix="vm-cache-", dir=cache)
+            )
             cachedir = Path(cache_tmp)
 
         if socketdir is None:
-            socket_tmp = stack.enter_context(TemporaryDirectory())
+            socket_tmp = stack.enter_context(TemporaryDirectory(prefix="vm-sockets-"))
             socketdir = Path(socket_tmp)
 
         # TODO: We should get this from the vm argument
diff --git a/pkgs/clan-cli/tests/fixtures_flakes.py b/pkgs/clan-cli/tests/fixtures_flakes.py
index 91bde35ff..5d68481ac 100644
--- a/pkgs/clan-cli/tests/fixtures_flakes.py
+++ b/pkgs/clan-cli/tests/fixtures_flakes.py
@@ -232,7 +232,7 @@ def create_flake(
     sp.run(["git", "commit", "-a", "-m", "Initial commit"], cwd=flake, check=True)
 
     if remote:
-        with tempfile.TemporaryDirectory():
+        with tempfile.TemporaryDirectory(prefix="flake-"):
             yield FlakeForTest(flake)
     else:
         yield FlakeForTest(flake)
diff --git a/pkgs/clan-cli/tests/sshd.py b/pkgs/clan-cli/tests/sshd.py
index 3a895b864..e14c0f89a 100644
--- a/pkgs/clan-cli/tests/sshd.py
+++ b/pkgs/clan-cli/tests/sshd.py
@@ -38,7 +38,7 @@ class SshdConfig:
 def sshd_config(test_root: Path) -> Iterator[SshdConfig]:
     # FIXME, if any parent of the sshd directory is world-writable than sshd will refuse it.
     # we use .direnv instead since it's already in .gitignore
-    with TemporaryDirectory() as _dir:
+    with TemporaryDirectory(prefix="sshd-") as _dir:
         tmpdir = Path(_dir)
         host_key = test_root / "data" / "ssh_host_ed25519_key"
         host_key.chmod(0o600)