fix: allow ACM module to work w/o metrics sa (#1634)

jmymy · web-flow · commit 83a8be24ee1b · 2023-05-16T15:10:54.000-07:00
diff --git a/modules/acm/creds.tf b/modules/acm/creds.tf
@@ -107,6 +107,7 @@ resource "google_service_account" "acm_metrics_writer_sa" {
 }
 
 resource "google_project_iam_member" "acm_metrics_writer_sa_role" {
+  count   = var.create_metrics_gcp_sa ? 1 : 0
   project = var.project_id
   role    = "roles/monitoring.metricWriter"
   member  = "serviceAccount:${google_service_account.acm_metrics_writer_sa[0].email}"
diff --git a/modules/acm/outputs.tf b/modules/acm/outputs.tf
@@ -34,5 +34,5 @@ output "wait" {
 
 output "acm_metrics_writer_sa" {
   description = "The ACM metrics writer Service Account"
-  value       = google_service_account.acm_metrics_writer_sa[0].email
+  value       = var.create_metrics_gcp_sa ? google_service_account.acm_metrics_writer_sa[0].email : null
 }

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ resource "google_service_account" "acm_metrics_writer_sa" {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`resource "google_project_iam_member" "acm_metrics_writer_sa_role" {`
	`110`	`+ count = var.create_metrics_gcp_sa ? 1 : 0`
`110`	`111`	`project = var.project_id`
`111`	`112`	`role = "roles/monitoring.metricWriter"`
`112`	`113`	`member = "serviceAccount:${google_service_account.acm_metrics_writer_sa[0].email}"`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,5 @@ output "wait" {`
`34`	`34`
`35`	`35`	`output "acm_metrics_writer_sa" {`
`36`	`36`	`description = "The ACM metrics writer Service Account"`
`37`		`- value = google_service_account.acm_metrics_writer_sa[0].email`
	`37`	`+ value = var.create_metrics_gcp_sa ? google_service_account.acm_metrics_writer_sa[0].email : null`
`38`	`38`	`}`