Infrastructure/zot
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2024-12-16 21:56:37 -05:00
Code Issues Activity

feat(graphql): Image() call now returns a non-nullable ImageSummary (#1216)

Browse source 
This is for consistency with the other calls, and should help in making
all ZUI handling of ZOT errors consistent

Signed-off-by: Andrei Aaron <aaaron@luxoft.com>
This commit is contained in:
Andrei Aaron 2023-02-24 22:22:01 +02:00 committed by GitHub
parent f6a540747f
commit 792f3f55b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/extensions/search/gql_generated/generated.go
View file

@ -1575,7 +1575,7 @@ type Query {
Image( Image(
"Image name in the format ` + "`" + `repository:tag` + "`" + `" "Image name in the format ` + "`" + `repository:tag` + "`" + `"
image: String! image: String!
): ImageSummary ): ImageSummary!
""" """
Returns a list of descriptors of an image or artifact manifest that are found in a <repo> and have a subject field of <digest> Returns a list of descriptors of an image or artifact manifest that are found in a <repo> and have a subject field of <digest>
@ -5200,11 +5200,14 @@ func (ec *executionContext) _Query_Image(ctx context.Context, field graphql.Coll
return graphql.Null return graphql.Null
} }
if resTmp == nil { if resTmp == nil {
if !graphql.HasFieldError(ctx, fc) {
ec.Errorf(ctx, "must not be null")
}
return graphql.Null return graphql.Null
} }
res := resTmp.(*ImageSummary) res := resTmp.(*ImageSummary)
fc.Result = res fc.Result = res
return ec.marshalOImageSummary2ᚖzotregistryᚗioᚋzotᚋpkgᚋextensionsᚋsearchᚋgql_generatedᚐImageSummary(ctx, field.Selections, res) return ec.marshalNImageSummary2ᚖzotregistryᚗioᚋzotᚋpkgᚋextensionsᚋsearchᚋgql_generatedᚐImageSummary(ctx, field.Selections, res)
} }
func (ec *executionContext) fieldContext_Query_Image(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { func (ec *executionContext) fieldContext_Query_Image(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
@ -9002,6 +9005,9 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr
} }
}() }()
res = ec._Query_Image(ctx, field) res = ec._Query_Image(ctx, field)
if res == graphql.Null {
atomic.AddUint32(&invalids, 1)
}
return res return res
} }
@ -9595,6 +9601,10 @@ func (ec *executionContext) marshalNGlobalSearchResult2ᚖzotregistryᚗioᚋzot
return ec._GlobalSearchResult(ctx, sel, v) return ec._GlobalSearchResult(ctx, sel, v)
} }
func (ec *executionContext) marshalNImageSummary2zotregistryᚗioᚋzotᚋpkgᚋextensionsᚋsearchᚋgql_generatedᚐImageSummary(ctx context.Context, sel ast.SelectionSet, v ImageSummary) graphql.Marshaler {
return ec._ImageSummary(ctx, sel, &v)
}
func (ec *executionContext) marshalNImageSummary2ᚕᚖzotregistryᚗioᚋzotᚋpkgᚋextensionsᚋsearchᚋgql_generatedᚐImageSummaryᚄ(ctx context.Context, sel ast.SelectionSet, v []*ImageSummary) graphql.Marshaler { func (ec *executionContext) marshalNImageSummary2ᚕᚖzotregistryᚗioᚋzotᚋpkgᚋextensionsᚋsearchᚋgql_generatedᚐImageSummaryᚄ(ctx context.Context, sel ast.SelectionSet, v []*ImageSummary) graphql.Marshaler {
ret := make(graphql.Array, len(v)) ret := make(graphql.Array, len(v))
var wg sync.WaitGroup var wg sync.WaitGroup

2
pkg/extensions/search/schema.graphql
View file

@ -626,7 +626,7 @@ type Query {
Image( Image(
"Image name in the format `repository:tag`" "Image name in the format `repository:tag`"
image: String! image: String!
): ImageSummary ): ImageSummary!
""" """
Returns a list of descriptors of an image or artifact manifest that are found in a <repo> and have a subject field of <digest> Returns a list of descriptors of an image or artifact manifest that are found in a <repo> and have a subject field of <digest>