🧹 Remove unused volume mounter code. (#4277)

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

providers/os/connection/snapshot/volumemounter.go

@@ -4,8 +4,6 @@
 package snapshot
 
 import (
-	"encoding/json"
-	"io"
 	"os"
 	"strings"
 
@@ -25,7 +23,6 @@ type VolumeMounter struct {
 	ScanDir string
 	// where we tell AWS to attach the volume; it doesn't necessarily get attached there, but we have to reference this same location when detaching
 	VolumeAttachmentLoc string
-	opts                map[string]string
 	CmdRunner           *LocalCommandRunner
 }
 
@@ -35,24 +32,6 @@ func NewVolumeMounter(shell []string) *VolumeMounter {
 	}
 }
 
-// we should try and migrate this towards MountP where we specifically mount a target partition.
-// the detection of the partition should be done in the caller (separately from Mount)
-func (m *VolumeMounter) Mount() error {
-	_, err := m.createScanDir()
-	if err != nil {
-		return err
-	}
-	fsInfo, err := m.getFsInfo()
-	if err != nil {
-		return err
-	}
-	if fsInfo == nil {
-		return errors.New("unable to find target volume on instance")
-	}
-	log.Debug().Str("device name", fsInfo.Name).Msg("found target volume")
-	return m.mountVolume(fsInfo)
-}
-
 // Mounts a specific partition and returns the directory it was mounted to
 func (m *VolumeMounter) MountP(partition *PartitionInfo) (string, error) {
 	if partition == nil {
@@ -82,44 +61,6 @@ func (m *VolumeMounter) createScanDir() (string, error) {
 	return dir, nil
 }
 
-func (m *VolumeMounter) getFsInfo() (*PartitionInfo, error) {
-	log.Debug().Str("volume attachment loc", m.VolumeAttachmentLoc).Msg("search for target volume")
-
-	// TODO: replace with mql query once version with lsblk resource is released
-	// TODO: only use sudo if we are not root
-	cmd, err := m.CmdRunner.RunCommand("sudo lsblk -f --json")
-	if err != nil {
-		return nil, err
-	}
-	data, err := io.ReadAll(cmd.Stdout)
-	if err != nil {
-		return nil, err
-	}
-	blockEntries := BlockDevices{}
-	if err := json.Unmarshal(data, &blockEntries); err != nil {
-		return nil, err
-	}
-	var fsInfo *PartitionInfo
-	if m.opts[NoSetup] == "true" {
-		// this means we didn't attach the volume to the instance
-		// so we need to make a best effort guess
-		return blockEntries.GetUnnamedBlockEntry()
-	}
-
-	fsInfo, err = blockEntries.GetMountablePartitionByDevice(m.VolumeAttachmentLoc)
-	if err == nil && fsInfo != nil {
-		return fsInfo, nil
-	} else {
-		// if we get here, we couldn't find a fs loaded at the expected location
-		// AWS does not guarantee this, so that's expected. fallback to find non-boot and non-mounted volume
-		fsInfo, err = blockEntries.GetUnmountedBlockEntry()
-		if err == nil && fsInfo != nil {
-			return fsInfo, nil
-		}
-	}
-	return nil, err
-}
-
 // GetDeviceForMounting iterates through all the partitions of the target and returns the first one that matches the filters
 // If device is not specified, it will return the first non-mounted, non-boot partition (best-effort guessing)
 // E.g. if target is "sda", it will return the first partition of the block device "sda" that satisfies the filters