From 67607b748cf23ff74e657874aeb2de95b0ec82d5 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Fri, 15 Apr 2022 12:25:25 -0400 Subject: [PATCH 1/2] r/s3_bucket_server_side_encryption_configuration: retry on SSE not found errors --- .../s3/bucket_server_side_encryption_configuration.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/service/s3/bucket_server_side_encryption_configuration.go b/internal/service/s3/bucket_server_side_encryption_configuration.go index 82c545376580..5b82697d9da0 100644 --- a/internal/service/s3/bucket_server_side_encryption_configuration.go +++ b/internal/service/s3/bucket_server_side_encryption_configuration.go @@ -124,9 +124,14 @@ func resourceBucketServerSideEncryptionConfigurationRead(ctx context.Context, d input.ExpectedBucketOwner = aws.String(expectedBucketOwner) } - resp, err := verify.RetryOnAWSCode(s3.ErrCodeNoSuchBucket, func() (interface{}, error) { - return conn.GetBucketEncryptionWithContext(ctx, input) - }) + resp, err := tfresource.RetryWhenAWSErrCodeEquals( + propagationTimeout, + func() (interface{}, error) { + return conn.GetBucketEncryptionWithContext(ctx, input) + }, + s3.ErrCodeNoSuchBucket, + ErrCodeServerSideEncryptionConfigurationNotFound, + ) if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, s3.ErrCodeNoSuchBucket, ErrCodeServerSideEncryptionConfigurationNotFound) { log.Printf("[WARN] S3 Bucket Server-Side Encryption Configuration (%s) not found, removing from state", d.Id()) From dc4159bdc094cf849977f12275f5c1690f82e65b Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Fri, 15 Apr 2022 12:29:18 -0400 Subject: [PATCH 2/2] Update CHANGELOG for #24266 --- .changelog/24266.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/24266.txt diff --git a/.changelog/24266.txt b/.changelog/24266.txt new file mode 100644 index 000000000000..a70738b65e3f --- /dev/null +++ b/.changelog/24266.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_s3_bucket_server_side_encryption_configuration: Retry on `ServerSideEncryptionConfigurationNotFoundError` errors due to eventual consistency +``` \ No newline at end of file