r/aws_s3_bucket_versioning: Ensure NotFound after resource Delete.

ewbankkit · ewbankkit · commit 1ecf9863a1e1 · 2023-09-20T13:36:38.000-04:00
diff --git a/internal/service/s3/bucket_versioning.go b/internal/service/s3/bucket_versioning.go
@@ -237,6 +237,14 @@ func resourceBucketVersioningDelete(ctx context.Context, d *schema.ResourceData,
 		return diag.Errorf("deleting S3 Bucket Versioning (%s): %s", d.Id(), err)
 	}
 
+	_, err = tfresource.RetryUntilNotFound(ctx, s3BucketPropagationTimeout, func() (interface{}, error) {
+		return findBucketVersioning(ctx, conn, bucket, expectedBucketOwner)
+	})
+
+	if err != nil {
+		return diag.Errorf("waiting for S3 Bucket Versioning (%s) delete: %s", d.Id(), err)
+	}
+
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,14 @@ func resourceBucketVersioningDelete(ctx context.Context, d *schema.ResourceData,`
`237`	`237`	`return diag.Errorf("deleting S3 Bucket Versioning (%s): %s", d.Id(), err)`
`238`	`238`	`}`
`239`	`239`
	`240`	`+ _, err = tfresource.RetryUntilNotFound(ctx, s3BucketPropagationTimeout, func() (interface{}, error) {`
	`241`	`+ return findBucketVersioning(ctx, conn, bucket, expectedBucketOwner)`
	`242`	`+ })`
	`243`	`+`
	`244`	`+ if err != nil {`
	`245`	`+ return diag.Errorf("waiting for S3 Bucket Versioning (%s) delete: %s", d.Id(), err)`
	`246`	`+ }`
	`247`	`+`
`240`	`248`	`return nil`
`241`	`249`	`}`
`242`	`250`