dc9e069ff2
Changed `matcher.Matches(file)` to `matcher.MatchesOrParentMatches(file)`:
cli/command/image/build/context.go:95:9: SA1019: matcher.Matches is deprecated: This implementation is buggy (it only checks a single parent dir against the pattern) and will be removed soon. Use either MatchesOrParentMatches or MatchesUsingParentResults instead. (staticcheck)
return matcher.Matches(file)
^
And updated a test to match the JSON omitting empty RootFS.Type fields (in
practice, this field should never be empty in real situations, and always
be "layer"). Changed the test to use subtests to easier find which case
is failing.
full diff: 343665850e...83b51522df
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
131 lines
2.4 KiB
Go
131 lines
2.4 KiB
Go
// Copyright 2019+ Klaus Post. All rights reserved.
|
|
// License information can be found in the LICENSE file.
|
|
// Based on work by Yann Collet, released under BSD License.
|
|
|
|
package zstd
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
)
|
|
|
|
type byteBuffer interface {
|
|
// Read up to 8 bytes.
|
|
// Returns io.ErrUnexpectedEOF if this cannot be satisfied.
|
|
readSmall(n int) ([]byte, error)
|
|
|
|
// Read >8 bytes.
|
|
// MAY use the destination slice.
|
|
readBig(n int, dst []byte) ([]byte, error)
|
|
|
|
// Read a single byte.
|
|
readByte() (byte, error)
|
|
|
|
// Skip n bytes.
|
|
skipN(n int) error
|
|
}
|
|
|
|
// in-memory buffer
|
|
type byteBuf []byte
|
|
|
|
func (b *byteBuf) readSmall(n int) ([]byte, error) {
|
|
if debugAsserts && n > 8 {
|
|
panic(fmt.Errorf("small read > 8 (%d). use readBig", n))
|
|
}
|
|
bb := *b
|
|
if len(bb) < n {
|
|
return nil, io.ErrUnexpectedEOF
|
|
}
|
|
r := bb[:n]
|
|
*b = bb[n:]
|
|
return r, nil
|
|
}
|
|
|
|
func (b *byteBuf) readBig(n int, dst []byte) ([]byte, error) {
|
|
bb := *b
|
|
if len(bb) < n {
|
|
return nil, io.ErrUnexpectedEOF
|
|
}
|
|
r := bb[:n]
|
|
*b = bb[n:]
|
|
return r, nil
|
|
}
|
|
|
|
func (b *byteBuf) remain() []byte {
|
|
return *b
|
|
}
|
|
|
|
func (b *byteBuf) readByte() (byte, error) {
|
|
bb := *b
|
|
if len(bb) < 1 {
|
|
return 0, nil
|
|
}
|
|
r := bb[0]
|
|
*b = bb[1:]
|
|
return r, nil
|
|
}
|
|
|
|
func (b *byteBuf) skipN(n int) error {
|
|
bb := *b
|
|
if len(bb) < n {
|
|
return io.ErrUnexpectedEOF
|
|
}
|
|
*b = bb[n:]
|
|
return nil
|
|
}
|
|
|
|
// wrapper around a reader.
|
|
type readerWrapper struct {
|
|
r io.Reader
|
|
tmp [8]byte
|
|
}
|
|
|
|
func (r *readerWrapper) readSmall(n int) ([]byte, error) {
|
|
if debugAsserts && n > 8 {
|
|
panic(fmt.Errorf("small read > 8 (%d). use readBig", n))
|
|
}
|
|
n2, err := io.ReadFull(r.r, r.tmp[:n])
|
|
// We only really care about the actual bytes read.
|
|
if err != nil {
|
|
if err == io.EOF {
|
|
return nil, io.ErrUnexpectedEOF
|
|
}
|
|
if debugDecoder {
|
|
println("readSmall: got", n2, "want", n, "err", err)
|
|
}
|
|
return nil, err
|
|
}
|
|
return r.tmp[:n], nil
|
|
}
|
|
|
|
func (r *readerWrapper) readBig(n int, dst []byte) ([]byte, error) {
|
|
if cap(dst) < n {
|
|
dst = make([]byte, n)
|
|
}
|
|
n2, err := io.ReadFull(r.r, dst[:n])
|
|
if err == io.EOF && n > 0 {
|
|
err = io.ErrUnexpectedEOF
|
|
}
|
|
return dst[:n2], err
|
|
}
|
|
|
|
func (r *readerWrapper) readByte() (byte, error) {
|
|
n2, err := r.r.Read(r.tmp[:1])
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
if n2 != 1 {
|
|
return 0, io.ErrUnexpectedEOF
|
|
}
|
|
return r.tmp[0], nil
|
|
}
|
|
|
|
func (r *readerWrapper) skipN(n int) error {
|
|
n2, err := io.CopyN(ioutil.Discard, r.r, int64(n))
|
|
if n2 != int64(n) {
|
|
err = io.ErrUnexpectedEOF
|
|
}
|
|
return err
|
|
}
|