소스 검색

list all object to delete

lyz 6 년 전
부모
커밋
a74500eb2c
9개의 변경된 파일115개의 추가작업 그리고 54개의 파일을 삭제
  1. 12 6
      oss/bucket_test.go
  2. 12 6
      oss/client_test.go
  3. 11 5
      oss/crc_test.go
  4. 11 5
      oss/download_test.go
  5. 11 5
      oss/multicopy_test.go
  6. 22 10
      oss/multipart_test.go
  7. 12 5
      oss/progress_test.go
  8. 11 5
      oss/upload_test.go
  9. 13 7
      sample/comm.go

+ 12 - 6
oss/bucket_test.go

@@ -71,14 +71,20 @@ func (s *OssBucketSuite) TearDownSuite(c *C) {
 			err = bucket.AbortMultipartUpload(imur)
 			c.Assert(err, IsNil)
 		}
-
+		
 		// Delete objects
-		lor, err := bucket.ListObjects()
-		c.Assert(err, IsNil)
-
-		for _, object := range lor.Objects {
-			err = bucket.DeleteObject(object.Key)
+		marker := Marker("")
+		for{
+			lor, err := bucket.ListObjects(marker)
 			c.Assert(err, IsNil)
+			for _, object := range lor.Objects {
+				err = bucket.DeleteObject(object.Key)
+				c.Assert(err, IsNil)
+			}
+			marker = Marker(lor.NextMarker)
+			if !lor.IsTruncated {
+					break
+			}
 		}
 
 		// Delete bucket

+ 12 - 6
oss/client_test.go

@@ -47,7 +47,7 @@ var (
 
 var (
 	// prefix of bucket name for bucket ops test
-	basePrefix = "go-sdk-test-bucket-abcx-"
+	basePrefix       = "go-sdk-test-bucket-abcx-"
 	bucketNamePrefix = "go-sdk-test-bucket-abcx-" + randLowStr(6) + "-"
 	// bucket name for object ops test
 	bucketName        = "go-sdk-test-bucket-abcx-for-object-" + randLowStr(6)
@@ -128,12 +128,18 @@ func (s *OssClientSuite) deleteBucket(client *Client, bucketName string, c *C) {
 	c.Assert(err, IsNil)
 
 	// Delete Object
-	lor, err := bucket.ListObjects()
-	c.Assert(err, IsNil)
-
-	for _, object := range lor.Objects {
-		err = bucket.DeleteObject(object.Key)
+	marker := Marker("")
+	for {
+		lor, err := bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
+		for _, object := range lor.Objects {
+			err = bucket.DeleteObject(object.Key)
+			c.Assert(err, IsNil)
+		}
+		marker = Marker(lor.NextMarker)
+		if !lor.IsTruncated {
+			break
+		}
 	}
 
 	// Delete Part

+ 11 - 5
oss/crc_test.go

@@ -50,12 +50,18 @@ func (s *OssCrcSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete objects
-	lor, err := s.bucket.ListObjects()
-	c.Assert(err, IsNil)
-
-	for _, object := range lor.Objects {
-		err = s.bucket.DeleteObject(object.Key)
+	marker := Marker("")
+	for{
+		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
+		for _, object := range lor.Objects {
+			err = s.bucket.DeleteObject(object.Key)
+			c.Assert(err, IsNil)
+		}
+		marker = Marker(lor.NextMarker)
+		if !lor.IsTruncated {
+				break
+		}
 	}
 
 	// Delete bucket

+ 11 - 5
oss/download_test.go

@@ -46,12 +46,18 @@ func (s *OssDownloadSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete objects
-	lor, err := s.bucket.ListObjects()
-	c.Assert(err, IsNil)
-
-	for _, object := range lor.Objects {
-		err = s.bucket.DeleteObject(object.Key)
+	marker := Marker("")
+	for{
+		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
+		for _, object := range lor.Objects {
+			err = s.bucket.DeleteObject(object.Key)
+			c.Assert(err, IsNil)
+		}
+		marker = Marker(lor.NextMarker)
+		if !lor.IsTruncated {
+				break
+		}
 	}
 
 	// Delete bucket

+ 11 - 5
oss/multicopy_test.go

@@ -45,12 +45,18 @@ func (s *OssCopySuite) TearDownSuite(c *C) {
 	}
 
 	// Delete objects
-	lor, err := s.bucket.ListObjects()
-	c.Assert(err, IsNil)
-
-	for _, object := range lor.Objects {
-		err = s.bucket.DeleteObject(object.Key)
+	marker := Marker("")
+	for{
+		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
+		for _, object := range lor.Objects {
+			err = s.bucket.DeleteObject(object.Key)
+			c.Assert(err, IsNil)
+		}
+		marker = Marker(lor.NextMarker)
+		if !lor.IsTruncated {
+				break
+		}
 	}
 
 	// Delete bucket

+ 22 - 10
oss/multipart_test.go

@@ -44,12 +44,18 @@ func (s *OssBucketMultipartSuite) SetUpSuite(c *C) {
 	}
 
 	// Delete objects
-	lor, err := s.bucket.ListObjects()
-	c.Assert(err, IsNil)
-
-	for _, object := range lor.Objects {
-		err = s.bucket.DeleteObject(object.Key)
+	marker := Marker("")
+	for{
+		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
+		for _, object := range lor.Objects {
+			err = s.bucket.DeleteObject(object.Key)
+			c.Assert(err, IsNil)
+		}
+		marker = Marker(lor.NextMarker)
+		if !lor.IsTruncated {
+				break
+		}
 	}
 
 	testLogger.Println("test multipart started")
@@ -69,12 +75,18 @@ func (s *OssBucketMultipartSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete objects
-	lor, err := s.bucket.ListObjects()
-	c.Assert(err, IsNil)
-
-	for _, object := range lor.Objects {
-		err = s.bucket.DeleteObject(object.Key)
+	marker := Marker("")
+	for{
+		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
+		for _, object := range lor.Objects {
+			err = s.bucket.DeleteObject(object.Key)
+			c.Assert(err, IsNil)
+		}
+		marker = Marker(lor.NextMarker)
+		if !lor.IsTruncated {
+				break
+		}
 	}
 
 	// Delete bucket

+ 12 - 5
oss/progress_test.go

@@ -15,6 +15,7 @@ import (
 type OssProgressSuite struct {
 	client *Client
 	bucket *Bucket
+
 }
 
 var _ = Suite(&OssProgressSuite{})
@@ -48,12 +49,18 @@ func (s *OssProgressSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete objects
-	lor, err := s.bucket.ListObjects()
-	c.Assert(err, IsNil)
-
-	for _, object := range lor.Objects {
-		err = s.bucket.DeleteObject(object.Key)
+	marker := Marker("")
+	for{
+		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
+		for _, object := range lor.Objects {
+			err = s.bucket.DeleteObject(object.Key)
+			c.Assert(err, IsNil)
+		}
+		marker = Marker(lor.NextMarker)
+		if !lor.IsTruncated {
+				break
+		}
 	}
 
 	// Delete bucket

+ 11 - 5
oss/upload_test.go

@@ -46,12 +46,18 @@ func (s *OssUploadSuite) TearDownSuite(c *C) {
 	}
 
 	// Delete objects
-	lor, err := s.bucket.ListObjects()
-	c.Assert(err, IsNil)
-
-	for _, object := range lor.Objects {
-		err = s.bucket.DeleteObject(object.Key)
+	marker := Marker("")
+	for{
+		lor, err := s.bucket.ListObjects(marker)
 		c.Assert(err, IsNil)
+		for _, object := range lor.Objects {
+			err = s.bucket.DeleteObject(object.Key)
+			c.Assert(err, IsNil)
+		}
+		marker = Marker(lor.NextMarker)
+		if !lor.IsTruncated {
+				break
+		}
 	}
 
 	// Delete bucket

+ 13 - 7
sample/comm.go

@@ -117,16 +117,22 @@ func DeleteTestBucketAndObject(bucketName string) error {
 	}
 
 	// Delete objects
-	lor, err := bucket.ListObjects()
-	if err != nil {
-		return err
-	}
-
-	for _, object := range lor.Objects {
-		err = bucket.DeleteObject(object.Key)
+	marker := oss.Marker("")
+	for {
+		lor, err := bucket.ListObjects(marker)
 		if err != nil {
 			return err
 		}
+		for _, object := range lor.Objects {
+			err = bucket.DeleteObject(object.Key)
+			if err != nil {
+				return err
+			}
+		}
+		marker = oss.Marker(lor.NextMarker)
+		if !lor.IsTruncated {
+			break
+		}
 	}
 
 	// Delete bucket