Skip to content

Commit 87679b8

Browse files
Moved dataflow iam setting in tests to use bootstrapping (#10370) (#17780)
[upstream:a3915302476cf0f7646e13688b5b4ecea5035b9f] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent 088ff36 commit 87679b8

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.changelog/10370.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google/services/dataflow/resource_dataflow_job_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,10 @@ func TestAccDataflowJob_withKmsKey(t *testing.T) {
423423
t.Fatal("Stopping the test because a role was added to the policy.")
424424
}
425425

426+
if acctest.BootstrapPSARole(t, "service-", "dataflow-service-producer-prod", "roles/cloudkms.cryptoKeyEncrypterDecrypter") {
427+
t.Fatal("Stopping the test because a role was added to the policy.")
428+
}
429+
426430
acctest.VcrTest(t, resource.TestCase{
427431
PreCheck: func() { acctest.AccTestPreCheck(t) },
428432
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
@@ -1195,15 +1199,6 @@ resource "google_dataflow_job" "big_data" {
11951199

11961200
func testAccDataflowJob_kms(key_ring, crypto_key, bucket, job, zone string) string {
11971201
return fmt.Sprintf(`
1198-
data "google_project" "project" {
1199-
}
1200-
1201-
resource "google_project_iam_member" "kms-project-dataflow-binding" {
1202-
project = data.google_project.project.project_id
1203-
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
1204-
member = "serviceAccount:service-${data.google_project.project.number}@dataflow-service-producer-prod.iam.gserviceaccount.com"
1205-
}
1206-
12071202
resource "google_kms_key_ring" "keyring" {
12081203
name = "%s"
12091204
location = "global"

0 commit comments

Comments
 (0)