Merge pull request #2639 from andrew-leung/manifesteventlayers
Add configurable layers in manifest events
This commit is contained in:
commit
b12bd4004a
9 changed files with 66 additions and 18 deletions
|
@ -12,11 +12,12 @@ import (
|
|||
)
|
||||
|
||||
type bridge struct {
|
||||
ub URLBuilder
|
||||
actor ActorRecord
|
||||
source SourceRecord
|
||||
request RequestRecord
|
||||
sink Sink
|
||||
ub URLBuilder
|
||||
includeReferences bool
|
||||
actor ActorRecord
|
||||
source SourceRecord
|
||||
request RequestRecord
|
||||
sink Sink
|
||||
}
|
||||
|
||||
var _ Listener = &bridge{}
|
||||
|
@ -31,13 +32,14 @@ type URLBuilder interface {
|
|||
// using the actor and source. Any urls populated in the events created by
|
||||
// this bridge will be created using the URLBuilder.
|
||||
// TODO(stevvooe): Update this to simply take a context.Context object.
|
||||
func NewBridge(ub URLBuilder, source SourceRecord, actor ActorRecord, request RequestRecord, sink Sink) Listener {
|
||||
func NewBridge(ub URLBuilder, source SourceRecord, actor ActorRecord, request RequestRecord, sink Sink, includeReferences bool) Listener {
|
||||
return &bridge{
|
||||
ub: ub,
|
||||
actor: actor,
|
||||
source: source,
|
||||
request: request,
|
||||
sink: sink,
|
||||
ub: ub,
|
||||
includeReferences: includeReferences,
|
||||
actor: actor,
|
||||
source: source,
|
||||
request: request,
|
||||
sink: sink,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -150,7 +152,7 @@ func (b *bridge) createManifestEvent(action string, repo reference.Named, sm dis
|
|||
}
|
||||
|
||||
// Ensure we have the canonical manifest descriptor here
|
||||
_, desc, err := distribution.UnmarshalManifest(mt, p)
|
||||
manifest, desc, err := distribution.UnmarshalManifest(mt, p)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -159,6 +161,9 @@ func (b *bridge) createManifestEvent(action string, repo reference.Named, sm dis
|
|||
event.Target.Length = desc.Size
|
||||
event.Target.Size = desc.Size
|
||||
event.Target.Digest = desc.Digest
|
||||
if b.includeReferences {
|
||||
event.Target.References = append(event.Target.References, manifest.References()...)
|
||||
}
|
||||
|
||||
ref, err := reference.WithDigest(repo, event.Target.Digest)
|
||||
if err != nil {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue