github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-16 20:38:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(search): update search pattern matching rules (#1257)

Browse Source 
Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>
This commit is contained in:
LaurentiuNiculae
2023-03-22 19:31:53 +02:00
committed by GitHub
parent fb85c8678c
commit f8a77bc42f
14 changed files with 83 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/extensions/search/common/common_test.go
+6 -6
View File
@@ -3150,7 +3150,7 @@ func TestGlobalSearchImageAuthor(t *testing.T) {
Repos {
Name LastUpdated Size
Platforms { Os Arch }
Vendors Score
Vendors
NewestImage {
RepoName Tag LastUpdated Size IsSigned
Authors
@@ -3213,7 +3213,7 @@ func TestGlobalSearchImageAuthor(t *testing.T) {
Repos {
Name LastUpdated Size
Platforms { Os Arch }
Vendors Score
Vendors
NewestImage {
RepoName Tag LastUpdated Size IsSigned
Authors
@@ -3427,7 +3427,7 @@ func TestGlobalSearch(t *testing.T) {
Repos {
Name LastUpdated Size
Platforms { Os Arch }
Vendors Score
Vendors
NewestImage {
RepoName Tag LastUpdated Size
Manifests{
@@ -3516,7 +3516,7 @@ func TestGlobalSearch(t *testing.T) {
Repos {
Name LastUpdated Size
Platforms { Os Arch }
Vendors Score
Vendors
NewestImage {
RepoName Tag LastUpdated Size
Manifests {
@@ -3753,7 +3753,7 @@ func TestGlobalSearch(t *testing.T) {
Repos {
Name LastUpdated Size
Platforms { Os Arch }
Vendors Score
Vendors
NewestImage {
RepoName Tag LastUpdated Size
Manifests {
@@ -3843,7 +3843,7 @@ func TestGlobalSearch(t *testing.T) {
Repos {
Name LastUpdated Size
Platforms { Os Arch }
Vendors Score
Vendors
NewestImage {
RepoName Tag LastUpdated Size
Manifests {
pkg/extensions/search/common/model.go
-2
View File
@@ -15,7 +15,6 @@ type RepoSummary struct {
Size string `json:"size"`
Platforms []Platform `json:"platforms"`
Vendors []string `json:"vendors"`
Score int `json:"score"`
NewestImage ImageSummary `json:"newestImage"`
}
@@ -33,7 +32,6 @@ type ImageSummary struct {
Licenses string `json:"licenses"`
Labels string `json:"labels"`
Title string `json:"title"`
Score int `json:"score"`
Source string `json:"source"`
Documentation string `json:"documentation"`
Authors string `json:"authors"`
pkg/extensions/search/common/oci_layout.go
-3
View File
@@ -482,7 +482,6 @@ func (olu BaseOciLayoutUtils) GetExpandedRepoInfo(repoName string) (RepoInfo, er
manifestDigest := man.Digest.String()
configDigest := manifest.Config.Digest.String()
lastUpdated := GetImageLastUpdated(imageConfigInfo)
score := 0
imageSummary := ImageSummary{
RepoName: repoName,
@@ -501,7 +500,6 @@ func (olu BaseOciLayoutUtils) GetExpandedRepoInfo(repoName string) (RepoInfo, er
LastUpdated: lastUpdated,
IsSigned: isSigned,
Size: size,
Score: score,
Description: annotations.Description,
Title: annotations.Title,
Documentation: annotations.Documentation,
@@ -546,7 +544,6 @@ func (olu BaseOciLayoutUtils) GetExpandedRepoInfo(repoName string) (RepoInfo, er
Platforms: repoPlatforms,
NewestImage: lastUpdatedImageSummary,
Vendors: repoVendors,
Score: -1,
}
repo.Summary = summary
pkg/extensions/search/convert/repodb.go
-4
View File
@@ -86,7 +86,6 @@ func RepoMeta2RepoSummary(ctx context.Context, repoMeta repodb.RepoMetadata,
}
repoSize := strconv.FormatInt(size, 10)
score := 0
repoPlatforms := make([]*gql_generated.Platform, 0, len(repoPlatformsSet))
for _, platform := range repoPlatformsSet {
@@ -127,7 +126,6 @@ func RepoMeta2RepoSummary(ctx context.Context, repoMeta repodb.RepoMetadata,
Size: &repoSize,
Platforms: repoPlatforms,
Vendors: repoVendors,
Score: &score,
NewestImage: lastUpdatedImageSummary,
DownloadCount: &repoDownloadCount,
StarCount: &repoStarCount,
@@ -632,7 +630,6 @@ func RepoMeta2ExpandedRepoInfo(ctx context.Context, repoMeta repodb.RepoMetadata
}
repoSize := strconv.FormatInt(size, 10)
score := 0
repoPlatforms := make([]*gql_generated.Platform, 0, len(repoPlatformsSet))
for _, platform := range repoPlatformsSet {
@@ -672,7 +669,6 @@ func RepoMeta2ExpandedRepoInfo(ctx context.Context, repoMeta repodb.RepoMetadata
Size: &repoSize,
Platforms: repoPlatforms,
Vendors: repoVendors,
Score: &score,
NewestImage: lastUpdatedImageSummary,
DownloadCount: &repoDownloadCount,
StarCount: &repoStarCount,
pkg/extensions/search/gql_generated/generated.go
-193
View File
@@ -90,7 +90,6 @@ type ComplexityRoot struct {
MediaType func(childComplexity int) int
Referrers func(childComplexity int) int
RepoName func(childComplexity int) int
Score func(childComplexity int) int
Size func(childComplexity int) int
Source func(childComplexity int) int
Tag func(childComplexity int) int
@@ -111,7 +110,6 @@ type ComplexityRoot struct {
LayerSummary struct {
Digest func(childComplexity int) int
Score func(childComplexity int) int
Size func(childComplexity int) int
}
@@ -191,7 +189,6 @@ type ComplexityRoot struct {
Name func(childComplexity int) int
NewestImage func(childComplexity int) int
Platforms func(childComplexity int) int
Score func(childComplexity int) int
Size func(childComplexity int) int
StarCount func(childComplexity int) int
Vendors func(childComplexity int) int
@@ -452,13 +449,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
return e.complexity.ImageSummary.RepoName(childComplexity), true
case "ImageSummary.Score":
if e.complexity.ImageSummary.Score == nil {
break
}
return e.complexity.ImageSummary.Score(childComplexity), true
case "ImageSummary.Size":
if e.complexity.ImageSummary.Size == nil {
break
@@ -536,13 +526,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
return e.complexity.LayerSummary.Digest(childComplexity), true
case "LayerSummary.Score":
if e.complexity.LayerSummary.Score == nil {
break
}
return e.complexity.LayerSummary.Score(childComplexity), true
case "LayerSummary.Size":
if e.complexity.LayerSummary.Size == nil {
break
@@ -946,13 +929,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
return e.complexity.RepoSummary.Platforms(childComplexity), true
case "RepoSummary.Score":
if e.complexity.RepoSummary.Score == nil {
break
}
return e.complexity.RepoSummary.Score(childComplexity), true
case "RepoSummary.Size":
if e.complexity.RepoSummary.Size == nil {
break
@@ -1200,10 +1176,6 @@ type ImageSummary {
"""
Title: String
"""
Integer used to rank search results by relevance
"""
Score: Int
"""
URL to get source code for building the image
"""
Source: String
@@ -1318,10 +1290,6 @@ type RepoSummary {
"""
Vendors: [String]
"""
Integer used to rank search results by relevance
"""
Score: Int
"""
Details of the newest image inside the repository
NOTE: not the image with the ` + "`" + `latest` + "`" + ` tag, the one with the most recent created timestamp
"""
@@ -1356,10 +1324,6 @@ type LayerSummary {
Digest of the layer content
"""
Digest: String
"""
Integer used to rank search results by relevance
"""
Score: Int
}
"""
@@ -2645,8 +2609,6 @@ func (ec *executionContext) fieldContext_GlobalSearchResult_Images(ctx context.C
return ec.fieldContext_ImageSummary_Labels(ctx, field)
case "Title":
return ec.fieldContext_ImageSummary_Title(ctx, field)
case "Score":
return ec.fieldContext_ImageSummary_Score(ctx, field)
case "Source":
return ec.fieldContext_ImageSummary_Source(ctx, field)
case "Documentation":
@@ -2712,8 +2674,6 @@ func (ec *executionContext) fieldContext_GlobalSearchResult_Repos(ctx context.Co
return ec.fieldContext_RepoSummary_Platforms(ctx, field)
case "Vendors":
return ec.fieldContext_RepoSummary_Vendors(ctx, field)
case "Score":
return ec.fieldContext_RepoSummary_Score(ctx, field)
case "NewestImage":
return ec.fieldContext_RepoSummary_NewestImage(ctx, field)
case "DownloadCount":
@@ -2771,8 +2731,6 @@ func (ec *executionContext) fieldContext_GlobalSearchResult_Layers(ctx context.C
return ec.fieldContext_LayerSummary_Size(ctx, field)
case "Digest":
return ec.fieldContext_LayerSummary_Digest(ctx, field)
case "Score":
return ec.fieldContext_LayerSummary_Score(ctx, field)
}
return nil, fmt.Errorf("no field named %q was found under type LayerSummary", field.Name)
},
@@ -3542,47 +3500,6 @@ func (ec *executionContext) fieldContext_ImageSummary_Title(ctx context.Context,
return fc, nil
}
func (ec *executionContext) _ImageSummary_Score(ctx context.Context, field graphql.CollectedField, obj *ImageSummary) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_ImageSummary_Score(ctx, field)
if err != nil {
return graphql.Null
}
ctx = graphql.WithFieldContext(ctx, fc)
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
ctx = rctx // use context from middleware stack in children
return obj.Score, nil
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
return graphql.Null
}
res := resTmp.(*int)
fc.Result = res
return ec.marshalOInt2ᚖint(ctx, field.Selections, res)
}
func (ec *executionContext) fieldContext_ImageSummary_Score(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
fc = &graphql.FieldContext{
Object: "ImageSummary",
Field: field,
IsMethod: false,
IsResolver: false,
Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
return nil, errors.New("field of type Int does not have child fields")
},
}
return fc, nil
}
func (ec *executionContext) _ImageSummary_Source(ctx context.Context, field graphql.CollectedField, obj *ImageSummary) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_ImageSummary_Source(ctx, field)
if err != nil {
@@ -3969,8 +3886,6 @@ func (ec *executionContext) fieldContext_LayerHistory_Layer(ctx context.Context,
return ec.fieldContext_LayerSummary_Size(ctx, field)
case "Digest":
return ec.fieldContext_LayerSummary_Digest(ctx, field)
case "Score":
return ec.fieldContext_LayerSummary_Score(ctx, field)
}
return nil, fmt.Errorf("no field named %q was found under type LayerSummary", field.Name)
},
@@ -4113,47 +4028,6 @@ func (ec *executionContext) fieldContext_LayerSummary_Digest(ctx context.Context
return fc, nil
}
func (ec *executionContext) _LayerSummary_Score(ctx context.Context, field graphql.CollectedField, obj *LayerSummary) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_LayerSummary_Score(ctx, field)
if err != nil {
return graphql.Null
}
ctx = graphql.WithFieldContext(ctx, fc)
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
ctx = rctx // use context from middleware stack in children
return obj.Score, nil
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
return graphql.Null
}
res := resTmp.(*int)
fc.Result = res
return ec.marshalOInt2ᚖint(ctx, field.Selections, res)
}
func (ec *executionContext) fieldContext_LayerSummary_Score(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
fc = &graphql.FieldContext{
Object: "LayerSummary",
Field: field,
IsMethod: false,
IsResolver: false,
Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
return nil, errors.New("field of type Int does not have child fields")
},
}
return fc, nil
}
func (ec *executionContext) _ManifestSummary_Digest(ctx context.Context, field graphql.CollectedField, obj *ManifestSummary) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_ManifestSummary_Digest(ctx, field)
if err != nil {
@@ -4487,8 +4361,6 @@ func (ec *executionContext) fieldContext_ManifestSummary_Layers(ctx context.Cont
return ec.fieldContext_LayerSummary_Size(ctx, field)
case "Digest":
return ec.fieldContext_LayerSummary_Digest(ctx, field)
case "Score":
return ec.fieldContext_LayerSummary_Score(ctx, field)
}
return nil, fmt.Errorf("no field named %q was found under type LayerSummary", field.Name)
},
@@ -4966,8 +4838,6 @@ func (ec *executionContext) fieldContext_PaginatedImagesResult_Results(ctx conte
return ec.fieldContext_ImageSummary_Labels(ctx, field)
case "Title":
return ec.fieldContext_ImageSummary_Title(ctx, field)
case "Score":
return ec.fieldContext_ImageSummary_Score(ctx, field)
case "Source":
return ec.fieldContext_ImageSummary_Source(ctx, field)
case "Documentation":
@@ -5083,8 +4953,6 @@ func (ec *executionContext) fieldContext_PaginatedReposResult_Results(ctx contex
return ec.fieldContext_RepoSummary_Platforms(ctx, field)
case "Vendors":
return ec.fieldContext_RepoSummary_Vendors(ctx, field)
case "Score":
return ec.fieldContext_RepoSummary_Score(ctx, field)
case "NewestImage":
return ec.fieldContext_RepoSummary_NewestImage(ctx, field)
case "DownloadCount":
@@ -5854,8 +5722,6 @@ func (ec *executionContext) fieldContext_Query_Image(ctx context.Context, field
return ec.fieldContext_ImageSummary_Labels(ctx, field)
case "Title":
return ec.fieldContext_ImageSummary_Title(ctx, field)
case "Score":
return ec.fieldContext_ImageSummary_Score(ctx, field)
case "Source":
return ec.fieldContext_ImageSummary_Source(ctx, field)
case "Documentation":
@@ -6355,8 +6221,6 @@ func (ec *executionContext) fieldContext_RepoInfo_Images(ctx context.Context, fi
return ec.fieldContext_ImageSummary_Labels(ctx, field)
case "Title":
return ec.fieldContext_ImageSummary_Title(ctx, field)
case "Score":
return ec.fieldContext_ImageSummary_Score(ctx, field)
case "Source":
return ec.fieldContext_ImageSummary_Source(ctx, field)
case "Documentation":
@@ -6422,8 +6286,6 @@ func (ec *executionContext) fieldContext_RepoInfo_Summary(ctx context.Context, f
return ec.fieldContext_RepoSummary_Platforms(ctx, field)
case "Vendors":
return ec.fieldContext_RepoSummary_Vendors(ctx, field)
case "Score":
return ec.fieldContext_RepoSummary_Score(ctx, field)
case "NewestImage":
return ec.fieldContext_RepoSummary_NewestImage(ctx, field)
case "DownloadCount":
@@ -6652,47 +6514,6 @@ func (ec *executionContext) fieldContext_RepoSummary_Vendors(ctx context.Context
return fc, nil
}
func (ec *executionContext) _RepoSummary_Score(ctx context.Context, field graphql.CollectedField, obj *RepoSummary) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_RepoSummary_Score(ctx, field)
if err != nil {
return graphql.Null
}
ctx = graphql.WithFieldContext(ctx, fc)
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
ctx = rctx // use context from middleware stack in children
return obj.Score, nil
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
return graphql.Null
}
res := resTmp.(*int)
fc.Result = res
return ec.marshalOInt2ᚖint(ctx, field.Selections, res)
}
func (ec *executionContext) fieldContext_RepoSummary_Score(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
fc = &graphql.FieldContext{
Object: "RepoSummary",
Field: field,
IsMethod: false,
IsResolver: false,
Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
return nil, errors.New("field of type Int does not have child fields")
},
}
return fc, nil
}
func (ec *executionContext) _RepoSummary_NewestImage(ctx context.Context, field graphql.CollectedField, obj *RepoSummary) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_RepoSummary_NewestImage(ctx, field)
if err != nil {
@@ -6755,8 +6576,6 @@ func (ec *executionContext) fieldContext_RepoSummary_NewestImage(ctx context.Con
return ec.fieldContext_ImageSummary_Labels(ctx, field)
case "Title":
return ec.fieldContext_ImageSummary_Title(ctx, field)
case "Score":
return ec.fieldContext_ImageSummary_Score(ctx, field)
case "Source":
return ec.fieldContext_ImageSummary_Source(ctx, field)
case "Documentation":
@@ -9052,10 +8871,6 @@ func (ec *executionContext) _ImageSummary(ctx context.Context, sel ast.Selection
out.Values[i] = ec._ImageSummary_Title(ctx, field, obj)
case "Score":
out.Values[i] = ec._ImageSummary_Score(ctx, field, obj)
case "Source":
out.Values[i] = ec._ImageSummary_Source(ctx, field, obj)
@@ -9167,10 +8982,6 @@ func (ec *executionContext) _LayerSummary(ctx context.Context, sel ast.Selection
out.Values[i] = ec._LayerSummary_Digest(ctx, field, obj)
case "Score":
out.Values[i] = ec._LayerSummary_Score(ctx, field, obj)
default:
panic("unknown field " + strconv.Quote(field.Name))
}
@@ -9789,10 +9600,6 @@ func (ec *executionContext) _RepoSummary(ctx context.Context, sel ast.SelectionS
out.Values[i] = ec._RepoSummary_Vendors(ctx, field, obj)
case "Score":
out.Values[i] = ec._RepoSummary_Score(ctx, field, obj)
case "NewestImage":
out.Values[i] = ec._RepoSummary_NewestImage(ctx, field, obj)
pkg/extensions/search/gql_generated/models_gen.go
-6
View File
@@ -114,8 +114,6 @@ type ImageSummary struct {
Labels *string `json:"Labels"`
// Human-readable title of the image
Title *string `json:"Title"`
// Integer used to rank search results by relevance
Score *int `json:"Score"`
// URL to get source code for building the image
Source *string `json:"Source"`
// URL to get documentation on the image
@@ -152,8 +150,6 @@ type LayerSummary struct {
Size *string `json:"Size"`
// Digest of the layer content
Digest *string `json:"Digest"`
// Integer used to rank search results by relevance
Score *int `json:"Score"`
}
// Details about a specific version of an image for a certain operating system and architecture.
@@ -276,8 +272,6 @@ type RepoSummary struct {
Platforms []*Platform `json:"Platforms"`
// Vendors associated with this image, the distributing entities, organizations or individuals
Vendors []*string `json:"Vendors"`
// Integer used to rank search results by relevance
Score *int `json:"Score"`
// Details of the newest image inside the repository
// NOTE: not the image with the `latest` tag, the one with the most recent created timestamp
NewestImage *ImageSummary `json:"NewestImage"`
pkg/extensions/search/schema.graphql
-12
View File
@@ -169,10 +169,6 @@ type ImageSummary {
"""
Title: String
"""
Integer used to rank search results by relevance
"""
Score: Int
"""
URL to get source code for building the image
"""
Source: String
@@ -287,10 +283,6 @@ type RepoSummary {
"""
Vendors: [String]
"""
Integer used to rank search results by relevance
"""
Score: Int
"""
Details of the newest image inside the repository
NOTE: not the image with the `latest` tag, the one with the most recent created timestamp
"""
@@ -325,10 +317,6 @@ type LayerSummary {
Digest of the layer content
"""
Digest: String
"""
Integer used to rank search results by relevance
"""
Score: Int
}
"""
pkg/extensions/search/search.md
-1
View File
@@ -101,7 +101,6 @@ curl -X POST -H "Content-Type: application/json" --data '{ "query": "{ ImageList
Arch
}
Vendor
Score
DownloadCount
Licenses
Title