From c080200b1ad59235761ae1011e26f7d531ea8743 Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Fri, 27 Sep 2024 14:29:57 +1000 Subject: [PATCH 1/2] fix: update minimum provider version, set deletion_protection on cloud run --- infra/apis.tf | 2 +- infra/main.tf | 2 ++ infra/test/setup/main.tf | 2 +- infra/versions.tf | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/infra/apis.tf b/infra/apis.tf index 495a5c9b7..29ffaf090 100644 --- a/infra/apis.tf +++ b/infra/apis.tf @@ -17,7 +17,7 @@ # Google Cloud Services to enable module "project_services" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "16.0.1" + version = "17.0.0" disable_services_on_destroy = false project_id = var.project_id enable_apis = var.enable_apis diff --git a/infra/main.tf b/infra/main.tf index 380cee211..79f2f12d6 100644 --- a/infra/main.tf +++ b/infra/main.tf @@ -142,6 +142,8 @@ resource "google_cloud_run_v2_service" "default" { location = var.region ingress = "INGRESS_TRAFFIC_ALL" + deletion_protection = false + template { containers { image = var.initial_run_image diff --git a/infra/test/setup/main.tf b/infra/test/setup/main.tf index c7577219e..2feeeb3a2 100644 --- a/infra/test/setup/main.tf +++ b/infra/test/setup/main.tf @@ -16,7 +16,7 @@ module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 16.0" + version = "~> 17.0" name = "ci-javascript-webapp" random_project_id = "true" diff --git a/infra/versions.tf b/infra/versions.tf index 0b8bd91aa..b458d7c9c 100644 --- a/infra/versions.tf +++ b/infra/versions.tf @@ -19,12 +19,12 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.83.0, < 7" + version = ">= 6, < 7" } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.83.0, < 7" + version = ">= 6, < 7" } time = { From 5c91042ce1dac72d80a8c5f9f48a84c4e1bdb91c Mon Sep 17 00:00:00 2001 From: Katie McLaughlin Date: Fri, 27 Sep 2024 14:38:36 +1000 Subject: [PATCH 2/2] bring test provider versions to same minimum version --- infra/examples/simple_example/versions.tf | 2 +- infra/test/setup/versions.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/examples/simple_example/versions.tf b/infra/examples/simple_example/versions.tf index a24010c5e..44be53305 100644 --- a/infra/examples/simple_example/versions.tf +++ b/infra/examples/simple_example/versions.tf @@ -19,7 +19,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.0" + version = ">= 6" } } } diff --git a/infra/test/setup/versions.tf b/infra/test/setup/versions.tf index ab85be7e6..3fa8978ae 100644 --- a/infra/test/setup/versions.tf +++ b/infra/test/setup/versions.tf @@ -19,7 +19,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.25.0" + version = ">= 6" } } }