Skip to content

feat: Upgrade S3 module to support AWS Provider 4.x #138

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.

Sign up for GitHub

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

Closed
robwittman wants to merge 8 commits into from
Closed

feat: Upgrade S3 module to support AWS Provider 4.x #138

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
18f2deb
Upgrade S3 module to support AWS Provider 4.x
robwittman Mar 7, 2022
fe50d04
Apply complete example to test
robwittman Mar 7, 2022
c7950f2
Revert var.website to map(string)
robwittman Mar 7, 2022
33cbc55
Address feedback
robwittman Mar 7, 2022
d834ded
Remove var.create_bucket
robwittman Mar 8, 2022
d2a56eb
Make aws_s3_bucket_acl conditional
robwittman Mar 8, 2022
c9698f6
Make access_control_policy a string, fix ACL count check
robwittman Mar 8, 2022
76ad336
Fix evaluation of lifecycle.rule.expiration
robwittman Mar 9, 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
Prev Previous commit
Next Next commit
Make aws_s3_bucket_acl conditional
  • Loading branch information
@robwittman
robwittman committed Mar 8, 2022
commit d2a56eba9cca7b5b369161e9a4b1c8fe588a68b4
4 changes: 3 additions & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,10 @@ resource "aws_s3_bucket_accelerate_configuration" "this" {
}

resource "aws_s3_bucket_acl" "this" {
count = var.acl == "" && length(keys(try(jsondecode(var.access_control_policy), var.access_control_policy))) == 0 ? 0 : 1

bucket = aws_s3_bucket.this.id
acl = var.acl != "null" ? var.acl : null
acl = var.acl

dynamic "access_control_policy" {
for_each = length(try(jsondecode(var.access_control_policy), var.access_control_policy)) == 0 ? [] : [try(jsondecode(var.access_control_policy), var.access_control_policy)]
Expand Down