Skip to content

Commit d8a966b

Browse files
committed
Merge tag 'v14.0.0'
2 parents dab6a7c + dbe8138 commit d8a966b

File tree

37 files changed

+1114
-154
lines changed

37 files changed

+1114
-154
lines changed

.github/conventional-commit-lint.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/lint.yaml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ name: 'lint'
2020
on:
2121
workflow_dispatch:
2222
pull_request:
23-
branches:
24-
- main
23+
types: [opened, edited, reopened, synchronize]
24+
branches: [main]
25+
26+
permissions:
27+
contents: read
2528

2629
concurrency:
2730
group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
@@ -52,3 +55,21 @@ jobs:
5255
env:
5356
ENABLE_BPMETADATA: 1
5457

58+
commitlint:
59+
runs-on: ubuntu-latest
60+
steps:
61+
- uses: actions/checkout@v4
62+
with:
63+
fetch-depth: 0
64+
- name: Setup node
65+
uses: actions/setup-node@v4
66+
with:
67+
node-version: lts/*
68+
- name: Install commitlint
69+
run: |
70+
npm install -D @commitlint/[email protected] @commitlint/[email protected]
71+
echo "module.exports = { extends: ['@commitlint/config-conventional'], rules: {'subject-case': [0]} };" > commitlint.config.js
72+
npx commitlint --version
73+
- name: Validate PR commits with commitlint
74+
if: github.event_name == 'pull_request'
75+
run: 'echo "${{ github.event.pull_request.title }}" | npx commitlint --verbose'

.terraform.lock

Whitespace-only changes.

CHANGELOG.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,47 @@ 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+
## [14.0.0](https://github.com/terraform-google-modules/terraform-google-lb-http/compare/v13.2.0...v14.0.0) (2025-11-05)
9+
10+
11+
### ⚠ BREAKING CHANGES
12+
13+
* Bump up the terraform version ([#550](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/550))
14+
15+
### Features
16+
17+
* Terraform Google Provider to v7 ([#556](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/556)) ([2f3e7a8](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/2f3e7a85a3f2cc466768306b3dff1be95822f07f))
18+
19+
20+
### Bug Fixes
21+
22+
* Bump up the terraform version ([#550](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/550)) ([6445187](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/6445187770778fe391bb92b50026b7c6be99a4ef))
23+
24+
## [13.2.0](https://github.com/terraform-google-modules/terraform-google-lb-http/compare/v13.1.0...v13.2.0) (2025-09-30)
25+
26+
27+
### Features
28+
29+
* Adding suport for PSC NEGs in terraform-google-lb-http/modules/backend ([#539](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/539)) ([be52b2d](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/be52b2d1de29e58e82549316141402cd4e08545e))
30+
31+
32+
### Bug Fixes
33+
34+
* added missing validations ([#542](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/542)) ([9267bb2](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/9267bb2c43e3397bbf59ee8f639402a7777536fe))
35+
36+
## [13.1.0](https://github.com/terraform-google-modules/terraform-google-lb-http/compare/v13.0.1...v13.1.0) (2025-09-02)
37+
38+
39+
### Features
40+
41+
* Added IAP Principals terraform resource for backend-service ([#533](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/533)) ([ad5d851](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/ad5d851008c89acbe96049398e459f9224a3c98f))
42+
* per module requirements configs for lb-http ([#520](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/520)) ([97c69e6](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/97c69e61548e1b16cf0d92057f29a4aff14863f6))
43+
44+
45+
### Bug Fixes
46+
47+
* added missing validations ([#530](https://github.com/terraform-google-modules/terraform-google-lb-http/issues/530)) ([71cae26](https://github.com/terraform-google-modules/terraform-google-lb-http/commit/71cae265b908589037f541ef28c859df57ac9be1))
48+
849
## [13.0.1](https://github.com/terraform-google-modules/terraform-google-lb-http/compare/v13.0.0...v13.0.1) (2025-07-31)
950

1051

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ docker_generate_docs:
7979
-e ENABLE_BPMETADATA=1 \
8080
-v "$(CURDIR)":/workspace \
8181
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
82-
/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'
82+
/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs --per-module-requirements'
8383

8484
## Generate files from autogen
8585
.PHONY: docker_generate_modules

autogen/versions.tf.tmpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ terraform {
2020

2121
google = {
2222
source = "hashicorp/google"
23-
version = ">= 6.0, < 7"
23+
version = ">= 6.0, < 8"
2424
}
2525
google-beta = {
2626
source = "hashicorp/google-beta"
27-
version = ">= 6.0, < 7"
27+
version = ">= 6.0, < 8"
2828
}
2929
random = {
3030
source = "hashicorp/random"
@@ -34,21 +34,21 @@ terraform {
3434

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

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

build/int.cloudbuild.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,48 @@ steps:
158158
- verify internal-lb-http gce-mig
159159
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
160160
args: ['/bin/bash', '-c', 'cft test run TestInternalLbGCEMIG --stage teardown --verbose']
161+
# Backend Service with IAP Enabled
162+
- id: init backend-with-iap
163+
waitFor:
164+
- teardown internal-lb-http gce-mig
165+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
166+
args: ['/bin/bash', '-c', 'cft test run TestLbBackendServiceIap --stage init --verbose']
167+
- id: apply backend-with-iap
168+
waitFor:
169+
- init backend-with-iap
170+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
171+
args: ['/bin/bash', '-c', 'cft test run TestLbBackendServiceIap --stage apply --verbose']
172+
- id: verify backend-with-iap
173+
waitFor:
174+
- apply backend-with-iap
175+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
176+
args: ['/bin/bash', '-c', 'cft test run TestLbBackendServiceIap --stage verify --verbose']
177+
- id: teardown backend-with-iap
178+
waitFor:
179+
- verify backend-with-iap
180+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
181+
args: ['/bin/bash', '-c', 'cft test run TestLbBackendServiceIap --stage teardown --verbose']
182+
# backend-with-psc-negs example
183+
- id: init backend-with-psc-negs
184+
waitFor:
185+
- teardown backend-with-iap
186+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
187+
args: ['/bin/bash', '-c', 'cft test run TestLbBackendServiceWithPscNeg --stage init --verbose']
188+
- id: apply backend-with-psc-negs
189+
waitFor:
190+
- init backend-with-psc-negs
191+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
192+
args: ['/bin/bash', '-c', 'cft test run TestLbBackendServiceWithPscNeg --stage apply --verbose']
193+
- id: verify backend-with-psc-negs
194+
waitFor:
195+
- apply backend-with-psc-negs
196+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
197+
args: ['/bin/bash', '-c', 'cft test run TestLbBackendServiceWithPscNeg --stage verify --verbose']
198+
- id: teardown backend-with-psc-negs
199+
waitFor:
200+
- verify backend-with-psc-negs
201+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
202+
args: ['/bin/bash', '-c', 'cft test run TestLbBackendServiceWithPscNeg --stage teardown --verbose']
161203
tags:
162204
- 'ci'
163205
- 'integration'

examples/backend-with-iap/main.tf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/**
2+
* Copyright 2025 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
module "lb-backend-iap" {
18+
source = "terraform-google-modules/lb-http/google//modules/backend"
19+
version = "~> 12.0"
20+
21+
project_id = var.project_id
22+
name = "backend-with-iap"
23+
iap_config = {
24+
enable = true
25+
iap_members = ["user:[email protected]"]
26+
}
27+
}
28+
29+
module "lb-frontend" {
30+
source = "terraform-google-modules/lb-http/google//modules/frontend"
31+
version = "~> 12.0"
32+
33+
project_id = var.project_id
34+
name = "global-lb-fe-bucket"
35+
url_map_input = module.lb-backend-iap.backend_service_info
36+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* Copyright 2025 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
18+
output "project_id" {
19+
value = var.project_id
20+
description = "Project ID of the service"
21+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/**
2+
* Copyright 2025 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
variable "project_id" {
18+
type = string
19+
}

0 commit comments

Comments
 (0)