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
7 changes: 5 additions & 2 deletions common/httpx/filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ type FilterCustom struct {
func (f FilterCustom) Filter(response *Response) (bool, error) {
for _, callback := range f.CallBacks {
ok, err := callback(response)
if ok && err == nil {
return true, err
if err != nil {
return false, err
}
if ok {
return true, nil
}
}

Expand Down
55 changes: 55 additions & 0 deletions common/httpx/filter_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package httpx

import (
"errors"
"testing"

"github.com/stretchr/testify/require"
)

func TestFilterCustomErrorPropagation(t *testing.T) {
t.Run("error from callback is returned, not swallowed", func(t *testing.T) {
expectedErr := errors.New("callback failure")
callback := func(response *Response) (bool, error) {
return true, expectedErr
}
filter := FilterCustom{CallBacks: []CustomCallback{callback}}
ok, err := filter.Filter(&Response{})
require.False(t, ok, "ok should be false when callback returns an error")
require.ErrorIs(t, err, expectedErr, "error from callback should be propagated")
})

t.Run("error from callback with ok=false is returned", func(t *testing.T) {
expectedErr := errors.New("callback failure")
callback := func(response *Response) (bool, error) {
return false, expectedErr
}
filter := FilterCustom{CallBacks: []CustomCallback{callback}}
ok, err := filter.Filter(&Response{})
require.False(t, ok)
require.ErrorIs(t, err, expectedErr)
})

t.Run("first matching callback without error returns true", func(t *testing.T) {
callbacks := []CustomCallback{
func(response *Response) (bool, error) { return false, nil },
func(response *Response) (bool, error) { return true, nil },
func(response *Response) (bool, error) { return true, nil },
}
filter := FilterCustom{CallBacks: callbacks}
ok, err := filter.Filter(&Response{})
require.True(t, ok)
require.NoError(t, err)
})

t.Run("no callbacks match returns false with nil error", func(t *testing.T) {
callbacks := []CustomCallback{
func(response *Response) (bool, error) { return false, nil },
func(response *Response) (bool, error) { return false, nil },
}
filter := FilterCustom{CallBacks: callbacks}
ok, err := filter.Filter(&Response{})
require.False(t, ok)
require.NoError(t, err)
})
}
1 change: 1 addition & 0 deletions common/httpx/pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
if err != nil {
return false
}
defer conn.Close()

Check failure on line 32 in common/httpx/pipeline.go

View workflow job for this annotation

GitHub Actions / Lint Test

Error return value of `conn.Close` is not checked (errcheck)
// send some probes
nprobes := 10
for i := 0; i < nprobes; i++ {
Expand Down
11 changes: 7 additions & 4 deletions internal/pdcp/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ func (u *UploadWriter) autoCommit(ctx context.Context) {
if err := u.uploadChunk(buff); err != nil {
gologger.Error().Msgf("Failed to upload asset results on cloud: %v", err)
}
// write the current line to the now-empty buffer so it is not lost
buff.WriteString(line)
buff.WriteString("\n")
} else {
buff.WriteString(line)
buff.WriteString("\n")
Expand Down Expand Up @@ -261,10 +264,10 @@ func (u *UploadWriter) getRequest(bin []byte) (*retryablehttp.Request, error) {

// Close closes the upload writer
func (u *UploadWriter) Close() {
if !u.closed.Load() {
// protect to avoid channel closed twice error
close(u.data)
u.closed.Store(true)
// atomically ensure we only close the channel once
if !u.closed.CompareAndSwap(false, true) {
return
}
close(u.data)
<-u.done
}
Loading