Refactor: use fileutils for the nerdctl archive

Don't duplicate the code, but use fileutils.DownloadFile for all.

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

pkg/fileutils/download.go

@@ -8,17 +8,18 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func DownloadFile(dest string, f limayaml.File, description string, expectedArch limayaml.Arch) error {
+// DownloadFile downloads a file to the cache, optionally copying it to the destination. Returns path in cache.
+func DownloadFile(dest string, f limayaml.File, description string, expectedArch limayaml.Arch) (string, error) {
 	if f.Arch != expectedArch {
-		return fmt.Errorf("unsupported arch: %q", f.Arch)
+		return "", fmt.Errorf("unsupported arch: %q", f.Arch)
 	}
 	logrus.WithField("digest", f.Digest).Infof("Attempting to download %s from %q", description, f.Location)
 	res, err := downloader.Download(dest, f.Location,
 		downloader.WithCache(),
 		downloader.WithExpectedDigest(f.Digest),
 	)
 	if err != nil {
-		return fmt.Errorf("failed to download %q: %w", f.Location, err)
+		return "", fmt.Errorf("failed to download %q: %w", f.Location, err)
 	}
 	logrus.Debugf("res.ValidatedDigest=%v", res.ValidatedDigest)
 	switch res.Status {
@@ -29,5 +30,5 @@ func DownloadFile(dest string, f limayaml.File, description string, expectedArch
 	default:
 		logrus.Warnf("Unexpected result from downloader.Download(): %+v", res)
 	}
-	return nil
+	return res.CachePath, nil
 }

pkg/qemu/qemu.go

@@ -50,12 +50,12 @@ func EnsureDisk(cfg Config) error {
 		var ensuredBaseDisk bool
 		errs := make([]error, len(cfg.LimaYAML.Images))
 		for i, f := range cfg.LimaYAML.Images {
-			if err := fileutils.DownloadFile(baseDisk, f.File, "the image", *cfg.LimaYAML.Arch); err != nil {
+			if _, err := fileutils.DownloadFile(baseDisk, f.File, "the image", *cfg.LimaYAML.Arch); err != nil {
 				errs[i] = err
 				continue
 			}
 			if f.Kernel != nil {
-				if err := fileutils.DownloadFile(kernel, f.Kernel.File, "the kernel", *cfg.LimaYAML.Arch); err != nil {
+				if _, err := fileutils.DownloadFile(kernel, f.Kernel.File, "the kernel", *cfg.LimaYAML.Arch); err != nil {
 					errs[i] = err
 					continue
 				}
@@ -67,7 +67,7 @@ func EnsureDisk(cfg Config) error {
 				}
 			}
 			if f.Initrd != nil {
-				if err := fileutils.DownloadFile(initrd, *f.Initrd, "the initrd", *cfg.LimaYAML.Arch); err != nil {
+				if _, err := fileutils.DownloadFile(initrd, *f.Initrd, "the initrd", *cfg.LimaYAML.Arch); err != nil {
 					errs[i] = err
 					continue
 				}

pkg/start/start.go

@@ -16,6 +16,7 @@ import (
 	"github.com/lima-vm/lima/pkg/driverutil"
 
 	"github.com/lima-vm/lima/pkg/downloader"
+	"github.com/lima-vm/lima/pkg/fileutils"
 	hostagentevents "github.com/lima-vm/lima/pkg/hostagent/events"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	"github.com/lima-vm/lima/pkg/store"
@@ -37,33 +38,19 @@ func ensureNerdctlArchiveCache(y *limayaml.LimaYAML) (string, error) {
 	}
 
 	errs := make([]error, len(y.Containerd.Archives))
-	for i := range y.Containerd.Archives {
-		f := &y.Containerd.Archives[i]
-		if f.Arch != *y.Arch {
-			errs[i] = fmt.Errorf("unsupported arch: %q", f.Arch)
-			continue
-		}
-		logrus.WithField("digest", f.Digest).Infof("Attempting to download the nerdctl archive from %q", f.Location)
-		res, err := downloader.Download("", f.Location, downloader.WithCache(), downloader.WithExpectedDigest(f.Digest))
+	for i, f := range y.Containerd.Archives {
+		path, err := fileutils.DownloadFile("", f, "the nerdctl archive", *y.Arch)
 		if err != nil {
-			errs[i] = fmt.Errorf("failed to download %q: %w", f.Location, err)
+			errs[i] = err
 			continue
 		}
-		switch res.Status {
-		case downloader.StatusDownloaded:
-			logrus.Infof("Downloaded the nerdctl archive from %q", f.Location)
-		case downloader.StatusUsedCache:
-			logrus.Infof("Using cache %q", res.CachePath)
-		default:
-			logrus.Warnf("Unexpected result from downloader.Download(): %+v", res)
-		}
-		if res.CachePath == "" {
+		if path == "" {
 			if downloader.IsLocal(f.Location) {
 				return f.Location, nil
 			}
 			return "", fmt.Errorf("cache did not contain %q", f.Location)
 		}
-		return res.CachePath, nil
+		return path, nil
 	}
 
 	return "", fmt.Errorf("failed to download the nerdctl archive, attempted %d candidates, errors=%v",

pkg/vz/disk.go

@@ -29,7 +29,7 @@ func EnsureDisk(driver *driver.BaseDriver) error {
 		var ensuredBaseDisk bool
 		errs := make([]error, len(driver.Yaml.Images))
 		for i, f := range driver.Yaml.Images {
-			if err := fileutils.DownloadFile(baseDisk, f.File, "the image", *driver.Yaml.Arch); err != nil {
+			if _, err := fileutils.DownloadFile(baseDisk, f.File, "the image", *driver.Yaml.Arch); err != nil {
 				errs[i] = err
 				continue
 			}