From 5fa926a609599161807e30a51c526995b517f695 Mon Sep 17 00:00:00 2001 From: Milos Gajdos Date: Sat, 29 Oct 2022 19:42:28 +0100 Subject: [PATCH] Enable pushing empty blobs This is an edge case when we are trying to upload an empty chunk of data using a MultiPart upload. As a result we are trying to complete the MultipartUpload with an empty slice of `completedUploadedParts` which will always lead to 400 being returned from S3 See: https://docs.aws.amazon.com/sdk-for-go/api/service/s3/#CompletedMultipartUpload Solution: we upload an empty i.e. 0 byte part as a single part and then append it to the completedUploadedParts slice used to complete the Multipart upload. Signed-off-by: Milos Gajdos --- registry/storage/driver/s3-aws/s3.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go index c3d86bb80..e6d454217 100644 --- a/registry/storage/driver/s3-aws/s3.go +++ b/registry/storage/driver/s3-aws/s3.go @@ -1468,6 +1468,30 @@ func (w *writer) Commit() error { }) } + // This is an edge case when we are trying to upload an empty chunk of data using + // a MultiPart upload. As a result we are trying to complete the MultipartUpload + // with an empty slice of `completedUploadedParts` which will always lead to 400 + // being returned from S3 See: https://docs.aws.amazon.com/sdk-for-go/api/service/s3/#CompletedMultipartUpload + // Solution: we upload an empty i.e. 0 byte part as a single part and then append it + // to the completedUploadedParts slice used to complete the Multipart upload. + if len(w.parts) == 0 { + resp, err := w.driver.S3.UploadPart(&s3.UploadPartInput{ + Bucket: aws.String(w.driver.Bucket), + Key: aws.String(w.key), + PartNumber: aws.Int64(1), + UploadId: aws.String(w.uploadID), + Body: bytes.NewReader(nil), + }) + if err != nil { + return err + } + + completedUploadedParts = append(completedUploadedParts, &s3.CompletedPart{ + ETag: resp.ETag, + PartNumber: aws.Int64(1), + }) + } + sort.Sort(completedUploadedParts) _, err = w.driver.S3.CompleteMultipartUpload(&s3.CompleteMultipartUploadInput{