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

Show file tree
Hide file tree
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
Address feedback
  • Loading branch information
@robwittman
robwittman committed Mar 7, 2022
commit 33cbc55dc7b4f09de565d2b0e438e3b84cc01438
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ No modules.
|------|-------------|------|---------|:--------:|
| <a name="input_acceleration_status"></a> [acceleration\_status](#input\_acceleration\_status) | (Optional) Sets the accelerate configuration of an existing bucket. Can be Enabled or Suspended. | `string` | `null` | no |
| <a name="input_access_control_policy"></a> [access\_control\_policy](#input\_access\_control\_policy) | An ACL policy grant. Conflicts with `acl` | `any` | `[]` | no |
| <a name="input_acl"></a> [acl](#input\_acl) | (Optional) The canned ACL to apply. Defaults to 'private'. Conflicts with `grant` | `string` | `"private"` | no |
| <a name="input_acl"></a> [acl](#input\_acl) | (Optional) The canned ACL to apply. Defaults to 'private'. Conflicts with `access_control_policy` | `string` | `"private"` | no |
| <a name="input_attach_deny_insecure_transport_policy"></a> [attach\_deny\_insecure\_transport\_policy](#input\_attach\_deny\_insecure\_transport\_policy) | Controls if S3 bucket should have deny non-SSL transport policy attached | `bool` | `false` | no |
| <a name="input_attach_elb_log_delivery_policy"></a> [attach\_elb\_log\_delivery\_policy](#input\_attach\_elb\_log\_delivery\_policy) | Controls if S3 bucket should have ELB log delivery policy attached | `bool` | `false` | no |
| <a name="input_attach_lb_log_delivery_policy"></a> [attach\_lb\_log\_delivery\_policy](#input\_attach\_lb\_log\_delivery\_policy) | Controls if S3 bucket should have ALB/NLB log delivery policy attached | `bool` | `false` | no |
Expand Down
2 changes: 1 addition & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ resource "aws_s3_bucket_accelerate_configuration" "this" {
status = var.acceleration_status
}

# TODO: This should accept both ACL and Grant, exclusively
resource "aws_s3_bucket_acl" "this" {
bucket = aws_s3_bucket.this[0].id
acl = var.acl != "null" ? var.acl : null
Expand Down Expand Up @@ -257,6 +256,7 @@ resource "aws_s3_bucket_cors_configuration" "this" {
for_each = try(jsondecode(var.cors_rule), var.cors_rule)

content {
id = lookup(cors_rule.value, "id", null)
allowed_methods = cors_rule.value.allowed_methods
allowed_origins = cors_rule.value.allowed_origins
allowed_headers = lookup(cors_rule.value, "allowed_headers", null)
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ variable "bucket_prefix" {
}

variable "acl" {
description = "(Optional) The canned ACL to apply. Defaults to 'private'. Conflicts with `grant`"
description = "(Optional) The canned ACL to apply. Defaults to 'private'. Conflicts with `access_control_policy`"
type = string
default = "private"
}
Expand Down