r/aws_s3_bucket: Use 'emptyBucket' in sweeper.

ewbankkit · ewbankkit · commit dbdbd12115fa · 2023-11-30T12:02:27.000-05:00
diff --git a/internal/service/s3/sweep.go b/internal/service/s3/sweep.go
@@ -58,7 +58,7 @@ func sweepObjects(region string) error {
 	}
 	conn := client.S3Client(ctx)
 
-	// General-purpose buckets.
+	// General purpose buckets.
 	output, err := conn.ListBuckets(ctx, &s3.ListBucketsInput{})
 
 	if awsv2.SkipSweepError(err) {
@@ -138,7 +138,7 @@ type objectSweeper struct {
 
 func (os objectSweeper) Delete(ctx context.Context, timeout time.Duration, optFns ...tfresource.OptionsFunc) error {
 	// Delete everything including locked objects.
-	_, err := deleteAllObjectVersions(ctx, os.conn, os.bucket, "", os.locked, true)
+	_, err := emptyBucket(ctx, os.conn, os.bucket, os.locked)
 	if err != nil {
 		return fmt.Errorf("deleting S3 Bucket (%s) objects: %w", os.bucket, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func sweepObjects(region string) error {`
`58`	`58`	`}`
`59`	`59`	`conn := client.S3Client(ctx)`
`60`	`60`
`61`		`- // General-purpose buckets.`
	`61`	`+ // General purpose buckets.`
`62`	`62`	`output, err := conn.ListBuckets(ctx, &s3.ListBucketsInput{})`
`63`	`63`
`64`	`64`	`if awsv2.SkipSweepError(err) {`
`@@ -138,7 +138,7 @@ type objectSweeper struct {`
`138`	`138`
`139`	`139`	`func (os objectSweeper) Delete(ctx context.Context, timeout time.Duration, optFns ...tfresource.OptionsFunc) error {`
`140`	`140`	`// Delete everything including locked objects.`
`141`		`- _, err := deleteAllObjectVersions(ctx, os.conn, os.bucket, "", os.locked, true)`
	`141`	`+ _, err := emptyBucket(ctx, os.conn, os.bucket, os.locked)`
`142`	`142`	`if err != nil {`
`143`	`143`	`return fmt.Errorf("deleting S3 Bucket (%s) objects: %w", os.bucket, err)`
`144`	`144`	`}`