update find-images output to contain the images' digest

src/pkg/packager/prepare.go

@@ -211,7 +211,14 @@ func (p *Packager) FindImages() (imgMap map[string][]string, err error) {
  for _, image := range sortedImages {
  // Use print because we want this dumped to stdout
  imagesMap[component.Name] = append(imagesMap[component.Name], image)
- componentDefinition += fmt.Sprintf(" - %s\n", image)
+ imageWithSha, err := utils.GetImageWithSha(image)
+ if err != nil {
+ message.WarnErrf(err, "Problem getting image with sha for %s: %s", image, err.Error())
+ erroredCosignLookups = append(erroredCosignLookups, image)
+ continue
+ }
+ message.Debugf("Image with sha: %s", imageWithSha)
+ componentDefinition += fmt.Sprintf(" - %s\n", imageWithSha)
  }
  }
 
@@ -228,14 +235,6 @@ func (p *Packager) FindImages() (imgMap map[string][]string, err error) {
  validImages = append(validImages, image)
  }
  }
-
- if len(validImages) > 0 {
- componentDefinition += fmt.Sprintf(" # Possible images - %s - %s\n", p.cfg.Pkg.Metadata.Name, component.Name)
- for _, image := range validImages {
- imagesMap[component.Name] = append(imagesMap[component.Name], image)
- componentDefinition += fmt.Sprintf(" - %s\n", image)
- }
- }
  }
 
  spinner.Success()

src/pkg/utils/image.go

@@ -7,15 +7,32 @@ package utils
 import (
  "encoding/json"
  "fmt"
+ "github.com/google/go-containerregistry/pkg/crane"
  "os"
  "path/filepath"
+ "regexp"
 
  "github.com/defenseunicorns/zarf/src/pkg/transform"
  v1 "github.com/google/go-containerregistry/pkg/v1"
  "github.com/google/go-containerregistry/pkg/v1/layout"
  ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+// GetImageWithSha returns the image reference and the sha256 digest of the image.
+func GetImageWithSha(imgSrc string) (string, error) {
+ regex := regexp.MustCompile(`^.*@sha256:[a-f0-9]{64}$`)
+ if regex.MatchString(imgSrc) {
+ return imgSrc, nil
+ }
+
+ imgDescriptor, err := crane.Head(imgSrc)
+ if err != nil {
+ return "", fmt.Errorf("unable to pull image (%s) to get the sha256 digest: %w", imgSrc, err)
+ }
+
+ return fmt.Sprintf("%s@%s", imgSrc, imgDescriptor.Digest), nil
+}
+
 // LoadOCIImage returns a v1.Image with the image ref specified from a location provided, or an error if the image cannot be found.
 func LoadOCIImage(imgPath string, refInfo transform.Image) (v1.Image, error) {
  // Use the manifest within the index.json to load the specific image we want