Merge pull request #35 from MaterializeInc/more-flexibility-for-gcp-disk-ids

Fix bug when identifying non NVME labeled disks

Author: jubrad

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ephemeral-storage-setup"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2024"
 rust-version = "1.88.0"
 resolver = "2"

Cargo.toml

@@ -170,7 +170,12 @@ impl DiskDetector {
         // filter to local SSDs. We don't only use `find`
         // because the devices might have partitions or other
         // children we need to filter out.
-        let find_paths = self.find("/dev/disk/by-id", "google-local-nvme-ssd-*");
+        // All local disks will take the form of google-local-*.
+        // We'll make the assumption that the machine has homogeneous
+        // disk setup, and that the disks the user configured or are
+        // provided by the machine are NVME or equivilently fast.
+        let find_paths = [self.find("/dev/disk/by-id", "google-local-*")].concat();
+
         self.lsblk()
             .paths()
             .filter(|path| find_paths.contains(path))