Skip to content

Commit a739eb1

Browse files
committed
replace fmt.Errorf to errors.Wrap, thanks Sonnet4.5 and crush
Signed-off-by: Slach <bloodjazman@gmail.com>
1 parent 5fe8e2c commit a739eb1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pkg/storage/s3.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ func (s *S3) CopyObject(ctx context.Context, srcSize int64, srcBucket, srcKey, d
525525
s.enrichCopyObjectParams(params)
526526
_, err := s.client.CopyObject(ctx, params)
527527
if err != nil {
528-
return 0, fmt.Errorf("S3->CopyObject %s/%s -> %s/%s return error: %v", srcBucket, srcKey, s.Config.Bucket, dstKey, err)
528+
return 0, errors.Wrapf(err, "S3->CopyObject %s/%s -> %s/%s return error", srcBucket, srcKey, s.Config.Bucket, dstKey)
529529
}
530530
return srcSize, nil
531531
}
@@ -538,7 +538,7 @@ func (s *S3) CopyObject(ctx context.Context, srcSize int64, srcBucket, srcKey, d
538538
s.enrichCreateMultipartUploadParams(createMultipartUploadParams)
539539
initResp, err := s.client.CreateMultipartUpload(ctx, createMultipartUploadParams)
540540
if err != nil {
541-
return 0, fmt.Errorf("S3->CopyObject %s/%s -> %s/%s, CreateMultipartUpload return error: %v", srcBucket, srcKey, s.Config.Bucket, dstKey, err)
541+
return 0, errors.Wrapf(err, "S3->CopyObject %s/%s -> %s/%s, CreateMultipartUpload return error", srcBucket, srcKey, s.Config.Bucket, dstKey)
542542
}
543543

544544
// Get the upload ID
@@ -590,7 +590,7 @@ func (s *S3) CopyObject(ctx context.Context, srcSize int64, srcBucket, srcKey, d
590590
}
591591
partResp, err := s.client.UploadPartCopy(ctx, uploadPartParams)
592592
if err != nil {
593-
return fmt.Errorf("S3->CopyObject %s/%s -> %s/%s, UploadPartCopy start=%d, end=%d return error: %v", srcBucket, srcKey, s.Config.Bucket, dstKey, start, end-1, err)
593+
return errors.Wrapf(err, "S3->CopyObject %s/%s -> %s/%s, UploadPartCopy start=%d, end=%d return error", srcBucket, srcKey, s.Config.Bucket, dstKey, start, end-1)
594594
}
595595
mu.Lock()
596596
parts = append(parts, s3types.CompletedPart{
@@ -616,9 +616,9 @@ func (s *S3) CopyObject(ctx context.Context, srcSize int64, srcBucket, srcKey, d
616616
}
617617
_, abortErr := s.client.AbortMultipartUpload(context.Background(), abortParams)
618618
if abortErr != nil {
619-
return 0, fmt.Errorf("aborting CopyObject multipart upload: %v, original error was: %v", abortErr, wgWaitErr)
619+
return 0, errors.Wrapf(wgWaitErr, "aborting CopyObject multipart upload: %v, original error was", abortErr)
620620
}
621-
return 0, fmt.Errorf("one of CopyObject/Multipart go-routine return error: %v", wgWaitErr)
621+
return 0, errors.Wrap(wgWaitErr, "one of CopyObject/Multipart go-routine return error")
622622
}
623623
// Parts must be ordered by part number.
624624
sort.Slice(parts, func(i int, j int) bool {
@@ -636,7 +636,7 @@ func (s *S3) CopyObject(ctx context.Context, srcSize int64, srcBucket, srcKey, d
636636
}
637637
_, err = s.client.CompleteMultipartUpload(context.Background(), completeMultipartUploadParams)
638638
if err != nil {
639-
return 0, fmt.Errorf("complete CopyObject multipart upload: %v", err)
639+
return 0, errors.Wrap(err, "complete CopyObject multipart upload")
640640
}
641641
return srcSize, nil
642642
}

0 commit comments

Comments
 (0)