From 3618c9ebdd1f4903a6f0c478cdce4bc95c6fe761 Mon Sep 17 00:00:00 2001
From: Julio Castillo <jccb@google.com>
Date: Sun, 17 Sep 2023 00:21:57 +0200
Subject: [PATCH] Fix blueprints using pubsub

---
 .../asset-inventory-feed-remediation/main.tf           | 10 ++++++----
 blueprints/cloud-operations/quota-monitoring/main.tf   |  2 +-
 .../scheduled-asset-inventory-export-bq/main.tf        |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/blueprints/cloud-operations/asset-inventory-feed-remediation/main.tf b/blueprints/cloud-operations/asset-inventory-feed-remediation/main.tf
index e4082f69c3..e396364e89 100644
--- a/blueprints/cloud-operations/asset-inventory-feed-remediation/main.tf
+++ b/blueprints/cloud-operations/asset-inventory-feed-remediation/main.tf
@@ -55,10 +55,12 @@ module "vpc" {
 }
 
 module "pubsub" {
-  source        = "../../../modules/pubsub"
-  project_id    = module.project.project_id
-  name          = var.name
-  subscriptions = { "${var.name}-default" = null }
+  source     = "../../../modules/pubsub"
+  project_id = module.project.project_id
+  name       = var.name
+  subscriptions = {
+    "${var.name}-default" = {}
+  }
   iam = {
     "roles/pubsub.publisher" = [
       "serviceAccount:${module.project.service_accounts.robots.cloudasset}"
diff --git a/blueprints/cloud-operations/quota-monitoring/main.tf b/blueprints/cloud-operations/quota-monitoring/main.tf
index f644c8fb9e..a49891c00c 100644
--- a/blueprints/cloud-operations/quota-monitoring/main.tf
+++ b/blueprints/cloud-operations/quota-monitoring/main.tf
@@ -39,7 +39,7 @@ module "pubsub" {
   project_id = module.project.project_id
   name       = var.name
   subscriptions = {
-    "${var.name}-default" = null
+    "${var.name}-default" = {}
   }
   # the Cloud Scheduler robot service account already has pubsub.topics.publish
   # at the project level via roles/cloudscheduler.serviceAgent
diff --git a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/main.tf b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/main.tf
index c10c0b6b0f..6460384ea7 100644
--- a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/main.tf
+++ b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/main.tf
@@ -63,7 +63,7 @@ module "pubsub" {
   project_id = module.project.project_id
   name       = var.name
   subscriptions = {
-    "${var.name}-default" = null
+    "${var.name}-default" = {}
   }
   # the Cloud Scheduler robot service account already has pubsub.topics.publish
   # at the project level via roles/cloudscheduler.serviceAgent
@@ -74,7 +74,7 @@ module "pubsub_file" {
   project_id = module.project.project_id
   name       = var.name_cffile
   subscriptions = {
-    "${var.name_cffile}-default" = null
+    "${var.name_cffile}-default" = {}
   }
   # the Cloud Scheduler robot service account already has pubsub.topics.publish
   # at the project level via roles/cloudscheduler.serviceAgent