Return JobRecordError for bulk v1 & v2 job results

This allows us to generalize error handling when retrieving bulk job
results.

bulk/error.go

@@ -0,0 +1,20 @@
+package bulk
+
+var _ error = (*JobRecordError)(nil)
+
+func NewJobRecordError(e error) JobRecordError {
+	return JobRecordError{e: e}
+}
+
+// JobRecordError wraps errors returned when retrieving records for a bulk job.
+type JobRecordError struct {
+	e error
+}
+
+func (e JobRecordError) Error() string {
+	return e.e.Error()
+}
+
+func (e JobRecordError) Unwrap() error {
+	return e.e
+}

bulk/job.go

@@ -612,12 +612,12 @@ func (j *Job) FailedRecords(ctx context.Context) ([]FailedRecord, error) {
 
 	response, err := j.session.Client().Do(request)
 	if err != nil {
-		return nil, err
+		return nil, NewJobRecordError(err)
 	}
 	defer response.Body.Close()
 
 	if response.StatusCode != http.StatusOK {
-		return nil, sfdc.HandleError(response)
+		return nil, NewJobRecordError(sfdc.HandleError(response))
 	}
 
 	reader := csv.NewReader(response.Body)
@@ -627,15 +627,15 @@ func (j *Job) FailedRecords(ctx context.Context) ([]FailedRecord, error) {
 	var records []FailedRecord
 	fields, err := reader.Read()
 	if err != nil {
-		return nil, err
+		return nil, NewJobRecordError(err)
 	}
 	for {
 		values, err := reader.Read()
 		if err == io.EOF {
 			break
 		}
 		if err != nil {
-			return records, err
+			return records, NewJobRecordError(err)
 		}
 		var record FailedRecord
 		record.Error = values[j.headerPosition(sfError, fields)]

bulk/v1/batch.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"strings"
 
@@ -198,28 +197,30 @@ func (b *Batch) Results(ctx context.Context) (BatchResult, error) {
 
 	response, err := b.session.Client().Do(request)
 	if err != nil {
-		return result, err
+		return result, bulk.NewJobRecordError(err)
 	}
 	defer response.Body.Close()
 	if response.StatusCode != http.StatusOK {
 		return result, sfdc.HandleError(response)
 	}
 
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
-		return result, err
+		return result, bulk.NewJobRecordError(err)
 	}
 
 	records := []ResultRecord{}
 
 	err = json.Unmarshal(body, &records)
 	if err != nil {
-		return result, err
+		return result, bulk.NewJobRecordError(err)
 	}
 	var requestRecords []map[string]interface{}
 	requestRecords, err = b.requestRecords(ctx)
 	if err != nil {
-		return result, fmt.Errorf("error retrieving request: %w", err)
+		return result, bulk.NewJobRecordError(
+			fmt.Errorf("error retrieving request: %w", err),
+		)
 	}
 	for i, record := range records {
 		fields := map[string]interface{}{}

bulk/v1/batches.go

@@ -30,8 +30,6 @@ func (b *JobBatches) fetchInfo(ctx context.Context) (err error) {
 	if err != nil {
 		return err
 	}
-	request.Header.Add("Accept", "application/json")
-	request.Header.Add("Content-Type", "application/json")
 	b.session.AuthorizationHeader(request)
 
 	b.info, err = b.infoResponse(request)