✨ Support searching /dev/disk/by-id aliases.

Signed-off-by: Preslav <[email protected]>

providers/gcp/connection/gcpinstancesnapshot/provider.go

@@ -116,7 +116,7 @@ func NewGcpSnapshotConnection(id uint32, conf *inventory.Config, asset *inventor
 	// setup disk image so and attach it to the instance
 	var diskUrl string
 	mi := mountInfo{
-		deviceName: "/dev/sdh",
+		deviceName: "cnspec",
 	}
 	switch target.TargetType {
 	case "instance":

providers/os/connection/snapshot/blockdevices.go

@@ -70,7 +70,11 @@ func (cmdRunner *LocalCommandRunner) GetBlockDevices() (*BlockDevices, error) {
 	if err := json.Unmarshal(data, blockEntries); err != nil {
 		return nil, err
 	}
+
+	// looks into /dev for aliases
 	blockEntries.findAliases()
+	// looks into /dev/disk/by-id for aliases
+	blockEntries.findAliasesById()
 
 	return blockEntries, nil
 }
@@ -99,6 +103,33 @@ func (blockEntries *BlockDevices) findAliases() {
 	}
 }
 
+func (blockEntries *BlockDevices) findAliasesById() {
+	entries, err := os.ReadDir("/dev/disk/by-id")
+	if err != nil {
+		log.Warn().Err(err).Msg("Can't read /dev/disk/by-id directory")
+		return
+	}
+
+	for _, entry := range entries {
+		if entry.Type().Type() != os.ModeSymlink {
+			continue
+		}
+		path := fmt.Sprintf("/dev/disk/by-id/%s", entry.Name())
+		target, err := os.Readlink(path)
+		if err != nil {
+			log.Warn().Err(err).Str("path", path).Msg("Can't read link target")
+			continue
+		}
+
+		parts := strings.Split(target, "/")
+		if len(parts) == 0 {
+			continue
+		}
+		target = parts[len(parts)-1]
+		blockEntries.findAlias(target, path)
+	}
+}
+
 // Searches for a device by name
 func (blockEntries BlockDevices) FindDevice(requested string) (BlockDevice, error) {
 	log.Debug().Str("device", requested).Msg("searching for device")