Skip to content

Commit e62debb

Browse files
fix TestAccDataFusionInstance_dataFusionInstanceCmekExample (#14826) (#23986)
[upstream:5a0c33b1123f54c5ee8023b67417f3b217333e02] Signed-off-by: Modular Magician <[email protected]>
1 parent 84c3ad1 commit e62debb

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

google/services/datafusion/resource_data_fusion_instance_generated_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ resource "google_data_fusion_instance" "cmek" {
245245
key_reference = google_kms_crypto_key.crypto_key.id
246246
}
247247
248-
depends_on = [google_kms_crypto_key_iam_member.crypto_key_member]
248+
depends_on = [google_kms_crypto_key_iam_member.crypto_key_member_cdf_sa, google_kms_crypto_key_iam_member.crypto_key_member_gcs_sa]
249249
}
250250
251251
resource "google_kms_crypto_key" "crypto_key" {
@@ -258,13 +258,20 @@ resource "google_kms_key_ring" "key_ring" {
258258
location = "us-central1"
259259
}
260260
261-
resource "google_kms_crypto_key_iam_member" "crypto_key_member" {
261+
resource "google_kms_crypto_key_iam_member" "crypto_key_member_cdf_sa" {
262262
crypto_key_id = google_kms_crypto_key.crypto_key.id
263263
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
264264
265265
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-datafusion.iam.gserviceaccount.com"
266266
}
267267
268+
resource "google_kms_crypto_key_iam_member" "crypto_key_member_gcs_sa" {
269+
crypto_key_id = google_kms_crypto_key.crypto_key.id
270+
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
271+
272+
member = "serviceAccount:service-${data.google_project.project.number}@gs-project-accounts.iam.gserviceaccount.com"
273+
}
274+
268275
data "google_project" "project" {}
269276
`, context)
270277
}

website/docs/r/data_fusion_instance.html.markdown

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ resource "google_data_fusion_instance" "cmek" {
164164
key_reference = google_kms_crypto_key.crypto_key.id
165165
}
166166
167-
depends_on = [google_kms_crypto_key_iam_member.crypto_key_member]
167+
depends_on = [google_kms_crypto_key_iam_member.crypto_key_member_cdf_sa, google_kms_crypto_key_iam_member.crypto_key_member_gcs_sa]
168168
}
169169
170170
resource "google_kms_crypto_key" "crypto_key" {
@@ -177,13 +177,20 @@ resource "google_kms_key_ring" "key_ring" {
177177
location = "us-central1"
178178
}
179179
180-
resource "google_kms_crypto_key_iam_member" "crypto_key_member" {
180+
resource "google_kms_crypto_key_iam_member" "crypto_key_member_cdf_sa" {
181181
crypto_key_id = google_kms_crypto_key.crypto_key.id
182182
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
183183
184184
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-datafusion.iam.gserviceaccount.com"
185185
}
186186
187+
resource "google_kms_crypto_key_iam_member" "crypto_key_member_gcs_sa" {
188+
crypto_key_id = google_kms_crypto_key.crypto_key.id
189+
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
190+
191+
member = "serviceAccount:service-${data.google_project.project.number}@gs-project-accounts.iam.gserviceaccount.com"
192+
}
193+
187194
data "google_project" "project" {}
188195
```
189196
<div class = "oics-button" style="float: right; margin: 0 0 -15px">

0 commit comments

Comments
 (0)