Terraform corrections 3

jcpitre · jcpitre · commit 85015e53f4c7 · 2025-01-27T22:33:04.000-05:00
diff --git a/infra/functions-python/main.tf b/infra/functions-python/main.tf
@@ -109,7 +109,7 @@ resource "google_storage_bucket" "gbfs_snapshots_bucket" {
 }
 
 resource "google_storage_bucket_iam_member" "datasets_bucket_functions_service_account" {
-  bucket = google_storage_bucket.datasets_bucket.name
+  bucket = data.google_storage_bucket.datasets_bucket.name
   role   = "roles/storage.admin"
   member = "serviceAccount:${google_service_account.functions_service_account.email}"
 }
@@ -868,7 +868,7 @@ resource "google_cloudfunctions2_function" "export_csv" {
   }
   service_config {
     environment_variables = {
-      DATASETS_BUCKET_NAME = "${var.datasets_bucket_name}-${var.environment}"
+      DATASETS_BUCKET_NAME = data.google_storage_bucket.datasets_bucket.name
       PROJECT_ID  = var.project_id
       ENVIRONMENT = var.environment
     }

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ resource "google_storage_bucket" "gbfs_snapshots_bucket" {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`resource "google_storage_bucket_iam_member" "datasets_bucket_functions_service_account" {`
`112`		`- bucket = google_storage_bucket.datasets_bucket.name`
	`112`	`+ bucket = data.google_storage_bucket.datasets_bucket.name`
`113`	`113`	`role = "roles/storage.admin"`
`114`	`114`	`member = "serviceAccount:${google_service_account.functions_service_account.email}"`
`115`	`115`	`}`
`@@ -868,7 +868,7 @@ resource "google_cloudfunctions2_function" "export_csv" {`
`868`	`868`	`}`
`869`	`869`	`service_config {`
`870`	`870`	`environment_variables = {`
`871`		`- DATASETS_BUCKET_NAME = "${var.datasets_bucket_name}-${var.environment}"`
	`871`	`+ DATASETS_BUCKET_NAME = data.google_storage_bucket.datasets_bucket.name`
`872`	`872`	`PROJECT_ID = var.project_id`
`873`	`873`	`ENVIRONMENT = var.environment`
`874`	`874`	`}`