Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r/s3_bucket: make Computed-only parameters configurable #23985

Merged
merged 42 commits into from
Apr 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f6afc22
r/s3_bucket: make 'acl' and 'grant' configurable
anGie44 Mar 23, 2022
32b6a31
Update CHANGELOG for #23798
anGie44 Mar 23, 2022
1bbeb42
Reformat arg details
anGie44 Mar 31, 2022
3ab5e35
Update CHANGELOG.md for #23798
Mar 31, 2022
e156790
r/s3_bucket: make 'acceleration_status' configurable
anGie44 Mar 23, 2022
d4025da
Update CHANGELOG for #23816
anGie44 Mar 23, 2022
1fdfe2e
Update CHANGELOG.md for #23816
Mar 31, 2022
6ffc28d
r/s3_bucket: make 'cors_rule' configurable
anGie44 Mar 23, 2022
2e17219
Update CHANGELOG for #23817
anGie44 Mar 23, 2022
764b18d
Update CHANGELOG.md for #23817
Mar 31, 2022
7f08096
r/s3_bucket: make 'lifecycle_rule' configurable
anGie44 Mar 23, 2022
6fc0463
Update CHANGELOG for #23818
anGie44 Mar 23, 2022
1214633
Update CHANGELOG.md for #23818
Mar 31, 2022
f00ccb9
r/s3_bucket: make 'logging' configurable
anGie44 Mar 31, 2022
2cf464c
Update CHANGELOG for #23819
anGie44 Mar 31, 2022
ed0c5f3
Update CHANGELOG.md for #23819
Mar 31, 2022
8acc6bc
r/s3_bucket: make 'versioning' configurable
anGie44 Mar 31, 2022
ba25d0f
Update CHANGELOG for #23820
anGie44 Mar 31, 2022
d8893ea
Update CHANGELOG.md for #23820
Mar 31, 2022
e9bbebc
r/s3_bucket: make 'website' configurable
anGie44 Apr 1, 2022
0d502fd
Update CHANGELOG for #23821
anGie44 Apr 1, 2022
3638a90
Update CHANGELOG.md for #23821
Apr 1, 2022
60f0140
r/s3_bucket: make 'server_side_encryption_configuration' configurable
anGie44 Mar 23, 2022
b4c08d3
Update CHANGELOG for #23822
anGie44 Mar 23, 2022
e1cfa23
Update CHANGELOG.md for #23822
Apr 1, 2022
d825c9e
r/s3_bucket: make 'replication_configuration' configurable
anGie44 Apr 1, 2022
fa49a1b
Update CHANGELOG for #23842
anGie44 Apr 1, 2022
540212e
Update CHANGELOG.md for #23842
Apr 1, 2022
c540b6d
r/s3_bucket: make 'policy' configurable
anGie44 Apr 1, 2022
efdca46
Update CHANGELOG for #23843
anGie44 Apr 1, 2022
644cd29
Update CHANGELOG.md for #23843
Apr 1, 2022
fe0f04f
r/s3_bucket: make 'request_payer' configurable
anGie44 Apr 1, 2022
6c78858
Update CHANGELOG for #23844
anGie44 Apr 1, 2022
8057f87
Update CHANGELOG.md for #23844
Apr 1, 2022
a912ad5
r/s3_bucket: make 'object_lock_configuration.rule' configurable
anGie44 Apr 1, 2022
e63baf0
Update CHANGELOG for #23984
anGie44 Apr 1, 2022
138a0e9
Update CHANGELOG.md (Manual Trigger)
Apr 1, 2022
fb87e19
update Version 4 upgrade guide with S3 bucket remediation info
anGie44 Apr 1, 2022
29c5395
Provide examples of standalone resource adoption
anGie44 Apr 1, 2022
f5c9f0c
Update CHANGELOG for #23985
anGie44 Apr 2, 2022
43beb78
Tweaks to documentation
gdavison Apr 5, 2022
76c2c51
Updates test to use `arn` parameter instead of manually-generated ARN
gdavison Apr 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/23798.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `acl` and `grant` parameters to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring these parameters with the standalone `aws_s3_bucket_acl` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23816.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `acceleration_status` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_accelerate_configuration` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23817.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `cors_rule` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_cors_configuration` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23818.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `lifecycle_rule` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_lifecycle_configuration` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23819.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `logging` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_logging` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23820.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `versioning` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_versioning` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23821.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `website` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_website_configuration` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23822.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `server_side_encryption_configuration` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_server_side_encryption_configuration` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23842.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `replication_configuration` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_replication_configuration` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23843.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `policy` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_policy` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23844.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `request_payer` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_request_payment_configuration` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23984.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket: Update `object_lock_configuration.rule` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_object_lock_configuration` resource.
```
3 changes: 3 additions & 0 deletions .changelog/23985.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:note
resource/aws_s3_bucket: The `acceleration_status`, `acl`, `cors_rule`, `grant`, `lifecycle_rule`, `logging`, `object_lock_configuration.rule`, `policy`, `replication_configuration`, `request_payer`, `server_side_encryption_configuration`, `versioning`, and `website` parameters are now Optional. Please refer to the documentation for details on drift detection and potential conflicts when configuring these parameters with the standalone `aws_s3_bucket_*` resources.
```
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ ENHANCEMENTS:
* resource/aws_iot_authorizer: Add `enable_caching_for_http` argument ([#23993](https://github.com/hashicorp/terraform-provider-aws/issues/23993))
* resource/aws_lambda_permission: Add `principal_org_id` argument. ([#24001](https://github.com/hashicorp/terraform-provider-aws/issues/24001))
* resource/aws_mq_broker: Add validation to `broker_name` and `security_groups` arguments ([#18088](https://github.com/hashicorp/terraform-provider-aws/issues/18088))
* resource/aws_s3_bucket: Update `acceleration_status` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_accelerate_configuration` resource. ([#23816](https://github.com/hashicorp/terraform-provider-aws/issues/23816))
* resource/aws_s3_bucket: Update `acl` and `grant` parameters to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring these parameters with the standalone `aws_s3_bucket_acl` resource. ([#23798](https://github.com/hashicorp/terraform-provider-aws/issues/23798))
* resource/aws_s3_bucket: Update `cors_rule` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_cors_configuration` resource. ([#23817](https://github.com/hashicorp/terraform-provider-aws/issues/23817))
* resource/aws_s3_bucket: Update `lifecycle_rule` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_lifecycle_configuration` resource. ([#23818](https://github.com/hashicorp/terraform-provider-aws/issues/23818))
* resource/aws_s3_bucket: Update `logging` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_logging` resource. ([#23819](https://github.com/hashicorp/terraform-provider-aws/issues/23819))
* resource/aws_s3_bucket: Update `object_lock_configuration.rule` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_object_lock_configuration` resource. ([#23984](https://github.com/hashicorp/terraform-provider-aws/issues/23984))
* resource/aws_s3_bucket: Update `policy` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_policy` resource. ([#23843](https://github.com/hashicorp/terraform-provider-aws/issues/23843))
* resource/aws_s3_bucket: Update `replication_configuration` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_replication_configuration` resource. ([#23842](https://github.com/hashicorp/terraform-provider-aws/issues/23842))
* resource/aws_s3_bucket: Update `request_payer` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_request_payment_configuration` resource. ([#23844](https://github.com/hashicorp/terraform-provider-aws/issues/23844))
* resource/aws_s3_bucket: Update `server_side_encryption_configuration` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_server_side_encryption_configuration` resource. ([#23822](https://github.com/hashicorp/terraform-provider-aws/issues/23822))
* resource/aws_s3_bucket: Update `versioning` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_versioning` resource. ([#23820](https://github.com/hashicorp/terraform-provider-aws/issues/23820))
* resource/aws_s3_bucket: Update `website` parameter to be configurable. Please refer to the documentation for details on drift detection and potential conflicts when configuring this parameter with the standalone `aws_s3_bucket_website_configuration` resource. ([#23821](https://github.com/hashicorp/terraform-provider-aws/issues/23821))
* resource/aws_route: Add `core_network_arn` argument ([#24024](https://github.com/hashicorp/terraform-provider-aws/issues/24024))
* resource/aws_route_table: Add `core_network_arn` argument to the `route` configuration block ([#24024](https://github.com/hashicorp/terraform-provider-aws/issues/24024))
* resource/aws_vpc_ipam: add `cascade` argument ([#23973](https://github.com/hashicorp/terraform-provider-aws/issues/23973))
Expand Down
2 changes: 1 addition & 1 deletion internal/service/elb/load_balancer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,7 @@ resource "aws_s3_bucket_policy" "test" {
"Principal": {
"AWS": "${data.aws_elb_service_account.current.arn}"
},
"Resource": "arn:${data.aws_partition.current.partition}:s3:::%[1]s/*",
"Resource": "${aws_s3_bucket.accesslogs_bucket.arn}/*",
"Sid": "Stmt1446575236270"
}
],
Expand Down
Loading