From cce5d7152a6666b5401505a9ebc5ddc78562d5f5 Mon Sep 17 00:00:00 2001
From: Yingrong Zhao <yingrong.zhao@gmail.com>
Date: Wed, 16 Dec 2020 16:24:10 -0500
Subject: [PATCH] fix `testListMultipartUpload` in aws-sdk-go (#11122)

Currently, the test doesn't complete nor abort the multipart upload
after tesing the list operation. It caused the `cleanup()` to fail since
the object can't not be deleted which causes the bucket deletion to
fail.

This PR adds a `CompleteMultipartUpload` call to commit the object so
the cleanup can successfully delete the object and bucket.
---
 mint/run/core/aws-sdk-go/main.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/mint/run/core/aws-sdk-go/main.go b/mint/run/core/aws-sdk-go/main.go
index 3e0a9b89e..fe7c3f9f6 100644
--- a/mint/run/core/aws-sdk-go/main.go
+++ b/mint/run/core/aws-sdk-go/main.go
@@ -921,15 +921,32 @@ func testListMultipartUploads(s3Client *s3.S3) {
 		return
 	}
 
+	completedParts := make([]*s3.CompletedPart, len(parts))
 	for _, part := range listParts.Parts {
 		if tag, ok := parts[part.PartNumber]; ok {
 			if tag != part.ETag {
 				failureLog(function, args, startTime, "", fmt.Sprintf("AWS SDK Go ListParts.Parts output mismatch want: %v got: %v", tag, part.ETag), err).Fatal()
 				return
 			}
+			completedParts = append(completedParts, &s3.CompletedPart{
+				ETag:       part.ETag,
+				PartNumber: part.PartNumber,
+			})
 		}
 	}
 
+	_, err = s3Client.CompleteMultipartUpload(&s3.CompleteMultipartUploadInput{
+		Bucket: aws.String(bucket),
+		Key:    aws.String(object),
+		MultipartUpload: &s3.CompletedMultipartUpload{
+			Parts: completedParts},
+		UploadId: multipartUpload.UploadId,
+	})
+	if err != nil {
+		failureLog(function, args, startTime, "", fmt.Sprintf("AWS SDK Go CompleteMultipartUpload failed"), err).Fatal()
+		return
+	}
+
 	successLogger(function, args, startTime).Info()
 }