mirror of
https://github.com/anchore/syft.git
synced 2026-10-30 22:12:28 +01:00
William Murphy
d3310a1830
* fix: re-use embedded union reader if possible Previously, because file.LocationReadCloser embeds a ReadCloser that might be a UnionReader, but doesn't implement the interface itself, the type assertion would fall and Syft would fall back to io.ReadAll to enable seeking on the underlying reader, resulting in a potentially large extra allocation. Instead, check whether the passed ReadCloser is a file.LocationReadCloser, and if so, try to use the embedded ReadCloser as a UnionReader. Signed-off-by: Will Murphy <will.murphy@anchore.com> * lint fix Signed-off-by: Will Murphy <will.murphy@anchore.com> * Assert that underlying reader is returned Signed-off-by: Will Murphy <will.murphy@anchore.com> --------- Signed-off-by: Will Murphy <will.murphy@anchore.com>
64 lines
1.6 KiB
Go
64 lines
1.6 KiB
Go
package unionreader
|
|
|
|
import (
|
|
"io"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/anchore/syft/syft/file"
|
|
)
|
|
|
|
func Test_getUnionReader_notUnionReader(t *testing.T) {
|
|
expectedContents := "this is a test"
|
|
reader := io.NopCloser(strings.NewReader(expectedContents))
|
|
|
|
// make certain that the test fixture does not implement the union reader
|
|
_, ok := reader.(UnionReader)
|
|
require.False(t, ok)
|
|
|
|
actual, err := GetUnionReader(reader)
|
|
require.NoError(t, err)
|
|
|
|
_, ok = actual.(UnionReader)
|
|
require.True(t, ok)
|
|
|
|
b, err := io.ReadAll(actual)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, expectedContents, string(b))
|
|
}
|
|
|
|
type panickingUnionReader struct{}
|
|
|
|
func (p2 *panickingUnionReader) ReadAt(p []byte, off int64) (n int, err error) {
|
|
panic("don't call this in your unit test!")
|
|
}
|
|
|
|
func (p2 *panickingUnionReader) Seek(offset int64, whence int) (int64, error) {
|
|
panic("don't call this in your unit test!")
|
|
}
|
|
|
|
func (p2 *panickingUnionReader) Read(p []byte) (n int, err error) {
|
|
panic("don't call this in your unit test!")
|
|
}
|
|
|
|
func (p2 *panickingUnionReader) Close() error {
|
|
panic("don't call this in your unit test!")
|
|
}
|
|
|
|
var _ UnionReader = (*panickingUnionReader)(nil)
|
|
|
|
func Test_getUnionReader_fileLocationReadCloser(t *testing.T) {
|
|
// panickingUnionReader is a UnionReader
|
|
p := &panickingUnionReader{}
|
|
embedsUnionReader := file.NewLocationReadCloser(file.Location{}, p)
|
|
|
|
// embedded union reader is returned without "ReadAll" invocation
|
|
ur, err := GetUnionReader(embedsUnionReader)
|
|
require.NoError(t, err)
|
|
require.Equal(t, p, ur)
|
|
}
|