Update example, switch to extraArchives and reuse nerdctl download function

Signed-off-by: Justin Alvarez <[email protected]>

Author: pendo324

examples/default.yaml

@@ -196,12 +196,17 @@ containerd:
 #     vim was not installed in the guest. Make sure the package system is working correctly.
 #     Also see "/var/log/cloud-init-output.log" in the guest.
 
-# Adds an additional archive to the CIDATA image which is mounted on boot
-# Useful for provisioning scripts that run before mounts
-# extraArchive:
-#   location: "~/extra.tar.gz"
+# Adds an additional archive which matches the system architecture to the CIDATA image which is mounted on boot.
+# Useful for provisioning scripts that run before mounts (like `mode: dependency`) in case they need any file resources.
+# See pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh for an example of how to use an archive
+# from a provisioning script.
+# extraArchives:
+# - location: "~/extra.amd64.tar.gz"
 #   arch: "x86_64"
 #   digest: "sha256:..."
+# - location: "~/extra.aarch64.tar.gz"
+#   arch: "aarch64"
+#   digest: "sha256:..."
 
 # ===================================================================== #
 # FURTHER ADVANCED CONFIGURATION

pkg/limayaml/limayaml.go

@@ -31,7 +31,7 @@ type LimaYAML struct {
 	UseHostResolver   *bool             `yaml:"useHostResolver,omitempty" json:"useHostResolver,omitempty"` // DEPRECATED, use `HostResolver.Enabled` instead
 	PropagateProxyEnv *bool             `yaml:"propagateProxyEnv,omitempty" json:"propagateProxyEnv,omitempty"`
 	CACertificates    CACertificates    `yaml:"caCerts,omitempty" json:"caCerts,omitempty"`
-	ExtraArchive      *File             `yaml:"extraArchive,omitempty" json:"extraArchive,omitempty"`
+	ExtraArchives     []File            `yaml:"extraArchives,omitempty" json:"extraArchives,omitempty"`
 }
 
 type Arch = string

pkg/start/start.go

@@ -43,22 +43,35 @@ func ensureNerdctlArchiveCache(y *limayaml.LimaYAML) (string, error) {
 		return "", nil
 	}
 
-	errs := make([]error, len(y.Containerd.Archives))
-	for i := range y.Containerd.Archives {
-		f := &y.Containerd.Archives[i]
-		if f.Arch != *y.Arch {
+	location, errs := downloadAndCacheArchiveForArch(y.Containerd.Archives, *y.Arch, "nerdctl")
+	if location == "" {
+		return "", fmt.Errorf("failed to download the nerdctl archive, attempted %d candidates, errors=%v",
+			len(y.Containerd.Archives), errs)
+	}
+
+	return location, nil
+}
+
+// downloadAndCacheArchiveForArch iterates through a slice of File and tries to download the provided
+// file which matches the supplied arch.
+// The downloader caches remote downloads to disk, and then returns a file path to the archive.
+func downloadAndCacheArchiveForArch(files []limayaml.File, arch limayaml.Arch, archiveType string) (string, []error) {
+	errs := make([]error, len(files))
+	for i := range files {
+		f := &files[i]
+		if f.Arch != 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)
+		logrus.WithField("digest", f.Digest).Infof("Attempting to download the %s archive from %q", archiveType, f.Location)
 		res, err := downloader.Download("", f.Location, downloader.WithCache(), downloader.WithExpectedDigest(f.Digest))
 		if err != nil {
 			errs[i] = fmt.Errorf("failed to download %q: %w", f.Location, err)
 			continue
 		}
 		switch res.Status {
 		case downloader.StatusDownloaded:
-			logrus.Infof("Downloaded the nerdctl archive from %q", f.Location)
+			logrus.Infof("Downloaded the %s archive from %q", archiveType, f.Location)
 		case downloader.StatusUsedCache:
 			logrus.Infof("Using cache %q", res.CachePath)
 		default:
@@ -68,13 +81,11 @@ func ensureNerdctlArchiveCache(y *limayaml.LimaYAML) (string, error) {
 			if downloader.IsLocal(f.Location) {
 				return f.Location, nil
 			}
-			return "", fmt.Errorf("cache did not contain %q", f.Location)
+			errs[i] = fmt.Errorf("cache did not contain %q", f.Location)
 		}
 		return res.CachePath, nil
 	}
-
-	return "", fmt.Errorf("failed to download the nerdctl archive, attempted %d candidates, errors=%v",
-		len(y.Containerd.Archives), errs)
+	return "", errs
 }
 
 func Start(ctx context.Context, inst *store.Instance) error {
@@ -132,29 +143,13 @@ func Start(ctx context.Context, inst *store.Instance) error {
 	if nerdctlArchiveCache != "" {
 		args = append(args, "--nerdctl-archive", nerdctlArchiveCache)
 	}
-	if y.ExtraArchive != nil {
-		if y.ExtraArchive.Digest.String() != "" {
-			if !y.ExtraArchive.Digest.Algorithm().Available() {
-				return fmt.Errorf("expected digest algorithm %q is not available", y.ExtraArchive.Digest.Algorithm())
-			}
-			if err := y.ExtraArchive.Digest.Validate(); err != nil {
-				return err
-			}
-			eaBuf, err := os.ReadFile(y.ExtraArchive.Location)
-			if err != nil {
-				return err
-			}
-			verifier := y.ExtraArchive.Digest.Verifier()
-			if _, err := verifier.Write(eaBuf); err != nil {
-				return err
-			}
-			if !verifier.Verified() {
-				return errors.New("digest mismatch between supplied digest and calculated digest for extra archive")
-			}
-		}
-
-		args = append(args, "--extra-archive", y.ExtraArchive.Location)
+	location, errs := downloadAndCacheArchiveForArch(y.ExtraArchives, *y.Arch, "extrArchive")
+	if location == "" {
+		return fmt.Errorf("failed to download the extraArchive archive, attempted %d candidates, errors=%v",
+			len(y.ExtraArchives), errs)
 	}
+	args = append(args, "--extra-archive", location)
+
 	args = append(args, inst.Name)
 	haCmd := exec.CommandContext(ctx, self, args...)