Skip to content

Commit 4c0b19b

Browse files
Deepraj1996Deepraj1996
authored
Merge branch 'main' into feature/IAP-Enhancement
2 parents 721407c + 4e92dac commit 4c0b19b

File tree

19 files changed

+117
-28
lines changed

19 files changed

+117
-28
lines changed

‎CHANGELOG.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [13.0.1](https://github.com/terraform-google-modules/terraform-google-lb-http/compare/v13.0.0...v13.0.1) (2025-07-31)
9+
10+
11+
### Bug Fixes
12+
13+
* fixing outputs.tf for backend for apphub check ([#525](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/525)) ([03d405c](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/03d405c29f6939fa5983db1dd8aa054f32e2a3ed))
14+
15+
## [13.0.0](https://github.com/terraform-google-modules/terraform-google-lb-http/compare/v12.2.0...v13.0.0) (2025-07-30)
16+
17+
18+
### ⚠ BREAKING CHANGES
19+
20+
* Adding regex validation for service name and adding apphub ([#522](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/522))
21+
* update default for cdn_policy and do not create serverless neg ([#516](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/516))
22+
23+
### Features
24+
25+
* update default for cdn_policy and do not create serverless neg ([#516](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/516)) ([6e7e878](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/6e7e87834ad1beb504cfeb31388f06ce38fd15f9))
26+
27+
28+
### Bug Fixes
29+
30+
* Adding regex validation for service name and adding apphub ([#522](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/522)) ([687152d](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/687152d0fdf64e68ef81c274b71a05028f9b015e))
31+
832
## [12.2.0](https://github.com/terraform-google-modules/terraform-google-lb-http/compare/v12.1.4...v12.2.0) (2025-06-23)
933

1034

‎autogen/versions.tf.tmpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ terraform {
3434

3535
provider_meta "google" {
3636
{% if serverless %}
37-
module_name = "blueprints/terraform/terraform-google-lb-http:serverless_negs/v12.2.0"
37+
module_name = "blueprints/terraform/terraform-google-lb-http:serverless_negs/v13.0.1"
3838
{% elif dynamic_backends %}
39-
module_name = "blueprints/terraform/terraform-google-lb-http:dynamic_backends/v12.2.0"
39+
module_name = "blueprints/terraform/terraform-google-lb-http:dynamic_backends/v13.0.1"
4040
{% else %}
41-
module_name = "blueprints/terraform/terraform-google-lb-http/v12.2.0"
41+
module_name = "blueprints/terraform/terraform-google-lb-http/v13.0.1"
4242
{% endif %}
4343
}
4444

4545
provider_meta "google-beta" {
4646
{% if serverless %}
47-
module_name = "blueprints/terraform/terraform-google-lb-http:serverless_negs/v12.2.0"
47+
module_name = "blueprints/terraform/terraform-google-lb-http:serverless_negs/v13.0.1"
4848
{% elif dynamic_backends %}
49-
module_name = "blueprints/terraform/terraform-google-lb-http:dynamic_backends/v12.2.0"
49+
module_name = "blueprints/terraform/terraform-google-lb-http:dynamic_backends/v13.0.1"
5050
{% else %}
51-
module_name = "blueprints/terraform/terraform-google-lb-http/v12.2.0"
51+
module_name = "blueprints/terraform/terraform-google-lb-http/v13.0.1"
5252
{% endif %}
5353
}
5454

‎metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
source:
2525
repo: https://github.com/terraform-google-modules/terraform-google-lb-http.git
2626
sourceType: git
27-
version: 12.2.0
27+
version: 13.0.1
2828
actuationTool:
2929
flavor: Terraform
3030
version: ">= 1.3"

‎modules/backend/README.md‎

Lines changed: 2 additions & 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> | <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 |
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 |
@@ -42,6 +42,7 @@ This module creates `google_compute_backend_service` resource and its dependenci
4242

4343
| Name | Description |
4444
|------|-------------|
45+
| apphub\_service\_uri | Service URI in CAIS style to be used by Apphub. |
4546
| backend\_service\_info | Host, path and backend service mapping |
4647

4748
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎modules/backend/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ resource "google_compute_backend_service" "default" {
6767
dynamic "backend" {
6868
for_each = toset(var.serverless_neg_backends)
6969
content {
70-
group = google_compute_region_network_endpoint_group.serverless_negs["neg-${var.name}-${backend.value.service_name}-${backend.value.region}"].id
70+
group = google_compute_region_network_endpoint_group.serverless_negs["neg-${var.name}-${backend.value.region}-${substr(md5(backend.value.service_name), 0, 4)}"].id
7171
}
7272
}
7373

@@ -163,7 +163,7 @@ resource "google_compute_backend_service" "default" {
163163

164164
resource "google_compute_region_network_endpoint_group" "serverless_negs" {
165165
for_each = { for serverless_neg_backend in local.serverless_neg_backends :
166-
"neg-${var.name}-${serverless_neg_backend.service_name}-${serverless_neg_backend.region}" => serverless_neg_backend }
166+
"neg-${var.name}-${serverless_neg_backend.region}-${substr(md5(serverless_neg_backend.service_name), 0, 4)}" => serverless_neg_backend }
167167

168168

169169
provider = google-beta

‎modules/backend/metadata.display.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ spec:
9696
name:
9797
name: name
9898
title: Name
99-
regexValidation: ^[a-z][a-z0-9-]{0,40}[a-z0-9]$
100-
validation: Use lowercase letters, numbers, and hyphens. Start with a letter and end with letter/number. Must be 42 characters or fewer.
99+
regexValidation: ^[a-z][a-z0-9-]{0,36}[a-z0-9]$
100+
validation: Use lowercase letters, numbers, and hyphens. Start with a letter and end with letter/number. Must be 38 characters or fewer.
101101
outlier_detection:
102102
name: outlier_detection
103103
title: Outlier Detection

‎modules/backend/metadata.yaml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
repo: https://github.com/terraform-google-modules/terraform-google-lb-http.git
2626
sourceType: git
2727
dir: /modules/backend
28-
version: 12.2.0
28+
version: 13.0.1
2929
actuationTool:
3030
flavor: Terraform
3131
version: ">= 1.3"
@@ -229,7 +229,7 @@ spec:
229229
client_ttl: 3600
230230
default_ttl: 3600
231231
max_ttl: 86400
232-
signed_url_cache_max_age_sec: 0
232+
signed_url_cache_max_age_sec: "0"
233233
- name: outlier_detection
234234
description: Settings controlling eviction of unhealthy hosts from the load balancing pool.
235235
varType: |-
@@ -311,6 +311,14 @@ spec:
311311
defaultValue:
312312
- 10.127.0.0/23
313313
outputs:
314+
- name: apphub_service_uri
315+
description: Service URI in CAIS style to be used by Apphub.
316+
type:
317+
- list
318+
- - object
319+
- location: string
320+
service_id: string
321+
service_uri: string
314322
- name: backend_service_info
315323
description: Host, path and backend service mapping
316324
type:

‎modules/backend/outputs.tf‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,16 @@ output "backend_service_info" {
3030
] : []
3131
)
3232
}
33+
34+
output "apphub_service_uri" {
35+
value = concat(
36+
!local.is_backend_bucket ? [
37+
{
38+
service_uri = "//compute.googleapis.com/${google_compute_backend_service.default[0].id}"
39+
service_id = substr("${google_compute_backend_service.default[0].name}-${md5("global-be-service-${var.project_id}")}", 0, 63)
40+
location = "global"
41+
}
42+
] : [],
43+
)
44+
description = "Service URI in CAIS style to be used by Apphub."
45+
}

‎modules/backend/variables.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ variable "cdn_policy" {
193193
default_ttl = 3600
194194
client_ttl = 3600
195195
max_ttl = 86400
196-
signed_url_cache_max_age_sec = 0
196+
signed_url_cache_max_age_sec = "0"
197197
}
198198
}
199199

‎modules/backend/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ terraform {
3333
}
3434

3535
provider_meta "google" {
36-
module_name = "blueprints/terraform/terraform-google-lb-http:backend/v12.2.0"
36+
module_name = "blueprints/terraform/terraform-google-lb-http:backend/v13.0.1"
3737
}
3838

3939
provider_meta "google-beta" {
40-
module_name = "blueprints/terraform/terraform-google-lb-http:backend/v12.2.0"
40+
module_name = "blueprints/terraform/terraform-google-lb-http:backend/v13.0.1"
4141
}
4242

4343
}

0 commit comments

Comments
 (0)