fix(search): expose LastPullTimestamp and PushedBy on index ImageSummary (project-zot#3865)

ImageIndex2ImageSummary was missing LastPullTimestamp assignment, causing
multi-arch image queries to always return null for this field. Also adds
the PushedBy field (already stored in MetaDB) to the GraphQL schema and
both conversion paths (manifest and index).

Signed-off-by: cainydev <wajo432@gmail.com>
Signed-off-by: cainydev <wajo432@gmail.com>

Author: cainydev

pkg/extensions/search/convert/convert_test.go

@@ -279,19 +279,21 @@ func TestTaggedTimestamp(t *testing.T) {
 		Convey("TaggedTimestamp is populated from tag descriptor", func() {
 			taggedTime := time.Date(2024, time.January, 15, 10, 30, 0, 0, time.UTC)
 			pushTime := time.Date(2024, time.January, 10, 8, 0, 0, 0, time.UTC)
+			digestStr := godigest.FromString("sha256:abc123").String()
 
 			repoMeta := mTypes.RepoMeta{
 				Name: "repo",
 				Tags: map[string]mTypes.Descriptor{
 					"tag1": {
-						Digest:          "sha256:abc123",
+						Digest:          digestStr,
 						MediaType:       ispec.MediaTypeImageManifest,
 						TaggedTimestamp: taggedTime,
 					},
 				},
 				Statistics: map[string]mTypes.DescriptorStatistics{
-					"sha256:abc123": {
+					digestStr: {
 						PushTimestamp: pushTime,
+						PushedBy:      "testuser",
 					},
 				},
 			}
@@ -319,6 +321,8 @@ func TestTaggedTimestamp(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(imageSummary.TaggedTimestamp, ShouldNotBeNil)
 			So(*imageSummary.TaggedTimestamp, ShouldEqual, taggedTime)
+			So(imageSummary.PushedBy, ShouldNotBeNil)
+			So(*imageSummary.PushedBy, ShouldEqual, "testuser")
 		})
 
 		Convey("TaggedTimestamp falls back to PushTimestamp when zero", func() {
@@ -372,6 +376,7 @@ func TestTaggedTimestamp(t *testing.T) {
 		Convey("TaggedTimestamp is propagated to nested manifests in ImageIndex", func() {
 			taggedTime := time.Date(2024, time.January, 15, 10, 30, 0, 0, time.UTC)
 			pushTime := time.Date(2024, time.January, 10, 8, 0, 0, 0, time.UTC)
+			lastPullTime := time.Date(2024, time.February, 1, 12, 0, 0, 0, time.UTC)
 
 			// Create a multiarch image
 			multiarchImage := CreateMultiarchWith().Images([]Image{
@@ -392,7 +397,9 @@ func TestTaggedTimestamp(t *testing.T) {
 				},
 				Statistics: map[string]mTypes.DescriptorStatistics{
 					indexDigestStr: {
-						PushTimestamp: pushTime,
+						PushTimestamp:     pushTime,
+						LastPullTimestamp: lastPullTime,
+						PushedBy:          "indexuser",
 					},
 				},
 			}
@@ -405,6 +412,10 @@ func TestTaggedTimestamp(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(imageSummary.TaggedTimestamp, ShouldNotBeNil)
 			So(*imageSummary.TaggedTimestamp, ShouldEqual, taggedTime)
+			So(imageSummary.LastPullTimestamp, ShouldNotBeNil)
+			So(*imageSummary.LastPullTimestamp, ShouldEqual, lastPullTime)
+			So(imageSummary.PushedBy, ShouldNotBeNil)
+			So(*imageSummary.PushedBy, ShouldEqual, "indexuser")
 
 			// Verify that nested manifests also have the correct TaggedTimestamp
 			So(len(imageSummary.Manifests), ShouldBeGreaterThan, 0)

pkg/extensions/search/convert/metadb.go

@@ -427,10 +427,12 @@ func ImageIndex2ImageSummary(ctx context.Context, fullImageMeta mTypes.FullImage
 		manifestSummaries   = make([]*gql_generated.ManifestSummary, 0, len(fullImageMeta.Manifests))
 		indexBlobs          = map[string]int64{}
 
-		indexDigestStr  = fullImageMeta.Digest.String()
-		indexMediaType  = ispec.MediaTypeImageIndex
-		pushTimestamp   = fullImageMeta.Statistics.PushTimestamp
-		taggedTimestamp = fullImageMeta.TaggedTimestamp
+		indexDigestStr    = fullImageMeta.Digest.String()
+		indexMediaType    = ispec.MediaTypeImageIndex
+		lastPullTimestamp = fullImageMeta.Statistics.LastPullTimestamp
+		pushTimestamp     = fullImageMeta.Statistics.PushTimestamp
+		pushedBy          = fullImageMeta.Statistics.PushedBy
+		taggedTimestamp   = fullImageMeta.TaggedTimestamp
 	)
 
 	// Fallback to PushTimestamp if TaggedTimestamp is not available
@@ -490,27 +492,29 @@ func ImageIndex2ImageSummary(ctx context.Context, fullImageMeta mTypes.FullImage
 	}
 
 	indexSummary := gql_generated.ImageSummary{
-		RepoName:        &repo,
-		Tag:             &tag,
-		Digest:          &indexDigestStr,
-		MediaType:       &indexMediaType,
-		Manifests:       manifestSummaries,
-		LastUpdated:     imageLastUpdated,
-		IsSigned:        &isSigned,
-		SignatureInfo:   signaturesInfo,
-		Size:            ref(strconv.FormatInt(indexSize, 10)),
-		DownloadCount:   ref(fullImageMeta.Statistics.DownloadCount),
-		PushTimestamp:   &pushTimestamp,
-		TaggedTimestamp: &taggedTimestamp,
-		Description:     &annotations.Description,
-		Title:           &annotations.Title,
-		Documentation:   &annotations.Documentation,
-		Licenses:        &annotations.Licenses,
-		Labels:          &annotations.Labels,
-		Source:          &annotations.Source,
-		Vendor:          &annotations.Vendor,
-		Authors:         &annotations.Authors,
-		Referrers:       getReferrers(fullImageMeta.Referrers),
+		RepoName:          &repo,
+		Tag:               &tag,
+		Digest:            &indexDigestStr,
+		MediaType:         &indexMediaType,
+		Manifests:         manifestSummaries,
+		LastUpdated:       imageLastUpdated,
+		IsSigned:          &isSigned,
+		SignatureInfo:     signaturesInfo,
+		Size:              ref(strconv.FormatInt(indexSize, 10)),
+		DownloadCount:     ref(fullImageMeta.Statistics.DownloadCount),
+		LastPullTimestamp: &lastPullTimestamp,
+		PushTimestamp:     &pushTimestamp,
+		PushedBy:          &pushedBy,
+		TaggedTimestamp:   &taggedTimestamp,
+		Description:       &annotations.Description,
+		Title:             &annotations.Title,
+		Documentation:     &annotations.Documentation,
+		Licenses:          &annotations.Licenses,
+		Labels:            &annotations.Labels,
+		Source:            &annotations.Source,
+		Vendor:            &annotations.Vendor,
+		Authors:           &annotations.Authors,
+		Referrers:         getReferrers(fullImageMeta.Referrers),
 	}
 
 	return &indexSummary, indexBlobs, nil
@@ -534,6 +538,7 @@ func ImageManifest2ImageSummary(ctx context.Context, fullImageMeta mTypes.FullIm
 		isSigned          = isImageSigned(fullImageMeta.Signatures)
 		lastPullTimestamp = fullImageMeta.Statistics.LastPullTimestamp
 		pushTimestamp     = fullImageMeta.Statistics.PushTimestamp
+		pushedBy          = fullImageMeta.Statistics.PushedBy
 		taggedTimestamp   = fullImageMeta.TaggedTimestamp
 	)
 
@@ -594,6 +599,7 @@ func ImageManifest2ImageSummary(ctx context.Context, fullImageMeta mTypes.FullIm
 		DownloadCount:     &downloadCount,
 		LastPullTimestamp: &lastPullTimestamp,
 		PushTimestamp:     &pushTimestamp,
+		PushedBy:          &pushedBy,
 		TaggedTimestamp:   &taggedTimestamp,
 		Description:       &annotations.Description,
 		Title:             &annotations.Title,

pkg/extensions/search/gql_generated/generated.go

@@ -213,6 +213,10 @@ type ImageSummary {
     """
     PushTimestamp: Time
     """
+    The user who pushed the image to the registry
+    """
+    PushedBy: String
+    """
     Timestamp when the image manifest was tagged (if the data is unavailable it falls back to when the image was pushed to the registry)
     """
     TaggedTimestamp: Time