Merge pull request #965 from wiktorn/cloud_functions_trigger_v2_optio…

…nals Add triggers to Cloud Functions v2
GoogleCloudPlatform · Nov 16, 2022 · 4d4bcb2 · 4d4bcb2
2 parents df539b5 + 0121806
commit 4d4bcb2
Show file tree

Hide file tree

Showing 12 changed files with 264 additions and 144 deletions.
diff --git a/blueprints/cloud-operations/asset-inventory-feed-remediation/main.tf b/blueprints/cloud-operations/asset-inventory-feed-remediation/main.tf
@@ -79,19 +79,18 @@ module "cf" {
   name        = var.name
   bucket_name = "${var.name}-${random_pet.random.id}"
   bucket_config = {
-    location             = var.region
-    lifecycle_delete_age = null
+    location = var.region
   }
   bundle_config = {
     source_dir  = "cf"
     output_path = var.bundle_path
-    excludes    = null
   }
   service_account = module.service-account.email
   trigger_config = {
-    event    = "google.pubsub.topic.publish"
-    resource = module.pubsub.topic.id
-    retry    = null
+    v1 = {
+      event    = "google.pubsub.topic.publish"
+      resource = module.pubsub.topic.id
+    }
   }
 }
 

diff --git a/blueprints/cloud-operations/network-dashboard/main.tf b/blueprints/cloud-operations/network-dashboard/main.tf
@@ -137,23 +137,21 @@ module "cloud-function" {
   name        = "network-dashboard-cloud-function"
   bucket_name = "${local.monitoring_project}-network-dashboard-bucket"
   bucket_config = {
-    location             = var.region
-    lifecycle_delete_age = null
+    location = var.region
   }
   region = var.region
 
   bundle_config = {
     source_dir  = "cloud-function"
     output_path = "cloud-function.zip"
-    excludes    = null
   }
 
   function_config = {
     timeout     = 480 # Timeout in seconds, increase it if your CF timeouts and use v2 if > 9 minutes.
     entry_point = "main"
     runtime     = "python39"
     instances   = 1
-    memory      = 256 # Memory in MB
+    memory_mb   = 256
 
   }
 
@@ -169,10 +167,17 @@ module "cloud-function" {
   # Internal only doesn't seem to work with CFv2:
   ingress_settings = var.cf_version == "V2" ? "ALLOW_ALL" : "ALLOW_INTERNAL_ONLY"
 
-  trigger_config = {
-    event    = "google.pubsub.topic.publish"
-    resource = module.pubsub.topic.id
-    retry    = null
+  trigger_config = var.cf_version == "V2" ? {
+    v2 = {
+      event_type             = "google.cloud.pubsub.topic.v1.messagePublished"
+      pubsub_topic           = module.pubsub.topic.id
+      service_account_create = true
+    }
+    } : {
+    v1 = {
+      event    = "google.pubsub.topic.publish"
+      resource = module.pubsub.topic.id
+    }
   }
 }
 

diff --git a/blueprints/cloud-operations/quota-monitoring/main.tf b/blueprints/cloud-operations/quota-monitoring/main.tf
@@ -52,13 +52,11 @@ module "cf" {
   name        = var.name
   bucket_name = "${var.name}-${random_pet.random.id}"
   bucket_config = {
-    location             = var.region
-    lifecycle_delete_age = null
+    location = var.region
   }
   bundle_config = {
     source_dir  = "cf"
     output_path = var.bundle_path
-    excludes    = null
   }
   # https://github.com/hashicorp/terraform-provider-archive/issues/40
   # https://issuetracker.google.com/issues/155215191
@@ -68,9 +66,10 @@ module "cf" {
   }
   service_account_create = true
   trigger_config = {
-    event    = "google.pubsub.topic.publish"
-    resource = module.pubsub.topic.id
-    retry    = null
+    v1 = {
+      event    = "google.pubsub.topic.publish"
+      resource = module.pubsub.topic.id
+    }
   }
 }
 

diff --git a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/main.tf b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/main.tf
@@ -91,19 +91,18 @@ module "cf" {
   name        = var.name
   bucket_name = "${var.name}-${random_pet.random.id}"
   bucket_config = {
-    location             = var.region
-    lifecycle_delete_age = null
+    location = var.region
   }
   bundle_config = {
     source_dir  = "cf"
     output_path = var.bundle_path
-    excludes    = null
   }
   service_account = module.service-account.email
   trigger_config = {
-    event    = "google.pubsub.topic.publish"
-    resource = module.pubsub.topic.id
-    retry    = null
+    v1 = {
+      event    = "google.pubsub.topic.publish"
+      resource = module.pubsub.topic.id
+    }
   }
 }
 
@@ -115,8 +114,8 @@ module "cffile" {
   name        = var.name_cffile
   bucket_name = "${var.name_cffile}-${random_pet.random.id}"
   bucket_config = {
-    location             = var.region
-    lifecycle_delete_age = null
+    location                  = var.region
+    lifecycle_delete_age_days = null
   }
   bundle_config = {
     source_dir  = "cffile"
@@ -125,9 +124,11 @@ module "cffile" {
   }
   service_account = module.service-account.email
   trigger_config = {
-    event    = "google.pubsub.topic.publish"
-    resource = module.pubsub_file.topic.id
-    retry    = null
+    v1 = {
+      event    = "google.pubsub.topic.publish"
+      resource = module.pubsub_file.topic.id
+      retry    = null
+    }
   }
 }
 

diff --git a/blueprints/cloud-operations/unmanaged-instances-healthcheck/main.tf b/blueprints/cloud-operations/unmanaged-instances-healthcheck/main.tf
@@ -114,29 +114,28 @@ module "cf-restarter" {
   region      = var.region
   bucket_name = "cf-bundle-bucket-${random_pet.random.id}"
   bucket_config = {
-    location             = var.region
-    lifecycle_delete_age = null
+    location = var.region
   }
   bundle_config = {
     source_dir  = "${path.module}/function/restarter"
     output_path = "restarter.zip"
-    excludes    = []
   }
   service_account = module.service-account-restarter.email
 
   function_config = {
     entry_point      = "RestartInstance"
     ingress_settings = null
-    instances        = 1
-    memory           = 256
+    instance_count   = 1
+    memory_mb        = 256
     runtime          = "go116"
     timeout          = 300
   }
 
   trigger_config = {
-    event    = "google.pubsub.topic.publish"
-    resource = module.pubsub.topic.id
-    retry    = null
+    v1 = {
+      event    = "google.pubsub.topic.publish"
+      resource = module.pubsub.topic.id
+    }
   }
 
 }
@@ -151,15 +150,14 @@ module "cf-healthchecker" {
   bundle_config = {
     source_dir  = "${path.module}/function/healthchecker"
     output_path = "healthchecker.zip"
-    excludes    = []
   }
   service_account = module.service-account-healthchecker.email
 
   function_config = {
     entry_point      = "HealthCheck"
     ingress_settings = null
-    instances        = 1
-    memory           = 256
+    instance_count   = 1
+    memory_mb        = 256
     runtime          = "go116"
     timeout          = 300
   }

diff --git a/blueprints/networking/private-cloud-function-from-onprem/main.tf b/blueprints/networking/private-cloud-function-from-onprem/main.tf
@@ -195,11 +195,9 @@ module "function-hello" {
   bundle_config = {
     source_dir  = "${path.module}/assets"
     output_path = "bundle.zip"
-    excludes    = null
   }
   bucket_config = {
-    location             = var.region
-    lifecycle_delete_age = null
+    location = var.region
   }
   iam = {
     "roles/cloudfunctions.invoker" = ["allUsers"]

diff --git a/blueprints/serverless/api-gateway/main.tf b/blueprints/serverless/api-gateway/main.tf
@@ -70,8 +70,8 @@ module "functions" {
   region           = each.value
   ingress_settings = "ALLOW_ALL"
   bucket_config = {
-    location             = null
-    lifecycle_delete_age = 1
+    location                  = null
+    lifecycle_delete_age_days = 1
   }
   bundle_config = {
     source_dir  = "${path.module}/function"