From e0e7a5ff088f9d5aa144358de9343a3f0802fcdc Mon Sep 17 00:00:00 2001
From: shubhamsugara22 <shubhamsugara22@gmail.com>
Date: Wed, 16 Oct 2024 23:42:09 +0530
Subject: [PATCH] Fix for openvex report oci id

---
 pkg/patch/patch.go | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkg/patch/patch.go b/pkg/patch/patch.go
index ffb1652b1..c22f9d54b 100644
--- a/pkg/patch/patch.go
+++ b/pkg/patch/patch.go
@@ -83,10 +83,18 @@ func patchWithContext(ctx context.Context, ch chan error, image, reportFile, pat
 		log.Warnf("Image name has no tag or digest, using latest as tag")
 		imageName = reference.TagNameOnly(imageName)
 	}
-	var tag string
-	taggedName, ok := imageName.(reference.Tagged)
-	if ok {
+	var tag  string
+	var digest string
+	if taggedName, ok := imageName.(reference.Tagged); ok {
 		tag = taggedName.Tag()
+		digest, err = FetchImageDigest(taggedName)
+		if err != nil {
+			return err
+		}
+		imageName, err = reference.WithDigest(imageName, digest)
+		if err != nil {
+			return err
+		}	
 	} else {
 		log.Warnf("Image name has no tag")
 	}
@@ -102,7 +110,12 @@ func patchWithContext(ctx context.Context, ch chan error, image, reportFile, pat
 	if err != nil {
 		return fmt.Errorf("%w with patched tag %s", err, patchedTag)
 	}
-	patchedImageName := fmt.Sprintf("%s:%s", imageName.Name(), patchedTag)
+	// Make sure the digest was successfully fetched earlier and is valid
+    if digest == "" {
+        return fmt.Errorf("failed to fetch digest for image %s", imageName) 
+    }
+	
+	patchedImageName := fmt.Sprintf("%s@sha256:%s", imageName.Name(), digest)
 
 	// Ensure working folder exists for call to InstallUpdates
 	if workingFolder == "" {
@@ -134,6 +147,13 @@ func patchWithContext(ctx context.Context, ch chan error, image, reportFile, pat
 		log.Debugf("updates to apply: %v", updates)
 	}
 
+	if updates != nil && len(updates.Updates) > 0 {
+		if err := vex.TryOutputVexDocument(updates, manager, patchedImageName, format, output); err != nil {
+			return err
+		}
+	}
+	return eg.Wait()
+
 	bkClient, err := buildkit.NewClient(ctx, bkOpts)
 	if err != nil {
 		return err