Update cloud functions to reuse topic defined in module (#14)

* Update cloud functions to reuse topic defined in module

* Ran terraform fmt to conform to style changes

Author: psx95

tf/cloud-functions-gen2/cloud-function.tf

@@ -47,15 +47,11 @@ resource "google_cloudfunctions2_function" "function" {
   event_trigger {
     trigger_region = "us-central1"
     event_type     = "google.cloud.pubsub.topic.v1.messagePublished"
-    pubsub_topic   = google_pubsub_topic.topic.id
+    pubsub_topic   = module.pubsub.info.request_topic.topic_id
     retry_policy   = "RETRY_POLICY_RETRY"
   }
 }
 
-resource "google_pubsub_topic" "topic" {
-  name = "cloudfunctions-push-topic-${terraform.workspace}"
-}
-
 resource "google_storage_bucket" "bucket" {
   name                        = "${terraform.workspace}-gcf-source" # Every bucket name must be globally unique
   location                    = "US"
@@ -88,13 +84,6 @@ variable "functionsource" {
 }
 
 output "pubsub_info" {
-  value = {
-    request_topic = {
-      topic_name        = google_pubsub_topic.topic.name
-      subscription_name = "n/a" # subscription name is not required for cloud functions
-    }
-
-    response_topic = module.pubsub.info.response_topic
-  }
+  value       = module.pubsub.info
   description = "Info about the request/response pubsub topics and subscription to use in the test"
 }

tf/modules/pubsub/main.tf

@@ -89,6 +89,7 @@ output "info" {
   value = {
     request_topic = {
       topic_name        = google_pubsub_topic.request.name
+      topic_id          = google_pubsub_topic.request.id
       subscription_name = google_pubsub_subscription.request_subscription.name
     }