fix: ImageSummary should have author information (#976)

Signed-off-by: Ana-Roberta Lisca <ana.kagome@yahoo.com>

pkg/extensions/search/common/common.go

@@ -167,6 +167,7 @@ type ImageAnnotations struct {
 	Source        string
 	Labels        string
 	Vendor        string
+	Authors       string
 }
 
 /*
@@ -195,6 +196,12 @@ func GetVendor(annotations map[string]string) string {
 	return GetAnnotationValue(annotations, ispec.AnnotationVendor, LabelAnnotationVendor)
 }
 
+func GetAuthors(annotations map[string]string) string {
+	authors := annotations[ispec.AnnotationAuthors]
+
+	return authors
+}
+
 func GetTitle(annotations map[string]string) string {
 	return GetAnnotationValue(annotations, ispec.AnnotationTitle, LabelAnnotationTitle)
 }
@@ -232,7 +239,7 @@ func GetAnnotations(annotations, labels map[string]string) ImageAnnotations {
 
 	documentation := GetDocumentation(annotations)
 	if documentation == "" {
-		documentation = GetDocumentation(annotations)
+		documentation = GetDocumentation(labels)
 	}
 
 	source := GetSource(annotations)
@@ -255,6 +262,11 @@ func GetAnnotations(annotations, labels map[string]string) ImageAnnotations {
 		vendor = GetVendor(labels)
 	}
 
+	authors := GetAuthors(annotations)
+	if authors == "" {
+		authors = GetAuthors(labels)
+	}
+
 	return ImageAnnotations{
 		Description:   description,
 		Title:         title,
@@ -263,5 +275,6 @@ func GetAnnotations(annotations, labels map[string]string) ImageAnnotations {
 		Licenses:      licenses,
 		Labels:        categories,
 		Vendor:        vendor,
+		Authors:       authors,
 	}
 }

pkg/extensions/search/common/common_test.go

@@ -1984,6 +1984,150 @@ func TestGetRepositories(t *testing.T) {
 	})
 }
 
+func TestGlobalSearchImageAuthor(t *testing.T) {
+	port := GetFreePort()
+	baseURL := GetBaseURL(port)
+	conf := config.New()
+	conf.HTTP.Port = port
+	tempDir := t.TempDir()
+	conf.Storage.RootDirectory = tempDir
+
+	defaultVal := true
+	conf.Extensions = &extconf.ExtensionConfig{
+		Search: &extconf.SearchConfig{BaseConfig: extconf.BaseConfig{Enable: &defaultVal}},
+	}
+
+	conf.Extensions.Search.CVE = nil
+
+	ctlr := api.NewController(conf)
+
+	go func() {
+		// this blocks
+		if err := ctlr.Run(context.Background()); err != nil {
+			return
+		}
+	}()
+
+	// wait till ready
+	for {
+		_, err := resty.R().Get(baseURL)
+		if err == nil {
+			break
+		}
+
+		time.Sleep(100 * time.Millisecond)
+	}
+
+	// shut down server
+
+	defer func() {
+		ctx := context.Background()
+		_ = ctlr.Server.Shutdown(ctx)
+	}()
+
+	Convey("Test global search with author in manifest's annotations", t, func() {
+		cfg, layers, manifest, err := GetImageComponents(10000)
+		So(err, ShouldBeNil)
+
+		manifest.Annotations = make(map[string]string)
+		manifest.Annotations["org.opencontainers.image.authors"] = "author name"
+		err = UploadImage(
+			Image{
+				Config:   cfg,
+				Layers:   layers,
+				Manifest: manifest,
+				Tag:      "latest",
+			}, baseURL, "repowithauthor")
+
+		So(err, ShouldBeNil)
+
+		query := `
+			{
+				GlobalSearch(query:""){
+					Images {
+						RepoName
+						Tag
+						LastUpdated
+						Size
+						IsSigned
+						Vendor
+						Score
+						Platform {
+							Os
+							Arch
+						}
+						Vulnerabilities {
+							Count
+							MaxSeverity
+						}
+						Authors
+					}
+				}
+			}`
+		resp, err := resty.R().Get(baseURL + graphqlQueryPrefix + "?query=" + url.QueryEscape(query))
+		So(resp, ShouldNotBeNil)
+		So(err, ShouldBeNil)
+		So(resp.StatusCode(), ShouldEqual, 200)
+
+		responseStruct := &GlobalSearchResultResp{}
+
+		err = json.Unmarshal(resp.Body(), responseStruct)
+		So(err, ShouldBeNil)
+
+		So(responseStruct.GlobalSearchResult.GlobalSearch.Images[0].Authors, ShouldEqual, "author name")
+	})
+
+	Convey("Test global search with author in manifest's config", t, func() {
+		cfg, layers, manifest, err := GetImageComponents(10000)
+		So(err, ShouldBeNil)
+
+		err = UploadImage(
+			Image{
+				Config:   cfg,
+				Layers:   layers,
+				Manifest: manifest,
+				Tag:      "latest",
+			}, baseURL, "repowithauthorconfig")
+
+		So(err, ShouldBeNil)
+
+		query := `
+			{
+				GlobalSearch(query:""){
+					Images {
+						RepoName
+						Tag
+						LastUpdated
+						Size
+						IsSigned
+						Vendor
+						Score
+						Platform {
+							Os
+							Arch
+						}
+						Vulnerabilities {
+							Count
+							MaxSeverity
+						}
+						Authors
+					}
+				}
+			}`
+		resp, err := resty.R().Get(baseURL + graphqlQueryPrefix + "?query=" + url.QueryEscape(query))
+		So(resp, ShouldNotBeNil)
+		So(err, ShouldBeNil)
+		So(resp.StatusCode(), ShouldEqual, 200)
+
+		responseStruct := &GlobalSearchResultResp{}
+
+		err = json.Unmarshal(resp.Body(), responseStruct)
+		So(err, ShouldBeNil)
+
+		So(responseStruct.GlobalSearchResult.GlobalSearch.Images[1].Authors, ShouldEqual, "ZotUser")
+	})
+}
+
 func TestGlobalSearch(t *testing.T) {
 	Convey("Test global search", t, func() {
 		subpath := "/a"

pkg/extensions/search/common/model.go

@@ -40,6 +40,7 @@ type ImageSummary struct {
 	History         []LayerHistory            `json:"history"`
 	Layers          []LayerSummary            `json:"layers"`
 	Vulnerabilities ImageVulnerabilitySummary `json:"vulnerabilities"`
+	Authors         string                    `json:"authors"`
 }
 
 type OsArch struct {