fixup! feat: add DeleteNBatch method

as per review, simplifying error handling

Author: CallumNZ

aws/sqs/sqs.go

@@ -416,10 +416,17 @@ func (d *DeleteBatchError) Error() string {
 	return fmt.Sprintf("%v: %v messages failed to delete", d.Err, len(d.Info))
 }
 
+type DeleteNBatchError struct {
+	Errors []error
+	Info   []DeleteBatchErrorEntry
 }
 
-func (d *DeleteBatchError) Info() []DeleteBatchErrorInfo {
-	return d.info
+func (s *DeleteNBatchError) Error() string {
+	var allErrors string
+	for _, err := range s.Errors {
+		allErrors += fmt.Sprintf("%s\n", err.Error())
+	}
+	return fmt.Sprintf("error(s) deleting batches:\n%s", allErrors)
 }
 
 // DeleteBatch deletes multiple messages from an SQS queue in a single batch
@@ -471,7 +478,9 @@ func (s *SQS) DeleteNBatch(ctx context.Context, queueURL string, receiptHandles
 		times        = int(math.Ceil(float64(receiptCount) / float64(maxlen)))
 	)
 
-	info := make([]DeleteBatchErrorInfo, 0)
+	allErrors := make([]error, 0)
+	allInfo := make([]DeleteBatchErrorEntry, 0)
+
 	batchesDeleted := 0
 
 	for i := 0; i < times; i++ {
@@ -484,14 +493,16 @@ func (s *SQS) DeleteNBatch(ctx context.Context, queueURL string, receiptHandles
 		err := s.DeleteBatch(ctx, queueURL, receipt_batch)
 		var dbe *DeleteBatchError
 		if errors.As(err, &dbe) {
-			info = append(info, dbe.Info()...)
+			allErrors = append(allErrors, err)
+			allInfo = append(allInfo, dbe.Info...)
 		}
 		batchesDeleted++
 	}
 
-	if len(info) > 0 {
-		return batchesDeleted, &DeleteBatchError{
-			info: info,
+	if len(allErrors) > 0 {
+		return batchesDeleted, &DeleteNBatchError{
+			Errors: allErrors,
+			Info:   allInfo,
 		}
 	}
 	return batchesDeleted, nil

aws/sqs/sqs_integration_test.go

@@ -822,15 +822,17 @@ func TestDeleteNBatch(t *testing.T) {
 	for _, rm := range receivedMessages {
 		receiptHandles = append(receiptHandles, rm.ReceiptHandle)
 	}
-	receiptHandles[0] = "invalid-receipt-handle" // Replace a valid receipt handle with an invalid one.
+	invalidReceiptHandle := "invalid-receipt-handle"
+	receiptHandles[0] = invalidReceiptHandle // Replace a valid receipt handle with an invalid one.
 
 	// ACTION
 	batchesDeleted, err = client.DeleteNBatch(context.TODO(), awsCmdQueueURL(), receiptHandles)
 	assert.NotNil(t, err)
 
-	var dbe *DeleteBatchError
+	var dbe *DeleteNBatchError
 	if errors.As(err, &dbe) {
-		assert.Equal(t, 1, len(dbe.Info()))
+		assert.Equal(t, 1, len(dbe.Info))
+		assert.Equal(t, invalidReceiptHandle, dbe.Info[0].ReceiptHandle)
 	} else {
 		t.Error("unexpected error type")
 	}