From f73388f6455a3f69dbaf081b143ee50a14d5831f Mon Sep 17 00:00:00 2001
From: Modular Magician <magic-modules@google.com>
Date: Fri, 25 Oct 2024 17:20:17 +0000
Subject: [PATCH] pubsub: use boostrapped IAM for `TestAccPubsubSubscription`
 tests (#12095)

[upstream:e5bbb6c363713d263ca9519b903db89408534228]

Signed-off-by: Modular Magician <magic-modules@google.com>
---
 pubsub_subscription_push_bq/main.tf           | 20 +++----------------
 .../main.tf                                   | 20 +++----------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/pubsub_subscription_push_bq/main.tf b/pubsub_subscription_push_bq/main.tf
index 0ea7bfdc..f6a5c7f1 100644
--- a/pubsub_subscription_push_bq/main.tf
+++ b/pubsub_subscription_push_bq/main.tf
@@ -9,31 +9,15 @@ resource "google_pubsub_subscription" "example" {
   bigquery_config {
     table = "${google_bigquery_table.test.project}.${google_bigquery_table.test.dataset_id}.${google_bigquery_table.test.table_id}"
   }
-
-  depends_on = [google_project_iam_member.viewer, google_project_iam_member.editor]
 }
 
-data "google_project" "project" {
-}
-
-resource "google_project_iam_member" "viewer" {
-  project = data.google_project.project.project_id
-  role   = "roles/bigquery.metadataViewer"
-  member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
-}
-
-resource "google_project_iam_member" "editor" {
-  project = data.google_project.project.project_id
-  role   = "roles/bigquery.dataEditor"
-  member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
-}
+data "google_project" "project" {}
 
 resource "google_bigquery_dataset" "test" {
   dataset_id = "example_dataset-${local.name_suffix}"
 }
 
 resource "google_bigquery_table" "test" {
-  deletion_protection = false
   table_id   = "example_table-${local.name_suffix}"
   dataset_id = google_bigquery_dataset.test.dataset_id
 
@@ -47,4 +31,6 @@ resource "google_bigquery_table" "test" {
   }
 ]
 EOF
+
+  deletion_protection = false
 }
diff --git a/pubsub_subscription_push_bq_table_schema/main.tf b/pubsub_subscription_push_bq_table_schema/main.tf
index c9382ced..0b09aa81 100644
--- a/pubsub_subscription_push_bq_table_schema/main.tf
+++ b/pubsub_subscription_push_bq_table_schema/main.tf
@@ -10,31 +10,15 @@ resource "google_pubsub_subscription" "example" {
     table = "${google_bigquery_table.test.project}.${google_bigquery_table.test.dataset_id}.${google_bigquery_table.test.table_id}"
     use_table_schema = true
   }
-
-  depends_on = [google_project_iam_member.viewer, google_project_iam_member.editor]
 }
 
-data "google_project" "project" {
-}
-
-resource "google_project_iam_member" "viewer" {
-  project = data.google_project.project.project_id
-  role   = "roles/bigquery.metadataViewer"
-  member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
-}
-
-resource "google_project_iam_member" "editor" {
-  project = data.google_project.project.project_id
-  role   = "roles/bigquery.dataEditor"
-  member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
-}
+data "google_project" "project" {}
 
 resource "google_bigquery_dataset" "test" {
   dataset_id = "example_dataset-${local.name_suffix}"
 }
 
 resource "google_bigquery_table" "test" {
-  deletion_protection = false
   table_id   = "example_table-${local.name_suffix}"
   dataset_id = google_bigquery_dataset.test.dataset_id
 
@@ -48,4 +32,6 @@ resource "google_bigquery_table" "test" {
   }
 ]
 EOF
+
+  deletion_protection = false
 }