Revert "Fix hashicorp/terraform-provider-google#17388 (only run tests…

… in beta)" (GoogleCloudPlatform#10111) This reverts commit ae819d0.
pengq-google · May 21, 2024 · ec0ae28 · ec0ae28
1 parent 4ca1a65
commit ec0ae28
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 46 deletions.
diff --git a/mmv1/products/firebaseappcheck/AppAttestConfig.yaml b/mmv1/products/firebaseappcheck/AppAttestConfig.yaml
@@ -37,7 +37,6 @@ import_format:
 examples:
   - !ruby/object:Provider::Terraform::Examples
     name: "firebase_app_check_app_attest_config_minimal"
-    min_version: 'beta'
     # Need the time_sleep resource
     pull_external: true
     primary_resource_id: "default"
@@ -51,7 +50,6 @@ examples:
       project_id: :PROJECT_NAME
   - !ruby/object:Provider::Terraform::Examples
     name: "firebase_app_check_app_attest_config_full"
-    min_version: 'beta'
     # Need the time_sleep resource
     pull_external: true
     primary_resource_id: "default"

diff --git a/mmv1/products/firebaseappcheck/DebugToken.yaml b/mmv1/products/firebaseappcheck/DebugToken.yaml
@@ -38,7 +38,6 @@ import_format:
 examples:
   - !ruby/object:Provider::Terraform::Examples
     name: "firebase_app_check_debug_token_basic"
-    min_version: 'beta'
     # Need the time_sleep resource
     pull_external: true
     primary_resource_id: "default"

diff --git a/mmv1/products/firebaseappcheck/PlayIntegrityConfig.yaml b/mmv1/products/firebaseappcheck/PlayIntegrityConfig.yaml
@@ -37,7 +37,6 @@ import_format:
 examples:
   - !ruby/object:Provider::Terraform::Examples
     name: "firebase_app_check_play_integrity_config_minimal"
-    min_version: 'beta'
     # Need the time_sleep resource
     pull_external: true
     primary_resource_id: "default"
@@ -47,7 +46,6 @@ examples:
       project_id: :PROJECT_NAME
   - !ruby/object:Provider::Terraform::Examples
     name: "firebase_app_check_play_integrity_config_full"
-    min_version: 'beta'
     # Need the time_sleep resource
     pull_external: true
     primary_resource_id: "default"

diff --git a/mmv1/products/firebaseappcheck/RecaptchaEnterpriseConfig.yaml b/mmv1/products/firebaseappcheck/RecaptchaEnterpriseConfig.yaml
@@ -36,7 +36,6 @@ import_format:
 examples:
   - !ruby/object:Provider::Terraform::Examples
     name: "firebase_app_check_recaptcha_enterprise_config_basic"
-    min_version: 'beta'
     # Need the time_sleep resource
     pull_external: true
     primary_resource_id: "default"

diff --git a/mmv1/products/firebaseappcheck/RecaptchaV3Config.yaml b/mmv1/products/firebaseappcheck/RecaptchaV3Config.yaml
@@ -36,7 +36,6 @@ import_format:
 examples:
   - !ruby/object:Provider::Terraform::Examples
     name: "firebase_app_check_recaptcha_v3_config_basic"
-    min_version: 'beta'
     # Need the time_sleep resource
     pull_external: true
     primary_resource_id: "default"

diff --git a/mmv1/templates/terraform/examples/firebase_app_check_app_attest_config_full.tf.erb b/mmv1/templates/terraform/examples/firebase_app_check_app_attest_config_full.tf.erb
@@ -1,6 +1,4 @@
 resource "google_firebase_apple_app" "default" {
-  provider = google-beta
-
   project      = "<%= ctx[:test_env_vars]['project_id'] %>"
   display_name = "Apple app"
   bundle_id    = "<%= ctx[:vars]['bundle_id'] %>"
@@ -15,8 +13,6 @@ resource "time_sleep" "wait_30s" {
 }
 
 resource "google_firebase_app_check_app_attest_config" "default" {
-  provider = google-beta
-
   project   = "<%= ctx[:test_env_vars]['project_id'] %>"
   app_id    = google_firebase_apple_app.default.app_id
   token_ttl = "<%= ctx[:vars]['token_ttl'] %>"

diff --git a/mmv1/templates/terraform/examples/firebase_app_check_app_attest_config_minimal.tf.erb b/mmv1/templates/terraform/examples/firebase_app_check_app_attest_config_minimal.tf.erb
@@ -1,6 +1,4 @@
 resource "google_firebase_apple_app" "default" {
-  provider = google-beta
-
   project      = "<%= ctx[:test_env_vars]['project_id'] %>"
   display_name = "Apple app"
   bundle_id    = "<%= ctx[:vars]['bundle_id'] %>"
@@ -15,8 +13,6 @@ resource "time_sleep" "wait_30s" {
 }
 
 resource "google_firebase_app_check_app_attest_config" "default" {
-  provider = google-beta
-
   project = "<%= ctx[:test_env_vars]['project_id'] %>"
   app_id  = google_firebase_apple_app.default.app_id
 

diff --git a/mmv1/templates/terraform/examples/firebase_app_check_debug_token_basic.tf.erb b/mmv1/templates/terraform/examples/firebase_app_check_debug_token_basic.tf.erb
@@ -1,20 +1,16 @@
 resource "google_firebase_web_app" "default" {
-  provider = google-beta
-
-  project      = "<%= ctx[:test_env_vars]['project_id'] %>"
+  project = "<%= ctx[:test_env_vars]['project_id'] %>"
   display_name = "Web App for debug token"
 }
 
 # It takes a while for App Check to recognize the new app
 # If your app already exists, you don't have to wait 30 seconds.
 resource "time_sleep" "wait_30s" {
-  depends_on      = [google_firebase_web_app.default]
+  depends_on = [google_firebase_web_app.default]
   create_duration = "30s"
 }
 
 resource "google_firebase_app_check_debug_token" "default" {
-  provider = google-beta
-
   project      = "<%= ctx[:test_env_vars]['project_id'] %>"
   app_id       = google_firebase_web_app.default.app_id
   display_name = "<%= ctx[:vars]['display_name'] %>"

diff --git a/mmv1/templates/terraform/examples/firebase_app_check_play_integrity_config_full.tf.erb b/mmv1/templates/terraform/examples/firebase_app_check_play_integrity_config_full.tf.erb
@@ -1,6 +1,4 @@
 resource "google_firebase_android_app" "default" {
-  provider = google-beta
-
   project       = "<%= ctx[:test_env_vars]['project_id'] %>"
   display_name  = "Play Integrity app"
   package_name  = "<%= ctx[:vars]['package_name'] %>"
@@ -16,8 +14,6 @@ resource "time_sleep" "wait_30s" {
 }
 
 resource "google_firebase_app_check_play_integrity_config" "default" {
-  provider = google-beta
-
   project   = "<%= ctx[:test_env_vars]['project_id'] %>"
   app_id    = google_firebase_android_app.default.app_id
   token_ttl = "<%= ctx[:vars]['token_ttl'] %>"

diff --git a/mmv1/templates/terraform/examples/firebase_app_check_play_integrity_config_minimal.tf.erb b/mmv1/templates/terraform/examples/firebase_app_check_play_integrity_config_minimal.tf.erb
@@ -1,6 +1,4 @@
 resource "google_firebase_android_app" "default" {
-  provider = google-beta
-
   project       = "<%= ctx[:test_env_vars]['project_id'] %>"
   display_name  = "Play Integrity app"
   package_name  = "<%= ctx[:vars]['package_name'] %>"
@@ -16,8 +14,6 @@ resource "time_sleep" "wait_30s" {
 }
 
 resource "google_firebase_app_check_play_integrity_config" "default" {
-  provider = google-beta
-
   project = "<%= ctx[:test_env_vars]['project_id'] %>"
   app_id  = google_firebase_android_app.default.app_id
 

diff --git a/.../templates/terraform/examples/firebase_app_check_recaptcha_enterprise_config_basic.tf.erb b/.../templates/terraform/examples/firebase_app_check_recaptcha_enterprise_config_basic.tf.erb
@@ -1,6 +1,4 @@
 resource "google_firebase_web_app" "default" {
-  provider = google-beta
-
   project      = "<%= ctx[:test_env_vars]['project_id'] %>"
   display_name = "Web App for reCAPTCHA Enterprise"
 }
@@ -13,8 +11,6 @@ resource "time_sleep" "wait_30s" {
 }
 
 resource "google_firebase_app_check_recaptcha_enterprise_config" "default" {
-  provider = google-beta
-
   project   = "<%= ctx[:test_env_vars]['project_id'] %>"
   app_id    = google_firebase_web_app.default.app_id
   site_key  = "<%= ctx[:vars]['site_key'] %>"

diff --git a/mmv1/templates/terraform/examples/firebase_app_check_recaptcha_v3_config_basic.tf.erb b/mmv1/templates/terraform/examples/firebase_app_check_recaptcha_v3_config_basic.tf.erb
@@ -1,6 +1,4 @@
 resource "google_firebase_web_app" "default" {
-  provider = google-beta
-
   project      = "<%= ctx[:test_env_vars]['project_id'] %>"
   display_name = "Web App for reCAPTCHA V3"
 }
@@ -13,8 +11,6 @@ resource "time_sleep" "wait_30s" {
 }
 
 resource "google_firebase_app_check_recaptcha_v3_config" "default" {
-  provider = google-beta
-
   project     = "<%= ctx[:test_env_vars]['project_id'] %>"
   app_id      = google_firebase_web_app.default.app_id
   site_secret = "<%= ctx[:vars]['site_secret'] %>"

diff --git a/...terraform/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go b/...terraform/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go
@@ -21,7 +21,7 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigUpdat
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},

diff --git a/...party/terraform/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go b/...party/terraform/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go
@@ -26,7 +26,7 @@ func TestAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenUpdate(t *testi
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},
@@ -58,8 +58,6 @@ func TestAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenUpdate(t *testi
 func testAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenTemplate(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_firebase_web_app" "default" {
-  provider = google-beta
-
   project = "%{project_id}"
   display_name = "Web App for debug token"
 }
@@ -72,8 +70,6 @@ resource "time_sleep" "wait_30s" {
 }
 
 resource "google_firebase_app_check_debug_token" "default" {
-  provider = google-beta
-
   project      = "%{project_id}"
   app_id       = google_firebase_web_app.default.app_id
   display_name = "%{display_name}"

diff --git a/...aform/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go b/...aform/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go
@@ -20,7 +20,7 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},

diff --git a/...services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go b/...services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go
@@ -28,7 +28,7 @@ func TestAccFirebaseAppCheckRecaptchaEnterpriseConfig_firebaseAppCheckRecaptchaE
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},

diff --git a/...rraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go b/...rraform/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go
@@ -28,7 +28,7 @@ func TestAccFirebaseAppCheckRecaptchaV3Config_firebaseAppCheckRecaptchaV3ConfigU
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},