Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions pkg/v1/tarball/layer.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,27 @@ func WithMediaType(mt types.MediaType) LayerOption {
}
}

// WithMediaType is a functional option for overriding the layer's diffID.
func WithDiffID(diffID v1.Hash) LayerOption {
return func(l *layer) {
l.diffID = diffID
}
}

// WithDigest is a functional option for overriding the layer's digest.
func WithDigest(digest v1.Hash) LayerOption {
return func(l *layer) {
l.digest = digest
}
}

// WithSize is a functional option for overriding the layer's size.
func WithSize(size int64) LayerOption {
return func(l *layer) {
l.size = size
}
}

// WithCompressedCaching is a functional option that overrides the
// logic for accessing the compressed bytes to memoize the result
// and avoid expensive repeated gzips.
Expand Down Expand Up @@ -302,11 +323,13 @@ func LayerFromOpener(opener Opener, opts ...LayerOption) (v1.Layer, error) {
logs.Warn.Printf("Unexpected mediaType (%s) for selected compression in %s in LayerFromOpener().", layer.mediaType, layer.compression)
}

if layer.digest, layer.size, err = computeDigest(layer.compressedopener); err != nil {
return nil, err
empty := v1.Hash{}
if layer.digest == empty || layer.size == 0 {
if layer.digest, layer.size, err = computeDigest(layer.compressedopener); err != nil {
return nil, err
}
}

empty := v1.Hash{}
if layer.diffID == empty {
if layer.diffID, err = computeDiffID(layer.uncompressedopener); err != nil {
return nil, err
Expand Down
47 changes: 47 additions & 0 deletions pkg/v1/tarball/layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,53 @@ func TestWithMediaType(t *testing.T) {
}
}

func TestWithDigestAndSize(t *testing.T) {
l, err := LayerFromFile("testdata/content.tar")
if err != nil {
t.Fatalf("Unable to create layer from tar file: %v", err)
}

gotDigest, err := l.Digest()
if err != nil {
t.Fatalf("Digest: %v", err)
}

gotSize, err := l.Size()
if err != nil {
t.Fatalf("Size: %v", err)
}

l, err = LayerFromFile("testdata/content.tar", WithDigest(gotDigest), WithSize(gotSize))
if err != nil {
t.Fatalf("Unable to create layer from tar file: %v", err)
}

if err = validate.Layer(l); err != nil {
t.Fatalf("validate.Layer(l): %v", err)
}
}

func TestWithDiffID(t *testing.T) {
l, err := LayerFromFile("testdata/content.tar")
if err != nil {
t.Fatalf("Unable to create layer from tar file: %v", err)
}

gotDiffID, err := l.DiffID()
if err != nil {
t.Fatalf("DiffID: %v", err)
}

l, err = LayerFromFile("testdata/content.tar", WithDiffID(gotDiffID))
if err != nil {
t.Fatalf("Unable to create layer from tar file: %v", err)
}

if err = validate.Layer(l); err != nil {
t.Fatalf("validate.Layer(l): %v", err)
}
}

func TestLayerFromReader(t *testing.T) {
setupFixtures(t)
defer teardownFixtures(t)
Expand Down