Skip to content

Commit

Permalink
feat: support a list of CORS rules instead of a single rule (#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
exocom committed Aug 17, 2020
1 parent 4bc5b4d commit 4e1d7ab
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ module "s3_bucket" {
| block\_public\_policy | Whether Amazon S3 should block public bucket policies for this bucket. | `bool` | `false` | no |
| bucket | (Optional, Forces new resource) The name of the bucket. If omitted, Terraform will assign a random, unique name. | `string` | `null` | no |
| bucket\_prefix | (Optional, Forces new resource) Creates a unique bucket name beginning with the specified prefix. Conflicts with bucket. | `string` | `null` | no |
| cors\_rule | Map containing a rule of Cross-Origin Resource Sharing. | `any` | `{}` | no |
| cors\_rule | List of maps containing rules for Cross-Origin Resource Sharing. | `list(any)` | `[]` | no |
| create\_bucket | Controls if S3 bucket should be created | `bool` | `true` | no |
| force\_destroy | (Optional, Default:false ) A boolean that indicates all objects should be deleted from the bucket so that the bucket can be destroyed without error. These objects are not recoverable. | `bool` | `false` | no |
| ignore\_public\_acls | Whether Amazon S3 should ignore public ACLs for this bucket. | `bool` | `false` | no |
Expand Down
22 changes: 15 additions & 7 deletions examples/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,21 @@ module "s3_bucket" {
target_prefix = "log/"
}

cors_rule = {
allowed_methods = ["PUT", "POST"]
allowed_origins = ["https://modules.tf", "https://terraform-aws-modules.modules.tf"]
allowed_headers = ["*"]
expose_headers = ["ETag"]
max_age_seconds = 3000
}
cors_rule = [
{
allowed_methods = ["PUT", "POST"]
allowed_origins = ["https://modules.tf", "https://terraform-aws-modules.modules.tf"]
allowed_headers = ["*"]
expose_headers = ["ETag"]
max_age_seconds = 3000
}, {
allowed_methods = ["PUT"]
allowed_origins = ["https://example.com"]
allowed_headers = ["*"]
expose_headers = ["ETag"]
max_age_seconds = 3000
}
]

lifecycle_rule = [
{
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ resource "aws_s3_bucket" "this" {
}

dynamic "cors_rule" {
for_each = length(keys(var.cors_rule)) == 0 ? [] : [var.cors_rule]
for_each = var.cors_rule

content {
allowed_methods = cors_rule.value.allowed_methods
Expand Down
6 changes: 3 additions & 3 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ variable "website" {
}

variable "cors_rule" {
description = "Map containing a rule of Cross-Origin Resource Sharing."
type = any # should be `map`, but it produces an error "all map elements must have the same type"
default = {}
description = "List of maps containing rules for Cross-Origin Resource Sharing."
type = list(any)
default = []
}

variable "versioning" {
Expand Down

0 comments on commit 4e1d7ab

Please sign in to comment.