Fix several VCR tests, skip some others (#6449) (#4625)

* Fix several VCR tests, skip some others

* Readd test

Signed-off-by: Modular Magician <[email protected]>

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/6449.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/resource_cloudfunction2_function_test.go

@@ -259,13 +259,15 @@ resource "google_project_iam_member" "event-receiving" {
   project = "%{project}"
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.invoking]
 }
 
 resource "google_project_iam_member" "artifactregistry-reader" {
   provider = google-beta
   project = "%{project}"
   role     = "roles/artifactregistry.reader"
   member   = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.event-receiving]
 }
 
 resource "google_cloudfunctions2_function" "function" {

google-beta/resource_cloudfunctions2_function_generated_test.go

@@ -271,18 +271,21 @@ resource "google_project_iam_member" "invoking" {
   project = "%{project}"
   role    = "roles/run.invoker"
   member  = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.gcs-pubsub-publishing]
 }
 
 resource "google_project_iam_member" "event-receiving" {
   project = "%{project}"
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.invoking]
 }
 
 resource "google_project_iam_member" "artifactregistry-reader" {
   project = "%{project}"
   role     = "roles/artifactregistry.reader"
   member   = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.event-receiving]
 }
 
 resource "google_cloudfunctions2_function" "function" {
@@ -409,12 +412,14 @@ resource "google_project_iam_member" "event-receiving" {
   project = "%{project}"
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.invoking]
 }
 
 resource "google_project_iam_member" "artifactregistry-reader" {
   project = "%{project}"
   role     = "roles/artifactregistry.reader"
   member   = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.event-receiving]
 }
 
 resource "google_cloudfunctions2_function" "function" {

google-beta/resource_sql_database_instance_test.go

@@ -761,6 +761,8 @@ func TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRange(t *testi
 }
 
 func TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeReplica(t *testing.T) {
+	// Service Networking
+	skipIfVcr(t)
 	t.Parallel()
 
 	databaseName := "tf-test-" + randString(t, 10)
@@ -792,6 +794,8 @@ func TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeReplica(t
 }
 
 func TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeClone(t *testing.T) {
+	// Service Networking
+	skipIfVcr(t)
 	t.Parallel()
 
 	databaseName := "tf-test-" + randString(t, 10)

google-beta/resource_sql_user_test.go

@@ -307,6 +307,7 @@ resource "google_sql_user" "user2" {
   instance = google_sql_database_instance.instance.name
   host     = "gmail.com"
   password = "hunter2"
+  depends_on = [google_sql_user.user1]
 }
 `, instance, password, disabled)
 }

website/docs/r/cloudfunctions2_function.html.markdown

@@ -192,18 +192,21 @@ resource "google_project_iam_member" "invoking" {
   project = "my-project-name"
   role    = "roles/run.invoker"
   member  = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.gcs-pubsub-publishing]
 }
 
 resource "google_project_iam_member" "event-receiving" {
   project = "my-project-name"
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.invoking]
 }
 
 resource "google_project_iam_member" "artifactregistry-reader" {
   project = "my-project-name"
   role     = "roles/artifactregistry.reader"
   member   = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.event-receiving]
 }
 
 resource "google_cloudfunctions2_function" "function" {
@@ -302,12 +305,14 @@ resource "google_project_iam_member" "event-receiving" {
   project = "my-project-name"
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.invoking]
 }
 
 resource "google_project_iam_member" "artifactregistry-reader" {
   project = "my-project-name"
   role     = "roles/artifactregistry.reader"
   member   = "serviceAccount:${google_service_account.account.email}"
+  depends_on = [google_project_iam_member.event-receiving]
 }
 
 resource "google_cloudfunctions2_function" "function" {