Revert GitHub refactor (#2379) (including followups)

pkg/sources/errors.go

@@ -2,7 +2,7 @@ package sources
 
 import (
 	"errors"
-	"strings"
+	"fmt"
 	"sync"
 )
 
@@ -20,10 +20,6 @@ func NewScanErrors() *ScanErrors {
 
 // Add an error to the collection in a thread-safe manner.
 func (s *ScanErrors) Add(err error) {
-	if err == nil {
-		return
-	}
-
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	s.errors = append(s.errors, err)
@@ -39,17 +35,7 @@ func (s *ScanErrors) Count() uint64 {
 func (s *ScanErrors) String() string {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
-
-	var sb strings.Builder
-	sb.WriteString("[")
-	for i, err := range s.errors {
-		sb.WriteString(`"` + err.Error() + `"`)
-		if i < len(s.errors)-1 {
-			sb.WriteString(", ")
-		}
-	}
-	sb.WriteString("]")
-	return sb.String()
+	return fmt.Sprintf("%v", s.errors)
 }
 
 func (s *ScanErrors) Errors() error {

pkg/sources/errors_test.go

@@ -7,8 +7,6 @@ import (
 	"testing"
 )
 
-var testError = fmt.Errorf("simulated failure")
-
 func TestNewScanErrors(t *testing.T) {
 	testCases := []struct {
 		name     string
@@ -86,7 +84,7 @@ func TestScanErrorsAdd(t *testing.T) {
 				wg.Add(1)
 				go func() {
 					for j := 0; j < tc.wantErr/tc.concurrency; j++ {
-						se.Add(testError)
+						se.Add(nil)
 					}
 					wg.Done()
 				}()
@@ -137,7 +135,7 @@ func TestScanErrorsCount(t *testing.T) {
 				wg.Add(1)
 				go func() {
 					for j := 0; j < tc.wantErrCnt/tc.concurrency; j++ {
-						se.Add(testError)
+						se.Add(nil)
 					}
 					wg.Done()
 				}()
@@ -153,8 +151,8 @@ func TestScanErrorsCount(t *testing.T) {
 
 func TestScanErrorsString(t *testing.T) {
 	se := NewScanErrors()
-	se.Add(testError)
-	want := `["` + testError.Error() + `"]`
+	se.Add(nil)
+	want := "[<nil>]"
 	if got := fmt.Sprintf("%v", se); got != want {
 		t.Errorf("got %q, want %q", got, want)
 	}