Skip to content

Commit 18db6c5

Browse files
authored
Merge pull request #60 from infosiftr/containerd-helpers
Use containerd helper functions I didn't notice before in registry/
2 parents c896b4d + 6d8e83b commit 18db6c5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

registry/registry.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,18 @@ func (obj ResolvedObject) Manifest(ctx context.Context) (*ocispec.Manifest, erro
166166

167167
// ConfigBlob assumes the given object is a "config" blob (see [ResolvedObject.At]) and fetches/returns the parsed config object
168168
func (obj ResolvedObject) ConfigBlob(ctx context.Context) (*ocispec.Image, error) {
169-
if obj.Desc.MediaType != "application/vnd.oci.image.config.v1+json" && obj.Desc.MediaType != "application/vnd.docker.container.image.v1+json" {
169+
if !images.IsConfigType(obj.Desc.MediaType) {
170170
return nil, fmt.Errorf("unknown media type: %q", obj.Desc.MediaType)
171171
}
172172
return get[ocispec.Image](ctx, obj)
173173
}
174174

175175
func (obj ResolvedObject) IsImageManifest() bool {
176-
return obj.Desc.MediaType == ocispec.MediaTypeImageManifest || obj.Desc.MediaType == images.MediaTypeDockerSchema2Manifest
176+
return images.IsManifestType(obj.Desc.MediaType)
177177
}
178178

179179
func (obj ResolvedObject) IsImageIndex() bool {
180-
return obj.Desc.MediaType == ocispec.MediaTypeImageIndex || obj.Desc.MediaType == images.MediaTypeDockerSchema2ManifestList
180+
return images.IsIndexType(obj.Desc.MediaType)
181181
}
182182

183183
// Resolve returns an object which can be used to query a registry for manifest objects or certain blobs with type checking helpers

0 commit comments

Comments
 (0)