Merge branch 'master' into fix/add-local-deployment-instructions

terraform-google-modules · Aug 23, 2024 · 1b8913b · 1b8913b
2 parents 6066c62 + 4dbe0f8
commit 1b8913b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/1-org/modules/cai-monitoring/main.tf b/1-org/modules/cai-monitoring/main.tf
@@ -162,9 +162,8 @@ module "cloud_function" {
   service_config = {
     service_account_email = google_service_account.cloudfunction.email
     runtime_env_variables = {
-      ROLES            = join(",", var.roles_to_monitor)
-      SOURCE_ID        = google_scc_source.cai_monitoring.id
-      LOG_EXECUTION_ID = "true"
+      ROLES     = join(",", var.roles_to_monitor)
+      SOURCE_ID = google_scc_source.cai_monitoring.id
     }
   }
 

diff --git a/1-org/modules/cai-monitoring/versions.tf b/1-org/modules/cai-monitoring/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.77, <=5.37"
+      version = ">= 5.42"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.77, <=5.37"
+      version = ">= 5.42"
     }
     random = {
       source = "hashicorp/random"