Merge pull request #24266 from hashicorp/b-s3-bucket-sse-eventual-con…

…sistency r/s3_bucket_server_side_encryption_configuration: retry on SSE not found errors
hashicorp · Apr 15, 2022 · ac4fd22 · ac4fd22
2 parents c942e1d + dc4159b
commit ac4fd22
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.changelog/24266.txt 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
+```
diff --git 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())