forked from TrueCloudLab/distribution
f1c8c41408
Commitcb6f002350implemented a generic Manifest interface to represent manifests in the registry and remove references to schema specific manifests. As part of this refactor, the Describable interface was introduced, which allowed for a single ManifestBuilder interface to handle both schema1 and schema2 manifests. Implementations of Describable are generally objects which can be described, not simply descriptors, but for convenience, this interface was also implemented on Descriptor in2ff77c00ba. This interface served its purpose, but no longer needed for most cases; schema2 (and OCI) descriptors do not need this method, making it only needed for `schema1.Reference`, which is now deprecated. Requiring this interface to be implemented limits interoperability between distribution's Descriptor and the OCI Descriptor types, which are identical in every other way, except for the presence of the Describable interface. This patch: - Removes the `Descriptor.Descriptor()` method (no longer implementing the `Describable` interface). - Updates ManifestBuilder interface and implementations to accept either - Updates ManifestBuilder interface and implementations to accept a `Descriptor`. After this patch, the caller is responsible for changing a describable type into a descriptor; builder.AppendReference(describable.Descriptor()) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
57 lines
1.6 KiB
Go
57 lines
1.6 KiB
Go
package schema2
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/distribution/distribution/v3"
|
|
)
|
|
|
|
// Builder is a type for constructing manifests.
|
|
type Builder struct {
|
|
// configDescriptor is used to describe configuration
|
|
configDescriptor distribution.Descriptor
|
|
|
|
// configJSON references
|
|
configJSON []byte
|
|
|
|
// dependencies is a list of descriptors that gets built by successive
|
|
// calls to AppendReference. In case of image configuration these are layers.
|
|
dependencies []distribution.Descriptor
|
|
}
|
|
|
|
// NewManifestBuilder is used to build new manifests for the current schema
|
|
// version. It takes a BlobService so it can publish the configuration blob
|
|
// as part of the Build process.
|
|
func NewManifestBuilder(configDescriptor distribution.Descriptor, configJSON []byte) *Builder {
|
|
mb := &Builder{
|
|
configDescriptor: configDescriptor,
|
|
configJSON: make([]byte, len(configJSON)),
|
|
}
|
|
copy(mb.configJSON, configJSON)
|
|
|
|
return mb
|
|
}
|
|
|
|
// Build produces a final manifest from the given references.
|
|
func (mb *Builder) Build(ctx context.Context) (distribution.Manifest, error) {
|
|
m := Manifest{
|
|
Versioned: SchemaVersion,
|
|
Layers: make([]distribution.Descriptor, len(mb.dependencies)),
|
|
}
|
|
copy(m.Layers, mb.dependencies)
|
|
|
|
m.Config = mb.configDescriptor
|
|
|
|
return FromStruct(m)
|
|
}
|
|
|
|
// AppendReference adds a reference to the current ManifestBuilder.
|
|
func (mb *Builder) AppendReference(ref distribution.Descriptor) error {
|
|
mb.dependencies = append(mb.dependencies, ref)
|
|
return nil
|
|
}
|
|
|
|
// References returns the current references added to this builder.
|
|
func (mb *Builder) References() []distribution.Descriptor {
|
|
return mb.dependencies
|
|
}
|