diff --git a/README.md b/README.md index 36feee75..392d9fc1 100644 --- a/README.md +++ b/README.md @@ -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 | diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 01c589a0..70e14976 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -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 = [ { diff --git a/main.tf b/main.tf index 0c7c65db..1a6b6cdd 100644 --- a/main.tf +++ b/main.tf @@ -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 diff --git a/variables.tf b/variables.tf index 3b70e561..3c130481 100644 --- a/variables.tf +++ b/variables.tf @@ -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" {