From 0f15f1e2d293b95ba169e69d1fd3b70438dd536c Mon Sep 17 00:00:00 2001
From: Alex Lo <alexlo@gmail.com>
Date: Thu, 19 Sep 2024 14:20:38 -0300
Subject: [PATCH] fix: always specify project

---
 terraform/modules/autoscaler-base/main.tf      | 12 +++++++-----
 terraform/modules/autoscaler-functions/main.tf |  9 ++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/terraform/modules/autoscaler-base/main.tf b/terraform/modules/autoscaler-base/main.tf
index 06350c7c..b4ed6a02 100644
--- a/terraform/modules/autoscaler-base/main.tf
+++ b/terraform/modules/autoscaler-base/main.tf
@@ -24,12 +24,13 @@ resource "google_project_iam_member" "poller_sa_spanner" {
 // Downstream topic
 
 resource "google_pubsub_topic" "downstream_topic" {
-  name = "downstream-topic"
+  project = var.project_id
+  name    = "downstream-topic"
 
   depends_on = [google_pubsub_schema.scaler_downstream_pubsub_schema]
 
   schema_settings {
-    schema =  google_pubsub_schema.scaler_downstream_pubsub_schema.id
+    schema   = google_pubsub_schema.scaler_downstream_pubsub_schema.id
     encoding = "JSON"
   }
 
@@ -46,9 +47,10 @@ resource "google_pubsub_topic_iam_member" "scaler_downstream_pub_iam" {
 }
 
 resource "google_pubsub_schema" "scaler_downstream_pubsub_schema" {
-  name = "downstream-schema"
-  type = "PROTOCOL_BUFFER"
-  definition = "${file("${path.module}/../../../src/scaler/scaler-core/downstream.schema.proto")}"
+  project    = var.project_id
+  name       = "downstream-schema"
+  type       = "PROTOCOL_BUFFER"
+  definition = file("${path.module}/../../../src/scaler/scaler-core/downstream.schema.proto")
 }
 
 resource "google_project_iam_member" "metrics_publisher_iam_poller" {
diff --git a/terraform/modules/autoscaler-functions/main.tf b/terraform/modules/autoscaler-functions/main.tf
index 36e9037e..926b8056 100644
--- a/terraform/modules/autoscaler-functions/main.tf
+++ b/terraform/modules/autoscaler-functions/main.tf
@@ -23,7 +23,8 @@ terraform {
 // PubSub
 
 resource "google_pubsub_topic" "poller_topic" {
-  name = "poller-topic"
+  project = var.project_id
+  name    = "poller-topic"
 }
 
 resource "google_pubsub_topic_iam_member" "poller_pubsub_sub_iam" {
@@ -43,7 +44,8 @@ resource "google_pubsub_topic_iam_member" "forwarder_pubsub_pub_iam" {
 }
 
 resource "google_pubsub_topic" "scaler_topic" {
-  name = "scaler-topic"
+  project = var.project_id
+  name    = "scaler-topic"
 }
 
 resource "google_pubsub_topic_iam_member" "poller_pubsub_pub_iam" {
@@ -63,6 +65,7 @@ resource "google_pubsub_topic_iam_member" "scaler_pubsub_sub_iam" {
 // Cloud Functions
 
 resource "google_storage_bucket" "bucket_gcf_source" {
+  project                     = var.project_id
   name                        = "${var.project_id}-gcf-source"
   storage_class               = "REGIONAL"
   location                    = var.region
@@ -74,7 +77,7 @@ data "archive_file" "local_source" {
   type        = "zip"
   source_dir  = abspath("${path.module}/../../..")
   output_path = "${var.local_output_path}/src.zip"
-  excludes = [ ".git", ".github", ".nyc_output", ".vscode", "kubernetes", "node_modules", "resources", "scaler", "terraform"  ]
+  excludes    = [".git", ".github", ".nyc_output", ".vscode", "kubernetes", "node_modules", "resources", "scaler", "terraform"]
 }
 
 resource "google_storage_bucket_object" "gcs_functions_source" {