Merge pull request #1343 from apichick/bigquery-analytics-fix

Fix because of changes in the cloud functions module and the Apigee a…

blueprints/apigee/bigquery-analytics/functions/gcs2bq/schema.json

@@ -443,5 +443,15 @@
     "mode": "NULLABLE",
     "name": "x_apigee_mintng_price_multiplier",
     "type": "NUMERIC"
+  },
+  {
+    "mode": "NULLABLE",
+    "name": "sense_flag_headers",
+    "type": "STRING"
+  },
+  {
+    "mode": "NULLABLE",
+    "name": "sense_action_id",
+    "type": "STRING"
   }
 ]

blueprints/apigee/bigquery-analytics/main.tf

@@ -182,9 +182,11 @@ module "function_export" {
     DATASTORE    = var.datastore_name
   }
   trigger_config = {
-    event    = "google.pubsub.topic.publish"
-    resource = module.pubsub_export.id
-    retry    = null
+    v1 = {
+      event    = "google.pubsub.topic.publish"
+      resource = module.pubsub_export.id
+      retry    = null
+    }
   }
   service_account_create = true
 }
@@ -218,9 +220,11 @@ module "function_gcs2bq" {
     LOCATION = var.organization.analytics_region
   }
   trigger_config = {
-    event    = "google.pubsub.topic.publish"
-    resource = module.bucket_export.topic
-    retry    = null
+    v1 = {
+      event    = "google.pubsub.topic.publish"
+      resource = module.bucket_export.topic
+      retry    = null
+    }
   }
   service_account_create = true
 }