cleanup: use local CmdRunner instead of exposing CmdRunner at volumeMounter

Author: slntopp

Diff for: providers/os/connection/device/linux/device_manager.go

@@ -36,6 +36,7 @@ const (
 
 type LinuxDeviceManager struct {
 	volumeMounter snapshot.VolumeMounter
+	cmdRunner     *snapshot.LocalCommandRunner
 	opts          map[string]string
 }
 
@@ -46,6 +47,7 @@ func NewLinuxDeviceManager(shell []string, opts map[string]string) (*LinuxDevice
 
 	return &LinuxDeviceManager{
 		volumeMounter: snapshot.NewVolumeMounter(shell),
+		cmdRunner:     &snapshot.LocalCommandRunner{Shell: shell},
 		opts:          opts,
 	}, nil
 }
@@ -161,7 +163,7 @@ func (d *LinuxDeviceManager) hintFSTypes(partitions []*snapshot.PartitionInfo) (
 }
 
 func (d *LinuxDeviceManager) attemptFindFstab(dir string) ([]resources.FstabEntry, error) {
-	cmd, err := d.volumeMounter.CmdRunner().RunCommand(fmt.Sprintf("find %s -type f -wholename '*/etc/fstab'", dir))
+	cmd, err := d.cmdRunner.RunCommand(fmt.Sprintf("find %s -type f -wholename '*/etc/fstab'", dir))
 	if err != nil {
 		log.Error().Err(err).Msg("error searching for fstab")
 		return nil, nil
@@ -479,7 +481,7 @@ func (c *LinuxDeviceManager) identifyViaDeviceName(deviceName string, mountAll b
 		return []*snapshot.PartitionInfo{}, nil
 	}
 
-	blockDevices, err := c.volumeMounter.CmdRunner().GetBlockDevices()
+	blockDevices, err := c.cmdRunner.GetBlockDevices()
 	if err != nil {
 		return nil, err
 	}

Diff for: providers/os/connection/device/linux/lun.go

@@ -22,7 +22,7 @@ type scsiDeviceInfo struct {
 type scsiDevices = []scsiDeviceInfo
 
 func (c *LinuxDeviceManager) listScsiDevices() ([]scsiDeviceInfo, error) {
-	cmd, err := c.volumeMounter.CmdRunner().RunCommand("lsscsi --brief")
+	cmd, err := c.cmdRunner.RunCommand("lsscsi --brief")
 	if err != nil {
 		return nil, err
 	}

Diff for: providers/os/connection/snapshot/volumemounter.go

@@ -24,8 +24,6 @@ type VolumeMounter interface {
 	UmountP(partition *PartitionInfo) error
 	UnmountVolumeFromInstance() error
 	RemoveTempScanDir() error
-
-	CmdRunner() *LocalCommandRunner
 }
 
 type volumeMounter struct {
@@ -174,7 +172,3 @@ func (m *volumeMounter) RemoveTempScanDir() error {
 
 	return errors.Join(errs...)
 }
-
-func (m *volumeMounter) CmdRunner() *LocalCommandRunner {
-	return m.cmdRunner
-}