From 1a9af84e7d060bdb8a583206fee8d0a963fa2a07 Mon Sep 17 00:00:00 2001 From: Jose Pablo Camacho Date: Thu, 19 Sep 2024 08:16:36 -0600 Subject: [PATCH 1/2] enhance(modular): add unique naming for ingestion_topic name --- modules/integrations/pub-sub/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/integrations/pub-sub/main.tf b/modules/integrations/pub-sub/main.tf index afe2c9e..1c7cfe1 100644 --- a/modules/integrations/pub-sub/main.tf +++ b/modules/integrations/pub-sub/main.tf @@ -73,7 +73,7 @@ resource "google_project_iam_audit_config" "audit_config" { # Ingestion Topic #----------------------------------------------------------------------------------------- resource "google_pubsub_topic" "ingestion_topic" { - name = "ingestion_topic" + name = "ingestion_topic${local.suffix}" labels = var.labels project = var.project_id message_retention_duration = var.message_retention_duration From 10fae55610be7b4e6853416cd37043c3c2e8d996 Mon Sep 17 00:00:00 2001 From: Jose Pablo Camacho Date: Thu, 19 Sep 2024 13:31:10 -0600 Subject: [PATCH 2/2] enhance(modular): fix iam member vs iam binding authoritative issue --- modules/integrations/pub-sub/main.tf | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/integrations/pub-sub/main.tf b/modules/integrations/pub-sub/main.tf index 1c7cfe1..f3d717a 100644 --- a/modules/integrations/pub-sub/main.tf +++ b/modules/integrations/pub-sub/main.tf @@ -73,14 +73,14 @@ resource "google_project_iam_audit_config" "audit_config" { # Ingestion Topic #----------------------------------------------------------------------------------------- resource "google_pubsub_topic" "ingestion_topic" { - name = "ingestion_topic${local.suffix}" + name = "ingestion_topic_${local.suffix}" labels = var.labels project = var.project_id message_retention_duration = var.message_retention_duration } resource "google_pubsub_topic" "deadletter_topic" { - name = "dl-${google_pubsub_topic.ingestion_topic.name}" + name = "dl_${google_pubsub_topic.ingestion_topic.name}" project = var.project_id message_retention_duration = var.message_retention_duration } @@ -128,13 +128,10 @@ resource "google_service_account" "push_auth" { project = var.project_id } -resource "google_service_account_iam_binding" "push_auth_binding" { +resource "google_service_account_iam_member" "push_auth_binding" { service_account_id = google_service_account.push_auth.name role = "roles/iam.workloadIdentityUser" - - members = [ - "serviceAccount:${google_service_account.push_auth.email}", - ] + member = "serviceAccount:${google_service_account.push_auth.email}" } resource "google_pubsub_subscription" "ingestion_topic_push_subscription" {