Skip to content

Commit 0fc572f

Browse files
pubsub: use boostrapped IAM for TestAccPubsubSubscription tests (#12095) (#833)
[upstream:e5bbb6c363713d263ca9519b903db89408534228] Signed-off-by: Modular Magician <[email protected]>
1 parent 4c5467f commit 0fc572f

File tree

2 files changed

+6
-34
lines changed
  • pubsub_subscription_push_bq_table_schema
  • pubsub_subscription_push_bq

2 files changed

+6
-34
lines changed

pubsub_subscription_push_bq/main.tf

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,15 @@ resource "google_pubsub_subscription" "example" {
99
bigquery_config {
1010
table = "${google_bigquery_table.test.project}.${google_bigquery_table.test.dataset_id}.${google_bigquery_table.test.table_id}"
1111
}
12-
13-
depends_on = [google_project_iam_member.viewer, google_project_iam_member.editor]
1412
}
1513

16-
data "google_project" "project" {
17-
}
18-
19-
resource "google_project_iam_member" "viewer" {
20-
project = data.google_project.project.project_id
21-
role = "roles/bigquery.metadataViewer"
22-
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
23-
}
24-
25-
resource "google_project_iam_member" "editor" {
26-
project = data.google_project.project.project_id
27-
role = "roles/bigquery.dataEditor"
28-
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
29-
}
14+
data "google_project" "project" {}
3015

3116
resource "google_bigquery_dataset" "test" {
3217
dataset_id = "example_dataset-${local.name_suffix}"
3318
}
3419

3520
resource "google_bigquery_table" "test" {
36-
deletion_protection = false
3721
table_id = "example_table-${local.name_suffix}"
3822
dataset_id = google_bigquery_dataset.test.dataset_id
3923

@@ -47,4 +31,6 @@ resource "google_bigquery_table" "test" {
4731
}
4832
]
4933
EOF
34+
35+
deletion_protection = false
5036
}

pubsub_subscription_push_bq_table_schema/main.tf

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,15 @@ resource "google_pubsub_subscription" "example" {
1010
table = "${google_bigquery_table.test.project}.${google_bigquery_table.test.dataset_id}.${google_bigquery_table.test.table_id}"
1111
use_table_schema = true
1212
}
13-
14-
depends_on = [google_project_iam_member.viewer, google_project_iam_member.editor]
1513
}
1614

17-
data "google_project" "project" {
18-
}
19-
20-
resource "google_project_iam_member" "viewer" {
21-
project = data.google_project.project.project_id
22-
role = "roles/bigquery.metadataViewer"
23-
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
24-
}
25-
26-
resource "google_project_iam_member" "editor" {
27-
project = data.google_project.project.project_id
28-
role = "roles/bigquery.dataEditor"
29-
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
30-
}
15+
data "google_project" "project" {}
3116

3217
resource "google_bigquery_dataset" "test" {
3318
dataset_id = "example_dataset-${local.name_suffix}"
3419
}
3520

3621
resource "google_bigquery_table" "test" {
37-
deletion_protection = false
3822
table_id = "example_table-${local.name_suffix}"
3923
dataset_id = google_bigquery_dataset.test.dataset_id
4024

@@ -48,4 +32,6 @@ resource "google_bigquery_table" "test" {
4832
}
4933
]
5034
EOF
35+
36+
deletion_protection = false
5137
}

0 commit comments

Comments
 (0)