From 8c20b6107c01f2aa113368cde421962b89c24480 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Thu, 14 Aug 2025 04:32:14 +0000 Subject: [PATCH] fix TestAccDataFusionInstance_dataFusionInstanceCmekExample (#14826) [upstream:5a0c33b1123f54c5ee8023b67417f3b217333e02] Signed-off-by: Modular Magician --- data_fusion_instance_cmek/main.tf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/data_fusion_instance_cmek/main.tf b/data_fusion_instance_cmek/main.tf index 632589c2..1230f86e 100644 --- a/data_fusion_instance_cmek/main.tf +++ b/data_fusion_instance_cmek/main.tf @@ -7,7 +7,7 @@ resource "google_data_fusion_instance" "cmek" { key_reference = google_kms_crypto_key.crypto_key.id } - depends_on = [google_kms_crypto_key_iam_member.crypto_key_member] + depends_on = [google_kms_crypto_key_iam_member.crypto_key_member_cdf_sa, google_kms_crypto_key_iam_member.crypto_key_member_gcs_sa] } resource "google_kms_crypto_key" "crypto_key" { @@ -20,11 +20,18 @@ resource "google_kms_key_ring" "key_ring" { location = "us-central1" } -resource "google_kms_crypto_key_iam_member" "crypto_key_member" { +resource "google_kms_crypto_key_iam_member" "crypto_key_member_cdf_sa" { crypto_key_id = google_kms_crypto_key.crypto_key.id role = "roles/cloudkms.cryptoKeyEncrypterDecrypter" member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-datafusion.iam.gserviceaccount.com" } +resource "google_kms_crypto_key_iam_member" "crypto_key_member_gcs_sa" { + crypto_key_id = google_kms_crypto_key.crypto_key.id + role = "roles/cloudkms.cryptoKeyEncrypterDecrypter" + + member = "serviceAccount:service-${data.google_project.project.number}@gs-project-accounts.iam.gserviceaccount.com" +} + data "google_project" "project" {}