Update example to use NewDeleteListIterator with Paginator for use wi…

…th s3manager.NewBatchDelete.

mbow

go/example_code/s3/s3_delete_objects.go

@@ -15,11 +15,13 @@
 package main
 
 import (
+    "fmt"
+    "os"
+
     "github.com/aws/aws-sdk-go/aws"
     "github.com/aws/aws-sdk-go/aws/session"
     "github.com/aws/aws-sdk-go/service/s3"
-    "fmt"
-    "os"
+    "github.com/aws/aws-sdk-go/service/s3/s3manager"
 )
 
 // Deletes all of the objects in the specified S3 Bucket in the region configured in the shared config
@@ -29,8 +31,7 @@ import (
 //    go run s3_delete_objects BUCKET
 func main() {
     if len(os.Args) != 2 {
-        exitErrorf("Bucket name required\nUsage: %s BUCKET",
-            os.Args[0])
+        exitErrorf("Bucket name required\nUsage: %s BUCKET", os.Args[0])
     }
 
     bucket := os.Args[1]
@@ -44,44 +45,17 @@ func main() {
     // Create S3 service client
     svc := s3.New(sess)
 
-    // Get the list of objects
-    // Note that if the bucket has more than 1000 objects,
-    // we have to run this multiple times
-    hasMoreObjects := true
-    // Keep track of how many objects we delete
-    totalObjects := 0
-
-    for hasMoreObjects {
-        resp, err := svc.ListObjects(&s3.ListObjectsInput{Bucket: aws.String(bucket)})
-        if err != nil {
-            exitErrorf("Unable to list items in bucket %q, %v", bucket, err)
-        }
-
-        numObjs := len(resp.Contents)
-        totalObjects += numObjs
-
-        // Create Delete object with slots for the objects to delete
-        var items s3.Delete
-        var objs= make([]*s3.ObjectIdentifier, numObjs)
-
-        for i, o := range resp.Contents {
-            // Add objects from command line to array
-            objs[i] = &s3.ObjectIdentifier{Key: aws.String(*o.Key)}
-        }
-
-        // Add list of objects to delete to Delete object
-        items.SetObjects(objs)
-
-        // Delete the items
-        _, err = svc.DeleteObjects(&s3.DeleteObjectsInput{Bucket: &bucket, Delete: &items})
-        if err != nil {
-            exitErrorf("Unable to delete objects from bucket %q, %v", bucket, err)
-        }
+    // Setup BatchDeleteIterator to iterate through a list of objects.
+    iter := s3manager.NewDeleteListIterator(svc, &s3.ListObjectsInput{
+        Bucket: aws.String(bucket),
+    })
 
-        hasMoreObjects = *resp.IsTruncated
+    // Traverse iterator deleting each object
+    if err := s3manager.NewBatchDeleteWithClient(svc).Delete(aws.BackgroundContext(), iter); err != nil {
+        exitErrorf("Unable to delete objects from bucket %q, %v", bucket, err)
     }
 
-    fmt.Println("Deleted", totalObjects, "object(s) from bucket", bucket)
+    fmt.Printf("Deleted object(s) from bucket: %s", bucket)
 }
 
 func exitErrorf(msg string, args ...interface{}) {