Merge branch 'main' into 362378270-new-defaults

GoogleCloudPlatform · Oct 31, 2024 · c45d123 · c45d123
2 parents 8e7999d + 543be71
commit c45d123
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -104,7 +104,7 @@ steps:
   args: ['/bin/bash', '-c', 'cft test run TestSimpleJobExec --stage teardown --verbose']
 - id: v2-init
   waitFor:
-    - destroy cloud-run-with-cmek
+    - simple-job-exec-teardown
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestV2 --stage init --verbose']
 - id: v2-apply

diff --git a/examples/cloud_run_vpc_connector/main.tf b/examples/cloud_run_vpc_connector/main.tf
@@ -24,7 +24,7 @@ module "service_account" {
 
 module "cloud_run" {
   source  = "GoogleCloudPlatform/cloud-run/google"
-  version = "~> 0.12"
+  version = "~> 0.13"
 
   service_name          = "ci-cloud-run-sc"
   project_id            = var.project_id

diff --git a/examples/secure_cloud_run/main.tf b/examples/secure_cloud_run/main.tf
@@ -22,7 +22,7 @@ locals {
 
 module "secure_cloud_run" {
   source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-cloud-run"
-  version = "~> 0.12"
+  version = "~> 0.13"
 
   connector_name              = "con-run"
   subnet_name                 = "vpc-subnet"

diff --git a/examples/secure_cloud_run_standalone/main.tf b/examples/secure_cloud_run_standalone/main.tf
@@ -28,7 +28,7 @@ resource "random_id" "random_folder_suffix" {
 
 module "secure_harness" {
   source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-harness"
-  version = "~> 0.12"
+  version = "~> 0.13"
 
   billing_account                             = var.billing_account
   security_project_name                       = "prj-kms-secure-cloud-run"
@@ -65,7 +65,7 @@ resource "null_resource" "copy_image" {
 
 module "secure_cloud_run" {
   source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-cloud-run"
-  version = "~> 0.12"
+  version = "~> 0.13"
 
   location                                = local.location
   region                                  = local.region

diff --git a/examples/simple_cloud_run/main.tf b/examples/simple_cloud_run/main.tf
@@ -24,7 +24,7 @@ module "service_account" {
 
 module "cloud_run" {
   source  = "GoogleCloudPlatform/cloud-run/google"
-  version = "~> 0.12"
+  version = "~> 0.13"
 
   service_name          = "ci-cloud-run"
   project_id            = var.project_id

diff --git a/examples/simple_cloud_run_with_cmek/main.tf b/examples/simple_cloud_run_with_cmek/main.tf
@@ -28,7 +28,7 @@ module "service_account" {
 
 module "kms" {
   source  = "terraform-google-modules/kms/google"
-  version = "~> 2.1"
+  version = "~> 3.0"
 
   project_id         = var.project_id
   location           = "us-central1"
@@ -53,7 +53,7 @@ resource "google_project_service_identity" "serverless_sa" {
 
 module "cloud_run" {
   source  = "GoogleCloudPlatform/cloud-run/google"
-  version = "~> 0.12"
+  version = "~> 0.13"
 
   service_name          = "ci-cloud-run"
   project_id            = var.project_id

diff --git a/examples/simple_job_exec/main.tf b/examples/simple_job_exec/main.tf
@@ -16,7 +16,7 @@
 
 module "job" {
   source  = "GoogleCloudPlatform/cloud-run/google//modules/job-exec"
-  version = "~> 0.12"
+  version = "~> 0.13"
 
   project_id = var.project_id
   name       = "simple-job"

diff --git a/examples/v2/main.tf b/examples/v2/main.tf
@@ -16,7 +16,7 @@
 
 module "cloud_run_v2" {
   source  = "GoogleCloudPlatform/cloud-run/google//modules/v2"
-  version = "~> 0.12"
+  version = "~> 0.13"
 
   service_name = "ci-cloud-run-v2"
   project_id   = var.project_id

diff --git a/modules/secure-cloud-run-security/kms.tf b/modules/secure-cloud-run-security/kms.tf
@@ -16,7 +16,7 @@
 
 module "cloud_run_kms" {
   source  = "terraform-google-modules/kms/google"
-  version = "~> 2.1"
+  version = "~> 3.0"
 
   project_id           = var.kms_project_id
   location             = var.location

diff --git a/modules/secure-serverless-harness/main.tf b/modules/secure-serverless-harness/main.tf
@@ -123,7 +123,7 @@ resource "google_artifact_registry_repository_iam_member" "member" {
 
 module "artifact_registry_kms" {
   source  = "terraform-google-modules/kms/google"
-  version = "~> 2.2"
+  version = "~> 3.0"
 
   project_id           = module.security_project.project_id
   location             = var.location