oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

newLazyUnionReader cannot return err

Browse Source 
Signed-off-by: Will Murphy <will.murphy@anchore.com>
This commit is contained in:
Will Murphy 2024-04-24 12:51:49 -04:00
parent 434f100add
commit 20b692df04
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syft/internal/unionreader/lazy_union_reader.go
View File

@ -127,9 +127,9 @@ func min(ints ...int64) int64 {
return minSeeen return minSeeen
} }
func newLazyUnionReader(readCloser io.ReadCloser) (UnionReader, error) { func newLazyUnionReader(readCloser io.ReadCloser) UnionReader {
return &lazyUnionReader{ return &lazyUnionReader{
rc: readCloser, rc: readCloser,
mu: sync.Mutex{}, mu: sync.Mutex{},
}, nil }
} }

15
syft/internal/unionreader/lazy_union_reader_test.go
View File

@ -26,16 +26,14 @@ func Test_lazyUnionReader_Close(t *testing.T) {
false, false,
r, r,
} }
subject, err := newLazyUnionReader(sc) subject := newLazyUnionReader(sc)
require.NoError(t, err)
require.NoError(t, subject.Close()) require.NoError(t, subject.Close())
assert.True(t, sc.closed) assert.True(t, sc.closed)
} }
func Test_lazyUnionReader_ReadAll(t *testing.T) { func Test_lazyUnionReader_ReadAll(t *testing.T) {
rc := io.NopCloser(strings.NewReader("some data")) rc := io.NopCloser(strings.NewReader("some data"))
subject, err := newLazyUnionReader(rc) subject := newLazyUnionReader(rc)
require.NoError(t, err)
b, err := io.ReadAll(subject) b, err := io.ReadAll(subject)
require.NoError(t, err) require.NoError(t, err)
@ -45,8 +43,7 @@ func Test_lazyUnionReader_ReadAll(t *testing.T) {
func Test_lazyUnionReader_RepeatedlyRead(t *testing.T) { func Test_lazyUnionReader_RepeatedlyRead(t *testing.T) {
data := "some data for our reader that we need to read!" data := "some data for our reader that we need to read!"
rc := io.NopCloser(strings.NewReader(data)) rc := io.NopCloser(strings.NewReader(data))
subject, err := newLazyUnionReader(rc) subject := newLazyUnionReader(rc)
require.NoError(t, err)
var readErr error var readErr error
var readResult []byte var readResult []byte
for readErr == nil { for readErr == nil {
@ -119,8 +116,7 @@ func Test_lazyUnionReader_ReadAt(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
rc := io.NopCloser(strings.NewReader("0123456789abcdef")) rc := io.NopCloser(strings.NewReader("0123456789abcdef"))
subject, err := newLazyUnionReader(rc) subject := newLazyUnionReader(rc)
require.NoError(t, err)
n, err := subject.ReadAt(tt.dst, tt.off) n, err := subject.ReadAt(tt.dst, tt.off)
assert.Equal(t, tt.wantN, n) assert.Equal(t, tt.wantN, n)
assert.Equal(t, string(tt.wantBytes), string(tt.dst[:tt.wantN])) assert.Equal(t, string(tt.wantBytes), string(tt.dst[:tt.wantN]))
@ -195,8 +191,7 @@ func Test_lazyUnionReader_Seek(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
rc := io.NopCloser(bytes.NewReader(data)) rc := io.NopCloser(bytes.NewReader(data))
subject, err := newLazyUnionReader(rc) subject := newLazyUnionReader(rc)
require.NoError(t, err)
var readSeekErr error var readSeekErr error
var readResult []byte var readResult []byte
for _, c := range tt.commands { for _, c := range tt.commands {

2
syft/internal/unionreader/union_reader.go
View File

@ -41,5 +41,5 @@ func GetUnionReader(readerCloser io.ReadCloser) (UnionReader, error) {
if ok { if ok {
return reader, nil return reader, nil
} }
return newLazyUnionReader(readerCloser) return newLazyUnionReader(readerCloser), nil
} }