Review fixes.

Author: omazin

README.md

@@ -58,7 +58,7 @@ Then perform the following commands on the root folder:
 | message\_data | The data to send in the topic message. | string | `"dGVzdA=="` | no |
 | project\_id | The ID of the project where the resources will be created | string | n/a | yes |
 | region | The region in which resources will be applied. | string | n/a | yes |
-| scheduler\_job | The Cloud Scheduler job instance | any | `"null"` | no |
+| scheduler\_job | An existing Cloud Scheduler job instance | any | `"null"` | no |
 | time\_zone | The timezone to use in scheduler | string | `"Etc/UTC"` | no |
 | topic\_name | Name of pubsub topic connecting the scheduled job and the function | string | `"test-topic"` | no |
 
@@ -67,6 +67,7 @@ Then perform the following commands on the root folder:
 | Name | Description |
 |------|-------------|
 | name | The name of the job created |
+| pubsub\_topic\_name | PubSub topic name |
 | scheduler\_job | The Cloud Scheduler job instance |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/pubsub_scheduled_multiple/README.md

@@ -1,4 +1,4 @@
-# Simple Project
+# Multiple Cloud Functions sharing the same Cloud Scheduler
 
 This example module schedules a job to publish a message to a Pub/Sub topic every 5 minutes, which will trigger a CloudFunctions function.
 
@@ -19,6 +19,6 @@ More information is in the [root readme](../../README.md#app-engine).
 |------|-------------|
 | name | The name of the job created |
 | project\_id | The project ID |
-| scheduler\_job | The Cloud Scheduler job instance |
+| scheduler\_job | An existing Cloud Scheduler job instance |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/pubsub_scheduled_multiple/function_source/package.json

@@ -21,7 +21,7 @@
  * @param {!Object} event Event payload and metadata.
  * @param {!Function} callback Callback function to signal completion.
  */
-exports.doSomething = (event) => {
+exports.doSomething2 = (event) => {
   console.log("Received event 2");
   console.log(event);
 };

examples/pubsub_scheduled_multiple/function_source_2/index.js

@@ -25,10 +25,6 @@ provider "google-beta" {
 }
 
 module "pubsub_scheduled_1" {
-  providers = {
-    google = google-beta
-  }
-
   source                    = "../../"
   project_id                = var.project_id
   job_name                  = "pubsub-example"
@@ -41,16 +37,12 @@ module "pubsub_scheduled_1" {
 }
 
 module "pubsub_scheduled_2" {
-  providers = {
-    google = google-beta
-  }
-
   source                    = "../../"
   project_id                = var.project_id
-  function_entry_point      = "doSomething"
+  function_entry_point      = "doSomething2"
   function_source_directory = "${path.module}/function_source_2"
   function_name             = "testfunction-2"
   region                    = var.region
-  topic_name                = "pubsub-1"
+  topic_name                = module.pubsub_scheduled_1.pubsub_topic_name
   scheduler_job             = module.pubsub_scheduled_1.scheduler_job
 }

examples/pubsub_scheduled_multiple/function_source_2/package.json

@@ -26,6 +26,6 @@ output "project_id" {
 
 output "scheduler_job" {
   value       = module.pubsub_scheduled_1.scheduler_job
-  description = "The Cloud Scheduler job instance"
+  description = "An existing Cloud Scheduler job instance"
 }
 

examples/pubsub_scheduled_multiple/main.tf

@@ -19,7 +19,7 @@
  *****************************************/
 
 resource "google_cloud_scheduler_job" "job" {
-  count       = var.scheduler_job == null ? 1 : 0
+  count = var.scheduler_job == null ? 1 : 0
 
   name        = var.job_name
   project     = var.project_id
@@ -39,11 +39,11 @@ resource "google_cloud_scheduler_job" "job" {
  *****************************************/
 
 module "pubsub_topic" {
-  source     = "terraform-google-modules/pubsub/google"
-  version    = "~> 1.0"
-  topic      = var.topic_name
-  project_id = var.project_id
-  enable     = var.scheduler_job == null ? true : false
+  source       = "terraform-google-modules/pubsub/google"
+  version      = "~> 1.0"
+  topic        = var.topic_name
+  project_id   = var.project_id
+  create_topic = var.scheduler_job == null ? true : false
 }
 
 /******************************************
@@ -57,7 +57,7 @@ module "main" {
   entry_point = var.function_entry_point
   event_trigger = {
     event_type = "google.pubsub.topic.publish"
-    resource   = module.pubsub_topic.topic
+    resource   = var.scheduler_job == null ? module.pubsub_topic.topic : var.topic_name
   }
   name             = var.function_name
   project_id       = var.project_id

examples/pubsub_scheduled_multiple/outputs.tf

@@ -15,11 +15,16 @@
  */
 
 output "name" {
-  value       = google_cloud_scheduler_job.job.*.name
+  value       = var.scheduler_job == null ? google_cloud_scheduler_job.job.0.name : var.scheduler_job.name
   description = "The name of the job created"
 }
 
 output "scheduler_job" {
   value       = var.scheduler_job == null ? google_cloud_scheduler_job.job : var.scheduler_job
   description = "The Cloud Scheduler job instance"
 }
+
+output "pubsub_topic_name" {
+  value       = var.scheduler_job == null ? module.pubsub_topic.topic : var.topic_name
+  description = "PubSub topic name"
+}

main.tf

@@ -143,6 +143,6 @@ variable "time_zone" {
 
 variable "scheduler_job" {
   type        = any
-  description = "The Cloud Scheduler job instance"
+  description = "An existing Cloud Scheduler job instance"
   default     = null
 }