From f64f8057cde68a1f143d30c33924d9fe4c3f44d3 Mon Sep 17 00:00:00 2001
From: Sarah French <sarah.french@hashicorp.com>
Date: Thu, 3 Oct 2024 10:02:06 +0100
Subject: [PATCH] Remove most instances of VCR skips referencing
 https://github.com/hashicorp/terraform-provider-google/issues/14158

- Use of older TPG versions through ExternalProviders breaks VCR, so that is also removed from TestAccDataSourceGoogleFirebaseAppleAppConfig
---
 .../fwprovider/framework_provider_test.go.tmpl  |  4 ----
 ...gle_firebase_android_app_config_test.go.tmpl |  2 --
 ...oogle_firebase_apple_app_config_test.go.tmpl | 17 ++---------------
 .../resource_firebase_web_app_test.go.tmpl      |  2 --
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/mmv1/third_party/terraform/fwprovider/framework_provider_test.go.tmpl b/mmv1/third_party/terraform/fwprovider/framework_provider_test.go.tmpl
index fc9ca2f7c1e3..0d88fb9520ae 100644
--- a/mmv1/third_party/terraform/fwprovider/framework_provider_test.go.tmpl
+++ b/mmv1/third_party/terraform/fwprovider/framework_provider_test.go.tmpl
@@ -16,8 +16,6 @@ import (
 )
 
 func TestAccFrameworkProviderMeta_setModuleName(t *testing.T) {
-	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
-	acctest.SkipIfVcr(t)
 	t.Parallel()
 
 	moduleName := "my-module"
@@ -62,8 +60,6 @@ func TestAccFrameworkProviderBasePath_setInvalidBasePath(t *testing.T) {
 }
 
 func TestAccFrameworkProviderBasePath_setBasePath(t *testing.T) {
-	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
-	acctest.SkipIfVcr(t)
 	t.Parallel()
 
 	acctest.VcrTest(t, resource.TestCase{
diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config_test.go.tmpl
index dc799efdc85d..7280759962b9 100644
--- a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config_test.go.tmpl
+++ b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_android_app_config_test.go.tmpl
@@ -11,8 +11,6 @@ import (
 
 func TestAccDataSourceGoogleFirebaseAndroidAppConfig(t *testing.T) {
 	t.Parallel()
-	// Framework-based resources and datasources don't work with VCR yet
-	acctest.SkipIfVcr(t)
 
 	context := map[string]interface{}{
 		"project_id":   envvar.GetTestProjectFromEnv(),
diff --git a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config_test.go.tmpl
index c71113abac3e..f94c796b6759 100644
--- a/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config_test.go.tmpl
+++ b/mmv1/third_party/terraform/services/firebase/data_source_google_firebase_apple_app_config_test.go.tmpl
@@ -10,8 +10,6 @@ import (
 )
 
 func TestAccDataSourceGoogleFirebaseAppleAppConfig(t *testing.T) {
-	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
-	acctest.SkipIfVcr(t)
 	t.Parallel()
 
 	context := map[string]interface{}{
@@ -23,20 +21,9 @@ func TestAccDataSourceGoogleFirebaseAppleAppConfig(t *testing.T) {
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
-		PreCheck: func() { acctest.AccTestPreCheck(t) },
+		PreCheck:     func() { acctest.AccTestPreCheck(t) },
+		CheckDestroy: testAccCheckFirebaseAppleAppDestroyProducer(t),
 		Steps: []resource.TestStep{
-			{
-				ExternalProviders: map[string]resource.ExternalProvider{
-					"google": {
-						VersionConstraint: "4.58.0",
-						Source:            "hashicorp/google{{- if ne $.TargetVersionName "ga" -}}-{{$.TargetVersionName}}{{- end }}",
-					},
-				},
-				Config: testAccDataSourceGoogleFirebaseAppleAppConfig(context),
-				Check: resource.ComposeTestCheckFunc(
-					testAccDataSourceFirebaseAppleAppConfigCheck("data.google_firebase_apple_app_config.my_app_config"),
-				),
-			},
 			{
 				ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 				Config:                   testAccDataSourceGoogleFirebaseAppleAppConfig(context),
diff --git a/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.tmpl
index 8106154a2bff..8a932269376b 100644
--- a/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.tmpl
+++ b/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.tmpl
@@ -16,8 +16,6 @@ import (
 )
 
 func TestAccFirebaseWebApp_firebaseWebAppFull(t *testing.T) {
-	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
-	acctest.SkipIfVcr(t)
 	t.Parallel()
 
 	context := map[string]interface{}{