github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-06-30 09:12:47 +00:00
Code Issues Projects Releases Wiki Activity

Make Descriptor an alias for oci.Descriptor (#3888)

Browse Source
This commit is contained in:
Milos Gajdos 2024-10-07 11:36:47 +01:00 committed by GitHub
commit 740b31105e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
blobs.go
View File

@ -46,7 +46,7 @@ func (err ErrBlobInvalidDigest) Error() string {
// instead of initiating an upload session. // instead of initiating an upload session.
type ErrBlobMounted struct { type ErrBlobMounted struct {
From reference.Canonical From reference.Canonical
Descriptor Descriptor Descriptor v1.Descriptor
} }
func (err ErrBlobMounted) Error() string { func (err ErrBlobMounted) Error() string {
@ -58,32 +58,9 @@ func (err ErrBlobMounted) Error() string {
// store, a descriptor can be used to fetch, store and target any kind of // store, a descriptor can be used to fetch, store and target any kind of
// blob. The struct also describes the wire protocol format. Fields should // blob. The struct also describes the wire protocol format. Fields should
// only be added but never changed. // only be added but never changed.
type Descriptor struct { //
// MediaType describe the type of the content. All text based formats are // Descriptor is an alias for [v1.Descriptor].
// encoded as utf-8. type Descriptor = v1.Descriptor
MediaType string `json:"mediaType,omitempty"`
// Digest uniquely identifies the content. A byte stream can be verified
// against this digest.
Digest digest.Digest `json:"digest,omitempty"`
// Size in bytes of content.
Size int64 `json:"size,omitempty"`
// URLs contains the source URLs of this content.
URLs []string `json:"urls,omitempty"`
// Annotations contains arbitrary metadata relating to the targeted content.
Annotations map[string]string `json:"annotations,omitempty"`
// Platform describes the platform which the image in the manifest runs on.
// This should only be used when referring to a manifest.
Platform *v1.Platform `json:"platform,omitempty"`
// NOTE: Before adding a field here, please ensure that all
// other options have been exhausted. Much of the type relationships
// depend on the simplicity of this type.
}
// BlobStatter makes blob descriptors available by digest. The service may // BlobStatter makes blob descriptors available by digest. The service may
// provide a descriptor of a different digest if the provided digest is not // provide a descriptor of a different digest if the provided digest is not