Skip to content

Commit 25f0f06

Browse files
balanaguharshabalanaguharsha
committed
Merge branch 'terraform-google-modules:main' into main
2 parents d8f5e99 + 0a8dfce commit 25f0f06

File tree

60 files changed

+354
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+354
-173
lines changed

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
# Overall sample owners
22

33
* @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/terraform-samples-reviewers
4-
/.github/ @terraform-google-modules/terraform-samples-git-admins
5-
/test/ @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cft-admins
6-
/build/ @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cft-admins
4+
/* @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/terraform-samples-reviewers @terraform-google-modules/cloud-samples-infra
5+
/.github/ @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cloud-samples-infra
6+
/test/ @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cft-admins @terraform-google-modules/cloud-samples-infra
7+
/build/ @terraform-google-modules/terraform-samples-git-admins @terraform-google-modules/cft-admins @terraform-google-modules/cloud-samples-infra
8+
79
/bigquery/ @terraform-google-modules/bigquery-terraform-swe @terraform-google-modules/terraform-samples-reviewers
8-
/cloud_scheduler/ @terraform-google-modules/terraform-samples-reviewers
910
/cloud_sql/ @terraform-google-modules/infra-db-sdk @terraform-google-modules/terraform-samples-reviewers
1011
/cloudvpn/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
1112
/composer/ @terraform-google-modules/cloud-dpes-composer @terraform-google-modules/terraform-samples-reviewers
1213
/compute/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
1314
/dns/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
14-
/eventarc/ @terraform-google-modules/torus-dpe @terraform-google-modules/terraform-samples-reviewers
15-
/functions/ @terraform-google-modules/torus-dpe @terraform-google-modules/terraform-samples-reviewers
1615
/gke/ @terraform-google-modules/eks-team @terraform-google-modules/terraform-samples-reviewers
1716
/lb/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
1817
/looker/ @terraform-google-modules/cloud-looker-docs @terraform-google-modules/terraform-samples-reviewers
1918
/media_cdn/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
2019
/network_connectivity/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
2120
/privateca/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
22-
/run/ @terraform-google-modules/torus-dpe @terraform-google-modules/terraform-samples-reviewers
2321
/storage/ @terraform-google-modules/cloud-storage-dpe @terraform-google-modules/terraform-samples-reviewers
2422
/traffic_director/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
25-
/vertex_ai/ @terraform-google-modules/dee-data-ai @terraform-google-modules/terraform-samples-reviewers
2623
/vpc/ @terraform-google-modules/dee-infra @terraform-google-modules/terraform-samples-reviewers
27-
/workflows/ @terraform-google-modules/torus-dpe @terraform-google-modules/terraform-samples-reviewers
2824
/managedkafka/ @terraform-google-modules/managedkafka-dev-team @terraform-google-modules/terraform-samples-reviewers

‎.github/workflows/lint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ jobs:
4343
REGISTRY=$(grep "REGISTRY_URL := " $MAKEFILE | cut -d\ -f3)
4444
echo dev-tools=${REGISTRY}/${IMAGE}:${VERSION} >> "$GITHUB_OUTPUT"
4545
fi
46-
- run: docker run --rm -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh
46+
- run: docker run --rm -e ENABLE_PARALLEL=1 -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh

‎compute/resize_request_basic/main.tf‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/**
2+
* Copyright 2024 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+
* Made to resemble:
18+
* gcloud compute instance-groups managed resize-requests create igm \
19+
* --resize-request=rr \
20+
* --resize-by=3 \
21+
* --requested-run-duration=1800 \
22+
* --zone=europe-west4-a
23+
*/
24+
25+
# [START compute_resize_request_basic_parent_tag]
26+
resource "google_compute_instance_template" "default" {
27+
machine_type = "a2-ultragpu-8g"
28+
29+
disk {
30+
source_image = "debian-cloud/debian-11"
31+
}
32+
33+
network_interface {
34+
network = "default"
35+
}
36+
scheduling {
37+
on_host_maintenance = "TERMINATE"
38+
}
39+
reservation_affinity {
40+
type = "NO_RESERVATION"
41+
}
42+
}
43+
44+
resource "google_compute_instance_group_manager" "default" {
45+
name = "igm"
46+
base_instance_name = "test"
47+
zone = "europe-west4-a"
48+
49+
version {
50+
instance_template = google_compute_instance_template.default.id
51+
name = "primary"
52+
}
53+
instance_lifecycle_policy {
54+
default_action_on_failure = "DO_NOTHING"
55+
}
56+
}
57+
58+
# [START compute_resize_request_basic_tag]
59+
resource "google_compute_resize_request" "default" {
60+
provider = google-beta
61+
instance_group_manager = google_compute_instance_group_manager.default.name
62+
zone = google_compute_instance_group_manager.default.zone
63+
name = "rr"
64+
resize_by = 3
65+
requested_run_duration {
66+
seconds = 1800
67+
}
68+
}
69+
# [END compute_resize_request_basic_tag]
70+
# [END compute_resize_request_basic_parent_tag]

‎eventarc/basic/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ resource "google_cloud_run_v2_service" "default" {
9393
name = "hello-events"
9494
location = "us-central1"
9595

96+
deletion_protection = false # set to "true" in production
97+
9698
template {
9799
containers {
98100
# This container will log received events

‎gke/quickstart/multitenant/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ resource "google_project_iam_member" "gatewayeditor" {
5454
}
5555
# [END gke_quickstart_multitenant_teams]
5656
# [START gke_quickstart_multitenant_fleet]
57+
# [START gke_enterprise_policycontroller_fleet]
5758
resource "google_gke_hub_feature" "policycontroller" {
5859
name = "policycontroller"
5960
location = "global"
@@ -75,6 +76,7 @@ resource "google_gke_hub_feature" "policycontroller" {
7576
}
7677
}
7778
}
79+
# [END gke_enterprise_policycontroller_fleet]
7880

7981
resource "google_gke_hub_scope" "default" {
8082
for_each = local.teams

‎integrationconnectors/endpointattachment/main.tf‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
1+
/**
2+
* Copyright 2024 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+
117
resource "google_integration_connectors_endpoint_attachment" "default" {
2-
name = "test-endpoint-attachment"
3-
location = "us-central1"
4-
description = "tf created description"
18+
name = "test-endpoint-attachment"
19+
location = "us-central1"
20+
description = "tf created description"
521
service_attachment = "projects/connectors-example/regions/us-central1/serviceAttachments/test"
622
labels = {
723
foo = "bar"
824
}
9-
}
25+
}

‎integrationconnectors/managedzone/main.tf‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,59 @@
1+
/**
2+
* Copyright 2024 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+
117
data "google_project" "target_project" {
218
}
319

4-
resource "google_project_iam_member" "dns_peer_binding" {
5-
project = google_project.target_project.project_id
20+
resource "google_project_iam_member" "default" {
21+
project = data.google_project.target_project.project_id
622
role = "roles/dns.peer"
723
member = "serviceAccount:service-${data.google_project.test_project.number}@gcp-sa-connectors.iam.gserviceaccount.com"
824
}
925

10-
resource "google_project_service" "dns" {
11-
project = google_project.target_project.project_id
12-
service = "dns.googleapis.com"
13-
}
14-
15-
resource "google_project_service" "compute" {
16-
project = google_project.target_project.project_id
17-
service = "compute.googleapis.com"
18-
}
19-
20-
resource "google_compute_network" "network" {
21-
project = google_project.target_project.project_id
26+
resource "google_compute_network" "default" {
27+
project = data.google_project.target_project.project_id
2228
name = "test"
2329
auto_create_subnetworks = false
24-
depends_on = [google_project_service.compute]
2530
}
2631

27-
resource "google_dns_managed_zone" "zone" {
28-
name = "test-dns"
29-
dns_name = "private.example.com."
30-
visibility = "private"
32+
resource "google_dns_managed_zone" "default" {
33+
name = "test-dns"
34+
dns_name = "private.example.com."
35+
visibility = "private"
3136

3237
private_visibility_config {
3338
networks {
34-
network_url = google_compute_network.network.id
39+
network_url = google_compute_network.default.id
3540
}
3641
}
37-
depends_on = [google_project_service.dns]
3842
}
3943

4044
data "google_project" "test_project" {
4145
}
4246

4347
# [START integrationconnectors_managed_zone_example]
4448
resource "google_integration_connectors_managed_zone" "test_managed_zone" {
45-
name = "test-managed-zone"
46-
description = "tf created description"
49+
name = "test-managed-zone"
50+
description = "tf created resource"
4751
labels = {
4852
intent = "example"
4953
}
50-
target_project = google_project.target_project.project_id
51-
target_vpc = "test"
52-
dns = google_dns_managed_zone.zone.dns_name
53-
depends_on = [google_project_iam_member.dns_peer_binding,google_dns_managed_zone.zone]
54+
target_project = data.google_project.target_project.project_id
55+
target_vpc = "test"
56+
dns = google_dns_managed_zone.default.dns_name
57+
depends_on = [google_project_iam_member.default]
5458
}
5559
# [END integrationconnectors_managed_zone_example]

‎integrationconnectors/managedzone/test.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Copyright 2022 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
apiVersion: blueprints.cloud.google.com/v1alpha1
16+
kind: BlueprintTest
17+
metadata:
18+
name: integration_connectors_add_tag
19+
spec:
20+
skip: true

‎run/access_control/main.tf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
# [START cloudrun_access_control_parent_tag]
1818
# [START cloudrun_service_access_control_run_service]
1919
resource "google_cloud_run_v2_service" "default" {
20-
name = "cloud-run-srv"
20+
name = "public-service"
2121
location = "us-central1"
2222

23+
deletion_protection = false # set to "true" in production
24+
2325
template {
2426
containers {
2527
image = "us-docker.pkg.dev/cloudrun/container/hello"

‎run/add_tag/main.tf‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,26 @@
1616

1717
# [START cloudrun_service_add_tag]
1818
resource "google_cloud_run_v2_service" "default" {
19-
name = "cloudrun-srv"
19+
name = "my-service"
2020
location = "us-central1"
2121

22+
deletion_protection = false # set to true to prevent destruction of the resource
23+
2224
template {}
2325

2426
# Define the traffic split for each revision
2527
# https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/cloud_run_v2_service#traffic
2628
traffic {
2729
percent = 100
2830
# This revision needs to already exist
29-
revision = "cloudrun-srv-green"
31+
revision = "green"
3032
type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION"
3133
}
3234

3335
traffic {
3436
# Deploy new revision with 0% traffic
3537
percent = 0
36-
revision = "cloudrun-srv-blue"
38+
revision = "blue"
3739
tag = "tag-name"
3840
type = "TRAFFIC_TARGET_ALLOCATION_TYPE_REVISION"
3941
}

0 commit comments

Comments
 (0)