Skip to content

Commit 6e7e878

Browse files
authored
feat!: update default for cdn_policy and do not create serverless neg (#516)
1 parent 2414ddb commit 6e7e878

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

modules/backend/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This module creates `google_compute_backend_service` resource and its dependenci
88
|------|-------------|------|---------|:--------:|
99
| affinity\_cookie\_ttl\_sec | Lifetime of cookies in seconds if session\_affinity is GENERATED\_COOKIE. | `number` | `null` | no |
1010
| backend\_bucket\_name | The name of GCS bucket which serves the traffic. | `string` | `""` | no |
11-
| cdn\_policy | Cloud CDN configuration for this BackendService. | <pre>object({<br> cache_mode = optional(string)<br> signed_url_cache_max_age_sec = optional(string)<br> default_ttl = optional(number)<br> max_ttl = optional(number)<br> client_ttl = optional(number)<br> negative_caching = optional(bool)<br> serve_while_stale = optional(number)<br> bypass_cache_on_request_headers = optional(list(string))<br> negative_caching_policy = optional(object({<br> code = optional(number)<br> ttl = optional(number)<br> }))<br> cache_key_policy = optional(object({<br> include_host = optional(bool)<br> include_protocol = optional(bool)<br> include_query_string = optional(bool)<br> query_string_blacklist = optional(list(string))<br> query_string_whitelist = optional(list(string))<br> include_http_headers = optional(list(string))<br> include_named_cookies = optional(list(string))<br> }))<br> })</pre> | `{}` | no |
11+
| cdn\_policy | Cloud CDN configuration for this BackendService. | <pre>object({<br> cache_mode = optional(string)<br> signed_url_cache_max_age_sec = optional(string)<br> default_ttl = optional(number)<br> max_ttl = optional(number)<br> client_ttl = optional(number)<br> negative_caching = optional(bool)<br> serve_while_stale = optional(number)<br> bypass_cache_on_request_headers = optional(list(string))<br> negative_caching_policy = optional(object({<br> code = optional(number)<br> ttl = optional(number)<br> }))<br> cache_key_policy = optional(object({<br> include_host = optional(bool)<br> include_protocol = optional(bool)<br> include_query_string = optional(bool)<br> query_string_blacklist = optional(list(string))<br> query_string_whitelist = optional(list(string))<br> include_http_headers = optional(list(string))<br> include_named_cookies = optional(list(string))<br> }))<br> })</pre> | <pre>{<br> "cache_mode": "CACHE_ALL_STATIC",<br> "client_ttl": 3600,<br> "default_ttl": 3600,<br> "max_ttl": 86400,<br> "signed_url_cache_max_age_sec": 0<br>}</pre> | no |
1212
| compression\_mode | Compress text responses using Brotli or gzip compression. | `string` | `"DISABLED"` | no |
1313
| connection\_draining\_timeout\_sec | Time for which instance will be drained (not accept new connections, but still work to finish started). | `number` | `null` | no |
1414
| custom\_request\_headers | Headers that the HTTP/S load balancer should add to proxied requests. | `list(string)` | `[]` | no |

modules/backend/main.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616

1717
locals {
18-
is_backend_bucket = var.backend_bucket_name != null && var.backend_bucket_name != ""
18+
is_backend_bucket = var.backend_bucket_name != null && var.backend_bucket_name != ""
19+
serverless_neg_backends = local.is_backend_bucket ? [] : var.serverless_neg_backends
1920
}
2021

2122
resource "google_compute_backend_service" "default" {
@@ -161,7 +162,7 @@ resource "google_compute_backend_service" "default" {
161162
}
162163

163164
resource "google_compute_region_network_endpoint_group" "serverless_negs" {
164-
for_each = { for serverless_neg_backend in var.serverless_neg_backends :
165+
for_each = { for serverless_neg_backend in local.serverless_neg_backends :
165166
"neg-${var.name}-${serverless_neg_backend.service_name}-${serverless_neg_backend.region}" => serverless_neg_backend }
166167

167168

modules/backend/metadata.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,12 @@ spec:
224224
include_named_cookies = optional(list(string))
225225
}))
226226
})
227-
defaultValue: {}
227+
defaultValue:
228+
cache_mode: CACHE_ALL_STATIC
229+
client_ttl: 3600
230+
default_ttl: 3600
231+
max_ttl: 86400
232+
signed_url_cache_max_age_sec: 0
228233
- name: outlier_detection
229234
description: Settings controlling eviction of unhealthy hosts from the load balancing pool.
230235
varType: |-

modules/backend/variables.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,13 @@ variable "cdn_policy" {
188188
include_named_cookies = optional(list(string))
189189
}))
190190
})
191-
default = {}
191+
default = {
192+
cache_mode = "CACHE_ALL_STATIC"
193+
default_ttl = 3600
194+
client_ttl = 3600
195+
max_ttl = 86400
196+
signed_url_cache_max_age_sec = 0
197+
}
192198
}
193199

194200
variable "outlier_detection" {

modules/frontend/metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ spec:
116116
connections:
117117
- source:
118118
source: github.com/terraform-google-modules/terraform-google-lb-http//modules/backend
119-
version: ^12.0
119+
version: ">= 12.0"
120120
spec:
121121
outputExpr: backend_service_info
122122
- name: url_map_resource_uri

0 commit comments

Comments
 (0)