list all upload part and abort it

oss/bucket_test.go

@@ -59,22 +59,31 @@ func (s *OssBucketSuite) SetUpSuite(c *C) {
 	testLogger.Println("test bucket started")
 }
 
+
 // TearDownSuite runs before each test or benchmark starts running.
 func (s *OssBucketSuite) TearDownSuite(c *C) {
 	for _, bucket := range []*Bucket{s.bucket, s.archiveBucket} {
 		// Delete multipart
-		lmu, err := bucket.ListMultipartUploads()
-		c.Assert(err, IsNil)
-
-		for _, upload := range lmu.Uploads {
-			imur := InitiateMultipartUploadResult{Bucket: bucketName, Key: upload.Key, UploadID: upload.UploadID}
-			err = bucket.AbortMultipartUpload(imur)
+		keyMarker := KeyMarker("")
+		uploadIdMarker := UploadIDMarker("")
+		for {
+			lmu, err := bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 			c.Assert(err, IsNil)
+			for _, upload := range lmu.Uploads {
+				imur := InitiateMultipartUploadResult{Bucket: bucketName, Key: upload.Key, UploadID: upload.UploadID}
+				err = bucket.AbortMultipartUpload(imur)
+				c.Assert(err, IsNil)
+			}
+			keyMarker = KeyMarker(lmu.NextKeyMarker)
+			uploadIdMarker = UploadIDMarker(lmu.NextUploadIDMarker)
+			if !lmu.IsTruncated {
+				break
+			}
 		}
 
 		// Delete objects
 		marker := Marker("")
-		for{
+		for {
 			lor, err := bucket.ListObjects(marker)
 			c.Assert(err, IsNil)
 			for _, object := range lor.Objects {
@@ -88,7 +97,7 @@ func (s *OssBucketSuite) TearDownSuite(c *C) {
 		}
 
 		// Delete bucket
-		err = s.client.DeleteBucket(bucket.BucketName)
+		err := s.client.DeleteBucket(bucket.BucketName)
 		c.Assert(err, IsNil)
 	}
 

oss/client_test.go

@@ -143,14 +143,22 @@ func (s *OssClientSuite) deleteBucket(client *Client, bucketName string, c *C) {
 	}
 
 	// Delete Part
-	lmur, err := bucket.ListMultipartUploads()
-	c.Assert(err, IsNil)
-
-	for _, upload := range lmur.Uploads {
-		var imur = InitiateMultipartUploadResult{Bucket: bucketName,
-			Key: upload.Key, UploadID: upload.UploadID}
-		err = bucket.AbortMultipartUpload(imur)
+	keyMarker := KeyMarker("")
+	uploadIdMarker := UploadIDMarker("")
+	for {
+		lmur, err := bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 		c.Assert(err, IsNil)
+		for _, upload := range lmur.Uploads {
+			var imur = InitiateMultipartUploadResult{Bucket: bucketName,
+				Key: upload.Key, UploadID: upload.UploadID}
+			err = bucket.AbortMultipartUpload(imur)
+			c.Assert(err, IsNil)
+		}
+		keyMarker = KeyMarker(lmur.NextKeyMarker)
+		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		if !lmur.IsTruncated {
+			break
+		}
 	}
 
 	// Delete Bucket
@@ -797,7 +805,7 @@ func (s *OssClientSuite) TestBucketRefererNegative(c *C) {
 
 // TestSetBucketLogging
 func (s *OssClientSuite) TestSetBucketLogging(c *C) {
-	var bucketNameTest = bucketNamePrefix + randLowStr(6) 
+	var bucketNameTest = bucketNamePrefix + randLowStr(6)
 	var bucketNameTarget = bucketNamePrefix + randLowStr(6)
 
 	client, err := New(endpoint, accessID, accessKey)

oss/crc_test.go

@@ -39,19 +39,27 @@ func (s *OssCrcSuite) SetUpSuite(c *C) {
 // TearDownSuite runs before each test or benchmark starts running
 func (s *OssCrcSuite) TearDownSuite(c *C) {
 	// Delete part
-	lmur, err := s.bucket.ListMultipartUploads()
-	c.Assert(err, IsNil)
-
-	for _, upload := range lmur.Uploads {
-		var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
-			Key: upload.Key, UploadID: upload.UploadID}
-		err = s.bucket.AbortMultipartUpload(imur)
+	keyMarker := KeyMarker("")
+	uploadIdMarker := UploadIDMarker("")
+	for {
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 		c.Assert(err, IsNil)
+		for _, upload := range lmur.Uploads {
+			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
+				Key: upload.Key, UploadID: upload.UploadID}
+			err = s.bucket.AbortMultipartUpload(imur)
+			c.Assert(err, IsNil)
+		}
+		keyMarker = KeyMarker(lmur.NextKeyMarker)
+		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		if !lmur.IsTruncated {
+			break
+		}
 	}
 
 	// Delete objects
 	marker := Marker("")
-	for{
+	for {
 		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
 		for _, object := range lor.Objects {
@@ -65,7 +73,7 @@ func (s *OssCrcSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete bucket
-	err = s.client.DeleteBucket(s.bucket.BucketName)
+	err := s.client.DeleteBucket(s.bucket.BucketName)
 	c.Assert(err, IsNil)
 
 	testLogger.Println("test crc completed")

oss/download_test.go

@@ -35,19 +35,27 @@ func (s *OssDownloadSuite) SetUpSuite(c *C) {
 // TearDownSuite runs before each test or benchmark starts running
 func (s *OssDownloadSuite) TearDownSuite(c *C) {
 	// Delete part
-	lmur, err := s.bucket.ListMultipartUploads()
-	c.Assert(err, IsNil)
-
-	for _, upload := range lmur.Uploads {
-		var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
-			Key: upload.Key, UploadID: upload.UploadID}
-		err = s.bucket.AbortMultipartUpload(imur)
+	keyMarker := KeyMarker("")
+	uploadIdMarker := UploadIDMarker("")
+	for {
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 		c.Assert(err, IsNil)
+		for _, upload := range lmur.Uploads {
+			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
+				Key: upload.Key, UploadID: upload.UploadID}
+			err = s.bucket.AbortMultipartUpload(imur)
+			c.Assert(err, IsNil)
+		}
+		keyMarker = KeyMarker(lmur.NextKeyMarker)
+		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		if !lmur.IsTruncated {
+			break
+		}
 	}
 
 	// Delete objects
 	marker := Marker("")
-	for{
+	for {
 		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
 		for _, object := range lor.Objects {
@@ -61,8 +69,8 @@ func (s *OssDownloadSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete bucket
-	err = s.client.DeleteBucket(s.bucket.BucketName)
-	c.Assert(err, IsNil)	
+	err := s.client.DeleteBucket(s.bucket.BucketName)
+	c.Assert(err, IsNil)
 
 	testLogger.Println("test download completed")
 }

oss/multicopy_test.go

@@ -34,19 +34,27 @@ func (s *OssCopySuite) SetUpSuite(c *C) {
 // TearDownSuite runs before each test or benchmark starts running
 func (s *OssCopySuite) TearDownSuite(c *C) {
 	// Delete Part
-	lmur, err := s.bucket.ListMultipartUploads()
-	c.Assert(err, IsNil)
-
-	for _, upload := range lmur.Uploads {
-		var imur = InitiateMultipartUploadResult{Bucket: bucketName,
-			Key: upload.Key, UploadID: upload.UploadID}
-		err = s.bucket.AbortMultipartUpload(imur)
+	keyMarker := KeyMarker("")
+	uploadIdMarker := UploadIDMarker("")
+	for {
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 		c.Assert(err, IsNil)
+		for _, upload := range lmur.Uploads {
+			var imur = InitiateMultipartUploadResult{Bucket: bucketName,
+				Key: upload.Key, UploadID: upload.UploadID}
+			err = s.bucket.AbortMultipartUpload(imur)
+			c.Assert(err, IsNil)
+		}
+		keyMarker = KeyMarker(lmur.NextKeyMarker)
+		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		if !lmur.IsTruncated {
+			break
+		}
 	}
 
 	// Delete objects
 	marker := Marker("")
-	for{
+	for {
 		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
 		for _, object := range lor.Objects {
@@ -60,9 +68,9 @@ func (s *OssCopySuite) TearDownSuite(c *C) {
 	}
 
 	// Delete bucket
-	err = s.client.DeleteBucket(s.bucket.BucketName)
+	err := s.client.DeleteBucket(s.bucket.BucketName)
 	c.Assert(err, IsNil)
-	
+
 	testLogger.Println("test copy completed")
 }
 

oss/multipart_test.go

@@ -33,19 +33,27 @@ func (s *OssBucketMultipartSuite) SetUpSuite(c *C) {
 	s.bucket = bucket
 
 	// Delete part
-	lmur, err := s.bucket.ListMultipartUploads()
-	c.Assert(err, IsNil)
-
-	for _, upload := range lmur.Uploads {
-		var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
-			Key: upload.Key, UploadID: upload.UploadID}
-		err = s.bucket.AbortMultipartUpload(imur)
+	keyMarker := KeyMarker("")
+	uploadIdMarker := UploadIDMarker("")
+	for {
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 		c.Assert(err, IsNil)
+		for _, upload := range lmur.Uploads {
+			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
+				Key: upload.Key, UploadID: upload.UploadID}
+			err = s.bucket.AbortMultipartUpload(imur)
+			c.Assert(err, IsNil)
+		}
+		keyMarker = KeyMarker(lmur.NextKeyMarker)
+		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		if !lmur.IsTruncated {
+			break
+		}
 	}
 
 	// Delete objects
 	marker := Marker("")
-	for{
+	for {
 		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
 		for _, object := range lor.Objects {
@@ -64,19 +72,27 @@ func (s *OssBucketMultipartSuite) SetUpSuite(c *C) {
 // TearDownSuite runs before each test or benchmark starts running
 func (s *OssBucketMultipartSuite) TearDownSuite(c *C) {
 	// Delete part
-	lmur, err := s.bucket.ListMultipartUploads()
-	c.Assert(err, IsNil)
-
-	for _, upload := range lmur.Uploads {
-		var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
-			Key: upload.Key, UploadID: upload.UploadID}
-		err = s.bucket.AbortMultipartUpload(imur)
+	keyMarker := KeyMarker("")
+	uploadIdMarker := UploadIDMarker("")
+	for {
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 		c.Assert(err, IsNil)
+		for _, upload := range lmur.Uploads {
+			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
+				Key: upload.Key, UploadID: upload.UploadID}
+			err = s.bucket.AbortMultipartUpload(imur)
+			c.Assert(err, IsNil)
+		}
+		keyMarker = KeyMarker(lmur.NextKeyMarker)
+		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		if !lmur.IsTruncated {
+			break
+		}
 	}
 
 	// Delete objects
 	marker := Marker("")
-	for{
+	for {
 		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
 		for _, object := range lor.Objects {
@@ -90,9 +106,9 @@ func (s *OssBucketMultipartSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete bucket
-	err = s.client.DeleteBucket(s.bucket.BucketName)
+	err := s.client.DeleteBucket(s.bucket.BucketName)
 	c.Assert(err, IsNil)
-	
+
 	testLogger.Println("test multipart completed")
 }
 

oss/progress_test.go

@@ -39,18 +39,26 @@ func (s *OssProgressSuite) SetUpSuite(c *C) {
 // TearDownSuite runs before each test or benchmark starts running
 func (s *OssProgressSuite) TearDownSuite(c *C) {
 	// Abort multipart uploads
-	lmu, err := s.bucket.ListMultipartUploads()
-	c.Assert(err, IsNil)
-
-	for _, upload := range lmu.Uploads {
-		imur := InitiateMultipartUploadResult{Bucket: bucketName, Key: upload.Key, UploadID: upload.UploadID}
-		err = s.bucket.AbortMultipartUpload(imur)
+	keyMarker := KeyMarker("")
+	uploadIdMarker := UploadIDMarker("")
+	for {
+		lmu, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 		c.Assert(err, IsNil)
+		for _, upload := range lmu.Uploads {
+			imur := InitiateMultipartUploadResult{Bucket: bucketName, Key: upload.Key, UploadID: upload.UploadID}
+			err = s.bucket.AbortMultipartUpload(imur)
+			c.Assert(err, IsNil)
+		}
+		keyMarker = KeyMarker(lmu.NextKeyMarker)
+		uploadIdMarker = UploadIDMarker(lmu.NextUploadIDMarker)
+		if !lmu.IsTruncated {
+			break
+		}
 	}
-
+	
 	// Delete objects
 	marker := Marker("")
-	for{
+	for {
 		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
 		for _, object := range lor.Objects {
@@ -64,7 +72,7 @@ func (s *OssProgressSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete bucket
-	err = s.client.DeleteBucket(s.bucket.BucketName)
+	err := s.client.DeleteBucket(s.bucket.BucketName)
 	c.Assert(err, IsNil)
 
 	testLogger.Println("test progress completed")

oss/upload_test.go

@@ -35,19 +35,27 @@ func (s *OssUploadSuite) SetUpSuite(c *C) {
 // TearDownSuite runs before each test or benchmark starts running
 func (s *OssUploadSuite) TearDownSuite(c *C) {
 	// Delete part
-	lmur, err := s.bucket.ListMultipartUploads()
-	c.Assert(err, IsNil)
-
-	for _, upload := range lmur.Uploads {
-		var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
-			Key: upload.Key, UploadID: upload.UploadID}
-		err = s.bucket.AbortMultipartUpload(imur)
+	keyMarker := KeyMarker("")
+	uploadIdMarker := UploadIDMarker("")
+	for {
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 		c.Assert(err, IsNil)
+		for _, upload := range lmur.Uploads {
+			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
+				Key: upload.Key, UploadID: upload.UploadID}
+			err = s.bucket.AbortMultipartUpload(imur)
+			c.Assert(err, IsNil)
+		}
+		keyMarker = KeyMarker(lmur.NextKeyMarker)
+		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		if !lmur.IsTruncated {
+			break
+		}
 	}
 
 	// Delete objects
 	marker := Marker("")
-	for{
+	for {
 		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
 		for _, object := range lor.Objects {
@@ -61,8 +69,8 @@ func (s *OssUploadSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete bucket
-	err = s.client.DeleteBucket(s.bucket.BucketName)
-	c.Assert(err, IsNil)	
+	err := s.client.DeleteBucket(s.bucket.BucketName)
+	c.Assert(err, IsNil)
 
 	testLogger.Println("test upload completed")
 }

sample/comm.go

@@ -102,18 +102,26 @@ func DeleteTestBucketAndObject(bucketName string) error {
 	}
 
 	// Delete part
-	lmur, err := bucket.ListMultipartUploads()
-	if err != nil {
-		return err
-	}
-
-	for _, upload := range lmur.Uploads {
-		var imur = oss.InitiateMultipartUploadResult{Bucket: bucket.BucketName,
-			Key: upload.Key, UploadID: upload.UploadID}
-		err = bucket.AbortMultipartUpload(imur)
+	keyMarker := oss.KeyMarker("")
+	uploadIdMarker := oss.UploadIDMarker("")
+	for {
+		lmur, err := bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
 		if err != nil {
 			return err
 		}
+		for _, upload := range lmur.Uploads {
+			var imur = oss.InitiateMultipartUploadResult{Bucket: bucket.BucketName,
+				Key: upload.Key, UploadID: upload.UploadID}
+			err = bucket.AbortMultipartUpload(imur)
+			if err != nil {
+				return err
+			}
+		}
+		keyMarker = oss.KeyMarker(lmur.NextKeyMarker)
+		uploadIdMarker = oss.UploadIDMarker(lmur.NextUploadIDMarker)
+		if !lmur.IsTruncated {
+			break
+		}
 	}
 
 	// Delete objects