Skip to content

Commit 8a9e104

Browse files
committed
ttl variable optimise
1 parent d2a03f5 commit 8a9e104

3 files changed

Lines changed: 8 additions & 22 deletions

File tree

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ No modules.
4242
| <a name="input_origin"></a> [origin](#input\_origin) | Origin configuration | `any` | n/a | yes |
4343
| <a name="input_route53_zone_id"></a> [route53\_zone\_id](#input\_route53\_zone\_id) | Route53 zone id | `string` | `""` | no |
4444
| <a name="input_web_acl_id"></a> [web\_acl\_id](#input\_web\_acl\_id) | WAF web ACL id | `string` | `""` | no |
45-
| <a name="input_min_ttl"></a> [min\_ttl](#input\_min\_ttl) | min ttl | `number` | 0 | no |
46-
| <a name="input_max_ttl"></a> [max\_ttl](#input\_max\_ttl) | max ttl | `number` | 86400 | no |
47-
| <a name="input_default_ttl"></a> [default\_ttl](#input\_default\_ttl) | default ttl | `number` | 3600 | no |
45+
| <a name="input_ttl_values"></a> [ttl\_values](#input\_ttl\_values) | ttl values | `map` | {} | no |
4846

4947
## Outputs
5048

cloudfront.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ resource "aws_cloudfront_distribution" "cloudfront" {
6060

6161
viewer_protocol_policy = "redirect-to-https"
6262
compress = true
63-
min_ttl = var.min_ttl
64-
max_ttl = var.max_ttl
65-
default_ttl = var.default_ttl
63+
min_ttl = lookup(var.ttl_values,"min_ttl",0)
64+
max_ttl = lookup(var.ttl_values,"max_ttl",86400)
65+
default_ttl = lookup(var.ttl_values,"default_ttl",3600)
6666

6767
dynamic "forwarded_values" {
6868
for_each = var.cache_policy_id != "" ? [] : [1]

variables.tf

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,8 @@ variable "ipv6" {
9898
default = false
9999
}
100100

101-
variable "min_ttl" {
102-
description = "minimum ttl value for caching"
103-
type = number
104-
default = 0
105-
}
106-
107-
variable "max_ttl" {
108-
description = "maximum ttl value for caching"
109-
type = number
110-
default = 86400
111-
}
112-
113-
variable "default_ttl" {
114-
description = "default ttl value for caching"
115-
type = number
116-
default = 3600
101+
variable "ttl_values" {
102+
description = "map of ttl variables"
103+
type = map(any)
104+
default = {}
117105
}

0 commit comments

Comments
 (0)