Added ref to Qubasa-main in template/new-clan/flake.nix

pkgs/clan-cli/clan_cli/vms/create.py

@@ -9,15 +9,16 @@ from pathlib import Path
 from typing import Iterator
 from uuid import UUID
 
-from ..dirs import specific_flake_dir
-from ..nix import nix_build, nix_config, nix_shell
+from ..dirs import specific_flake_dir, clan_flakes_dir
+from ..nix import nix_build, nix_config, nix_shell, nix_eval
 from ..task_manager import BaseTask, Command, create_task
 from .inspect import VmConfig, inspect_vm
-
+from ..flakes.create import create_flake
+from ..types import validate_path
 
 class BuildVmTask(BaseTask):
     def __init__(self, uuid: UUID, vm: VmConfig) -> None:
-        super().__init__(uuid, num_cmds=6)
+        super().__init__(uuid, num_cmds=7)
         self.vm = vm
 
     def get_vm_create_info(self, cmds: Iterator[Command]) -> dict:
@@ -39,6 +40,19 @@ class BuildVmTask(BaseTask):
         with open(vm_json) as f:
             return json.load(f)
 
+    def get_clan_name(self, cmds: Iterator[Command]) -> str:
+        clan_dir = self.vm.flake_url
+        cmd = next(cmds)
+        cmd.run(
+            nix_eval(
+                [
+                    f'{clan_dir}#clanInternals.clanName'
+                ]
+            )
+        )
+        clan_name = "".join(cmd.stdout).strip()
+        return clan_name
+
     def run(self) -> None:
         cmds = self.commands()
 
@@ -47,101 +61,103 @@ class BuildVmTask(BaseTask):
 
         # TODO: We should get this from the vm argument
         vm_config = self.get_vm_create_info(cmds)
+        clan_name = self.get_clan_name(cmds)
 
-        # TODO: Don't use a temporary directory, instead create a new flake directory
-        with tempfile.TemporaryDirectory() as tmpdir_:
-            tmpdir = Path(tmpdir_)
-            xchg_dir = tmpdir / "xchg"
-            xchg_dir.mkdir()
-            secrets_dir = tmpdir / "secrets"
-            secrets_dir.mkdir()
-            disk_img = f"{tmpdir_}/disk.img"
 
-            env = os.environ.copy()
-            env["CLAN_DIR"] = str(self.vm.flake_url)
+        flake_dir = clan_flakes_dir() / clan_name
+        validate_path(clan_flakes_dir(), flake_dir)
 
-            env["PYTHONPATH"] = str(
-                ":".join(sys.path)
-            )  # TODO do this in the clanCore module
-            env["SECRETS_DIR"] = str(secrets_dir)
+        xchg_dir = flake_dir / "xchg"
+        xchg_dir.mkdir()
+        secrets_dir = flake_dir / "secrets"
+        secrets_dir.mkdir()
+        disk_img = f"{flake_dir}/disk.img"
 
-            cmd = next(cmds)
-            if Path(self.vm.flake_url).is_dir():
-                cmd.run(
-                    [vm_config["generateSecrets"]],
-                    env=env,
-                )
-            else:
-                self.log.warning("won't generate secrets for non local clan")
+        env = os.environ.copy()
+        env["CLAN_DIR"] = str(self.vm.flake_url)
 
-            cmd = next(cmds)
+        env["PYTHONPATH"] = str(
+            ":".join(sys.path)
+        )  # TODO do this in the clanCore module
+        env["SECRETS_DIR"] = str(secrets_dir)
+
+        cmd = next(cmds)
+        if Path(self.vm.flake_url).is_dir():
             cmd.run(
-                [vm_config["uploadSecrets"]],
+                [vm_config["generateSecrets"]],
                 env=env,
             )
+        else:
+            self.log.warning("won't generate secrets for non local clan")
 
-            cmd = next(cmds)
-            cmd.run(
-                nix_shell(
-                    ["qemu"],
-                    [
-                        "qemu-img",
-                        "create",
-                        "-f",
-                        "raw",
-                        disk_img,
-                        "1024M",
-                    ],
-                )
+        cmd = next(cmds)
+        cmd.run(
+            [vm_config["uploadSecrets"]],
+            env=env,
+        )
+
+        cmd = next(cmds)
+        cmd.run(
+            nix_shell(
+                ["qemu"],
+                [
+                    "qemu-img",
+                    "create",
+                    "-f",
+                    "raw",
+                    disk_img,
+                    "1024M",
+                ],
             )
+        )
 
-            cmd = next(cmds)
-            cmd.run(
-                nix_shell(
-                    ["e2fsprogs"],
-                    [
-                        "mkfs.ext4",
-                        "-L",
-                        "nixos",
-                        disk_img,
-                    ],
-                )
+        cmd = next(cmds)
+        cmd.run(
+            nix_shell(
+                ["e2fsprogs"],
+                [
+                    "mkfs.ext4",
+                    "-L",
+                    "nixos",
+                    disk_img,
+                ],
             )
+        )
 
-            cmd = next(cmds)
-            cmdline = [
-                (Path(vm_config["toplevel"]) / "kernel-params").read_text(),
-                f'init={vm_config["toplevel"]}/init',
-                f'regInfo={vm_config["regInfo"]}/registration',
-                "console=ttyS0,115200n8",
-                "console=tty0",
-            ]
-            qemu_command = [
-                # fmt: off
-                "qemu-kvm",
-                "-name", machine,
-                "-m", f'{vm_config["memorySize"]}M',
-                "-smp", str(vm_config["cores"]),
-                "-device", "virtio-rng-pci",
-                "-net", "nic,netdev=user.0,model=virtio", "-netdev", "user,id=user.0",
-                "-virtfs", "local,path=/nix/store,security_model=none,mount_tag=nix-store",
-                "-virtfs", f"local,path={xchg_dir},security_model=none,mount_tag=shared",
-                "-virtfs", f"local,path={xchg_dir},security_model=none,mount_tag=xchg",
-                "-virtfs", f"local,path={secrets_dir},security_model=none,mount_tag=secrets",
-                "-drive", f'cache=writeback,file={disk_img},format=raw,id=drive1,if=none,index=1,werror=report',
-                "-device", "virtio-blk-pci,bootindex=1,drive=drive1,serial=root",
-                "-device", "virtio-keyboard",
-                "-usb",
-                "-device", "usb-tablet,bus=usb-bus.0",
-                "-kernel", f'{vm_config["toplevel"]}/kernel',
-                "-initrd", vm_config["initrd"],
-                "-append", " ".join(cmdline),
-                # fmt: on
-            ]
-            if not self.vm.graphics:
-                qemu_command.append("-nographic")
-            print("$ " + shlex.join(qemu_command))
-            cmd.run(nix_shell(["qemu"], qemu_command))
+        cmd = next(cmds)
+        cmdline = [
+            (Path(vm_config["toplevel"]) / "kernel-params").read_text(),
+            f'init={vm_config["toplevel"]}/init',
+            f'regInfo={vm_config["regInfo"]}/registration',
+            "console=ttyS0,115200n8",
+            "console=tty0",
+        ]
+        qemu_command = [
+            # fmt: off
+            "qemu-kvm",
+            "-name", machine,
+            "-m", f'{vm_config["memorySize"]}M',
+            "-smp", str(vm_config["cores"]),
+            "-device", "virtio-rng-pci",
+            "-net", "nic,netdev=user.0,model=virtio", "-netdev", "user,id=user.0",
+            "-virtfs", "local,path=/nix/store,security_model=none,mount_tag=nix-store",
+            "-virtfs", f"local,path={xchg_dir},security_model=none,mount_tag=shared",
+            "-virtfs", f"local,path={xchg_dir},security_model=none,mount_tag=xchg",
+            "-virtfs", f"local,path={secrets_dir},security_model=none,mount_tag=secrets",
+            "-drive", f'cache=writeback,file={disk_img},format=raw,id=drive1,if=none,index=1,werror=report',
+            "-device", "virtio-blk-pci,bootindex=1,drive=drive1,serial=root",
+            "-device", "virtio-keyboard",
+            "-usb",
+            "-device", "usb-tablet,bus=usb-bus.0",
+            "-kernel", f'{vm_config["toplevel"]}/kernel',
+            "-initrd", vm_config["initrd"],
+            "-append", " ".join(cmdline),
+            # fmt: on
+        ]
+        if not self.vm.graphics:
+            qemu_command.append("-nographic")
+        print("$ " + shlex.join(qemu_command))
+        cmd.run(nix_shell(["qemu"], qemu_command))
 
 
 def create_vm(vm: VmConfig) -> BuildVmTask: