Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 4 insertions, 34 deletions

diff --git a/workhorse/internal/upload/destination/objectstore/s3_complete_multipart_api.go b/workhorse/internal/upload/destination/objectstore/s3_complete_multipart_api.go
index b84f5757f49..02799d0b9b0 100644
--- a/workhorse/internal/upload/destination/objectstore/s3_complete_multipart_api.go
+++ b/workhorse/internal/upload/destination/objectstore/s3_complete_multipart_api.go
@@ -2,45 +2,15 @@ package objectstore
 
 import (
 	"encoding/xml"
-	"fmt"
-)
-
-// CompleteMultipartUpload is the S3 CompleteMultipartUpload body
-type CompleteMultipartUpload struct {
-	Part []*completeMultipartUploadPart
-}
 
-type completeMultipartUploadPart struct {
-	PartNumber int
-	ETag       string
-}
-
-// CompleteMultipartUploadResult is the S3 answer to CompleteMultipartUpload request
-type CompleteMultipartUploadResult struct {
-	Location string
-	Bucket   string
-	Key      string
-	ETag     string
-}
-
-// CompleteMultipartUploadError is the in-body error structure
-// https://docs.aws.amazon.com/AmazonS3/latest/API/mpUploadComplete.html#mpUploadComplete-examples
-// the answer contains other fields we are not using
-type CompleteMultipartUploadError struct {
-	XMLName xml.Name `xml:"Error"`
-	Code    string
-	Message string
-}
-
-func (c *CompleteMultipartUploadError) Error() string {
-	return fmt.Sprintf("CompleteMultipartUpload remote error %q: %s", c.Code, c.Message)
-}
+	"gitlab.com/gitlab-org/gitlab/workhorse/internal/upload/destination/objectstore/s3api"
+)
 
 // compoundCompleteMultipartUploadResult holds both CompleteMultipartUploadResult and CompleteMultipartUploadError
 // this allow us to deserialize the response body where the root element can either be Error orCompleteMultipartUploadResult
 type compoundCompleteMultipartUploadResult struct {
-	*CompleteMultipartUploadResult
-	*CompleteMultipartUploadError
+	*s3api.CompleteMultipartUploadResult
+	*s3api.CompleteMultipartUploadError
 
 	// XMLName this overrides CompleteMultipartUploadError.XMLName tags
 	XMLName xml.Name