refactor: remove old qemuimgutil and nativeimgutil packages

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

fixed golangci-lint errs

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

Author: Horiodino

pkg/imgutil/nativeimgutil/interface.go

@@ -9,25 +9,25 @@ import (
 	imgutil "github.com/lima-vm/lima/pkg/imgutil/qemuimgutil"
 )
 
-// NativeImageUtil is the native implementation of the proxyimgutil.Interface
+// NativeImageUtil is the native implementation of the proxyimgutil Interface.
 type NativeImageUtil struct{}
 
-// NewNativeImageUtil returns a new NativeImageUtil instance
+// NewNativeImageUtil returns a new NativeImageUtil instance.
 func NewNativeImageUtil() *NativeImageUtil {
 	return &NativeImageUtil{}
 }
 
-// CreateDisk creates a new raw disk image with the specified size
+// CreateDisk creates a new raw disk image with the specified size.
 func (n *NativeImageUtil) CreateDisk(disk string, size int) error {
 	return createRawDisk(disk, size)
 }
 
-// ResizeDisk resizes an existing raw disk image to the specified size
+// ResizeDisk resizes an existing raw disk image to the specified size.
 func (n *NativeImageUtil) ResizeDisk(disk string, size int) error {
 	return resizeRawDisk(disk, size)
 }
 
-// ConvertToRaw converts a disk image to raw format
+// ConvertToRaw converts a disk image to raw format.
 func (n *NativeImageUtil) ConvertToRaw(source, dest string, size *int64, allowSourceWithBackingFile bool) error {
 	return convertToRaw(source, dest, size, allowSourceWithBackingFile)
 }
@@ -36,23 +36,22 @@ func (n *NativeImageUtil) MakeSparse(f *os.File, offset int64) error {
 	return makeSparse(f, offset)
 }
 
-// NativeInfoProvider is the native implementation of the proxyimgutil.InfoProvider
+// NativeInfoProvider is the native implementation of the proxyimgutil.InfoProvider.
 type NativeInfoProvider struct{}
 
-// NewNativeInfoProvider returns a new NativeInfoProvider instance
+// NewNativeInfoProvider returns a new NativeInfoProvider instance.
 func NewNativeInfoProvider() *NativeInfoProvider {
 	return &NativeInfoProvider{}
 }
 
-// Just a placeholder for the interface
 // GetInfo retrieves information about a disk image
-// This is a stub implementation as the native package doesn't provide this functionality
-func (n *NativeInfoProvider) GetInfo(path string) (*imgutil.Info, error) {
+// This is a stub implementation as the native package doesn't provide this functionality.
+func (n *NativeInfoProvider) GetInfo(_ string) (*imgutil.Info, error) {
 	return nil, nil
 }
 
 // AcceptableAsBasedisk checks if a disk image is acceptable as a base disk
-// This is a stub implementation as the native package doesn't provide this functionality
-func (n *NativeInfoProvider) AcceptableAsBasedisk(info *imgutil.Info) error {
+// This is a stub implementation as the native package doesn't provide this functionality.
+func (n *NativeInfoProvider) AcceptableAsBasedisk(_ *imgutil.Info) error {
 	return nil
 }

pkg/imgutil/proxyimgutil/interface.go

@@ -9,22 +9,22 @@ import (
 	imgutil "github.com/lima-vm/lima/pkg/imgutil/qemuimgutil"
 )
 
-// Interface defines the common operations for disk image utilities
+// Interface defines the common operations for disk image utilities.
 type Interface interface {
-	// CreateDisk creates a new disk image with the specified size
+	// CreateDisk creates a new disk image with the specified size.
 	CreateDisk(disk string, size int) error
 
-	// ResizeDisk resizes an existing disk image to the specified size
+	// ResizeDisk resizes an existing disk image to the specified size.
 	ResizeDisk(disk string, size int) error
 
-	// ConvertToRaw converts a disk image to raw format
+	// ConvertToRaw converts a disk image to raw format.
 	ConvertToRaw(source, dest string, size *int64, allowSourceWithBackingFile bool) error
 
-	// MakeSparse makes a file sparse, starting from the specified offset
+	// MakeSparse makes a file sparse, starting from the specified offset.
 	MakeSparse(f *os.File, offset int64) error
 }
 
-// InfoProvider defines the interface for obtaining disk image information
+// InfoProvider defines the interface for obtaining disk image information.
 type InfoProvider interface {
 	// GetInfo retrieves information about a disk image
 	GetInfo(path string) (*imgutil.Info, error)

pkg/imgutil/proxyimgutil/proxyimgutil.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 
 	"github.com/lima-vm/lima/pkg/imgutil/nativeimgutil"
+	"github.com/lima-vm/lima/pkg/imgutil/qemuimgutil"
 )
 
 // NewProxyImageUtil returns a proxy implementation for raw and qcow2 image formats.
@@ -15,7 +16,7 @@ func NewProxyImageUtil(format string) (Interface, InfoProvider, error) {
 	case "raw":
 		return nativeimgutil.NewNativeImageUtil(), nativeimgutil.NewNativeInfoProvider(), nil
 	case "qcow2":
-		return nativeimgutil.NewNativeImageUtil(), nativeimgutil.NewNativeInfoProvider(), nil
+		return qemuimgutil.NewQemuImageUtil(), qemuimgutil.NewQemuInfoProvider(), nil
 	default:
 		return nil, nil, fmt.Errorf("unsupported image format: %s", format)
 	}

pkg/imgutil/qemuimgutil/interface.go

@@ -8,37 +8,35 @@ import (
 	"os"
 )
 
-// QemuImageUtil is the QEMU implementation of the proxyimgutil.Interface
+// QemuImageUtil is the QEMU implementation of the proxyimgutil Interface.
 type QemuImageUtil struct {
 	// Default format to use when creating disks
 	DefaultFormat string
 }
 
-// NewQemuImageUtil returns a new QemuImageUtil instance with "qcow2" as the default format
+// NewQemuImageUtil returns a new QemuImageUtil instance with "qcow2" as the default format.
 func NewQemuImageUtil() *QemuImageUtil {
 	return &QemuImageUtil{
 		DefaultFormat: "qcow2",
 	}
 }
 
-// CreateDisk creates a new disk image with the specified size
+// CreateDisk creates a new disk image with the specified size.
 func (q *QemuImageUtil) CreateDisk(disk string, size int) error {
 	return createDisk(disk, q.DefaultFormat, size)
 }
 
-// ResizeDisk resizes an existing disk image to the specified size
+// ResizeDisk resizes an existing disk image to the specified size.
 func (q *QemuImageUtil) ResizeDisk(disk string, size int) error {
-	// Get the format of the disk
 	info, err := getInfo(disk)
 	if err != nil {
 		return fmt.Errorf("failed to get info for disk %q: %w", disk, err)
 	}
 	return resizeDisk(disk, info.Format, size)
 }
 
-// ConvertToRaw converts a disk image to raw format
+// ConvertToRaw converts a disk image to raw format.
 func (q *QemuImageUtil) ConvertToRaw(source, dest string, size *int64, allowSourceWithBackingFile bool) error {
-	// Check if source has a backing file and we don't allow it
 	if !allowSourceWithBackingFile {
 		info, err := getInfo(source)
 		if err != nil {
@@ -49,12 +47,10 @@ func (q *QemuImageUtil) ConvertToRaw(source, dest string, size *int64, allowSour
 		}
 	}
 
-	// Convert to raw
 	if err := convertToRaw(source, dest); err != nil {
 		return err
 	}
 
-	// If size is specified, resize the raw disk after conversion
 	if size != nil {
 		destInfo, err := getInfo(dest)
 		if err != nil {
@@ -69,20 +65,20 @@ func (q *QemuImageUtil) ConvertToRaw(source, dest string, size *int64, allowSour
 	return nil
 }
 
-func (q *QemuImageUtil) MakeSparse(f *os.File, offset int64) error {
-	// Just a placeholder for the interface
+// MakeSparse is a stub implementation as the native package doesn't provide this functionality.
+func (q *QemuImageUtil) MakeSparse(_ *os.File, _ int64) error {
 	return nil
 }
 
-// QemuInfoProvider is the QEMU implementation of the proxyimgutil.InfoProvider
+// QemuInfoProvider is the QEMU implementation of the proxyimgutil InfoProvider.
 type QemuInfoProvider struct{}
 
-// NewQemuInfoProvider returns a new QemuInfoProvider instance
+// NewQemuInfoProvider returns a new QemuInfoProvider instance.
 func NewQemuInfoProvider() *QemuInfoProvider {
 	return &QemuInfoProvider{}
 }
 
-// GetInfo retrieves information about a disk image
+// GetInfo retrieves information about a disk image.
 func (q *QemuInfoProvider) GetInfo(path string) (*Info, error) {
 	qemuInfo, err := getInfo(path)
 	if err != nil {
@@ -92,7 +88,7 @@ func (q *QemuInfoProvider) GetInfo(path string) (*Info, error) {
 	return qemuInfo, nil
 }
 
-// AcceptableAsBasedisk checks if a disk image is acceptable as a base disk
+// AcceptableAsBasedisk checks if a disk image is acceptable as a base disk.
 func (q *QemuInfoProvider) AcceptableAsBasedisk(info *Info) error {
 	return acceptableAsBasedisk(info)
 }