Merge pull request #22614 from hashicorp/f-s3-bucket-deprecate-website

r/s3_bucket: read-only `website`, `website_endpoint`, and `website_domain` arguments
hashicorp · Feb 4, 2022 · bb560f7 · bb560f7
2 parents 58cedda + 4a7f8e5
commit bb560f7
Show file tree

Hide file tree

Showing 12 changed files with 319 additions and 632 deletions.
diff --git a/.changelog/22614.txt b/.changelog/22614.txt
@@ -0,0 +1,2 @@
+```release-note:breaking-change
+resource/aws_s3_bucket: The `website`, `website_domain`, and `website_endpoint` arguments have been deprecated and are now read-only. Use the `aws_s3_bucket_website_configuration` resource instead.
diff --git a/internal/service/cloudformation/stack_test.go b/internal/service/cloudformation/stack_test.go
@@ -851,11 +851,15 @@ resource "aws_s3_bucket" "b" {
   ]
 }
 POLICY
+}
 
-
-  website {
-    index_document = "index.html"
-    error_document = "error.html"
+resource "aws_s3_website_configuration" "test" {
+  bucket = aws_s3_bucket.b.id
+  index_document {
+    suffix = "index.html"
+  }
+  error_document {
+    key = "error.html"
   }
 }
 
@@ -905,11 +909,15 @@ resource "aws_s3_bucket" "b" {
   ]
 }
 POLICY
+}
 
-
-  website {
-    index_document = "index.html"
-    error_document = "error.html"
+resource "aws_s3_bucket_website_configuration" "test" {
+  bucket = aws_s3_bucket.b.id
+  index_document {
+    suffix = "index.html"
+  }
+  error_document {
+    key = "error.html"
   }
 }
 

diff --git a/internal/service/route53/record_test.go b/internal/service/route53/record_test.go
@@ -1767,9 +1767,12 @@ resource "aws_route53_zone" "main" {
 resource "aws_s3_bucket" "website" {
   bucket = %[1]q
   acl    = "public-read"
+}
 
-  website {
-    index_document = "index.html"
+resource "aws_s3_bucket_website_configuration" "test" {
+  bucket = aws_s3_bucket.website.id
+  index_document {
+    suffix = "index.html"
   }
 }
 
@@ -1780,7 +1783,7 @@ resource "aws_route53_record" "alias" {
 
   alias {
     zone_id                = aws_s3_bucket.website.hosted_zone_id
-    name                   = aws_s3_bucket.website.website_domain
+    name                   = aws_s3_bucket_website_configuration.test.website_domain
     evaluate_target_health = true
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		```release-note:breaking-change
		resource/aws_s3_bucket: The `website`, `website_domain`, and `website_endpoint` arguments have been deprecated and are now read-only. Use the `aws_s3_bucket_website_configuration` resource instead.