Fix hashicorp/terraform-provider-google#17388 (only run tests in beta) (

GoogleCloudPlatform#10120)
pengq-google · May 21, 2024 · 202f52a · 202f52a
1 parent ccc7204
commit 202f52a
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 7 deletions.
diff --git a/mmv1/products/firebaseappcheck/AppAttestConfig.yaml b/mmv1/products/firebaseappcheck/AppAttestConfig.yaml
@@ -37,6 +37,7 @@ 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"
@@ -50,6 +51,7 @@ 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,6 +38,7 @@ 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,6 +37,7 @@ 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"
@@ -46,6 +47,7 @@ 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,6 +36,7 @@ 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,6 +36,7 @@ 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,4 +1,6 @@
 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'] %>"
@@ -13,6 +15,8 @@ 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,4 +1,6 @@
 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'] %>"
@@ -13,6 +15,8 @@ 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,16 +1,20 @@
 resource "google_firebase_web_app" "default" {
-  project = "<%= ctx[:test_env_vars]['project_id'] %>"
+  provider = google-beta
+
+  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,4 +1,6 @@
 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'] %>"
@@ -14,6 +16,8 @@ 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,4 +1,6 @@
 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'] %>"
@@ -14,6 +16,8 @@ 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,4 +1,6 @@
 resource "google_firebase_web_app" "default" {
+  provider = google-beta
+
   project      = "<%= ctx[:test_env_vars]['project_id'] %>"
   display_name = "Web App for reCAPTCHA Enterprise"
 }
@@ -11,6 +13,8 @@ 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,4 +1,6 @@
 resource "google_firebase_web_app" "default" {
+  provider = google-beta
+
   project      = "<%= ctx[:test_env_vars]['project_id'] %>"
   display_name = "Web App for reCAPTCHA V3"
 }
@@ -11,6 +13,8 @@ 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/...ebase_app_check_app_attest_config_test.go → ...e_app_check_app_attest_config_test.go.erb b/...ebase_app_check_app_attest_config_test.go → ...e_app_check_app_attest_config_test.go.erb
@@ -1,4 +1,6 @@
+<% autogen_exception -%>
 package firebaseappcheck_test
+<% unless version == 'ga' -%>
 
 import (
 	"testing"
@@ -21,7 +23,7 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigUpdat
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},
@@ -57,3 +59,4 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigUpdat
 		},
 	})
 }
+<% end -%>
diff --git a/...ce_firebase_app_check_debug_token_test.go → ...irebase_app_check_debug_token_test.go.erb b/...ce_firebase_app_check_debug_token_test.go → ...irebase_app_check_debug_token_test.go.erb
@@ -1,4 +1,6 @@
+<% autogen_exception -%>
 package firebaseappcheck_test
+<% unless version == 'ga' -%>
 
 import (
 	"testing"
@@ -26,7 +28,7 @@ func TestAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenUpdate(t *testi
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},
@@ -58,6 +60,8 @@ 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"
 }
@@ -70,6 +74,8 @@ 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}"
@@ -79,3 +85,4 @@ resource "google_firebase_app_check_debug_token" "default" {
 }
 `, context)
 }
+<% end -%>
diff --git a/...e_app_check_play_integrity_config_test.go → ...p_check_play_integrity_config_test.go.erb b/...e_app_check_play_integrity_config_test.go → ...p_check_play_integrity_config_test.go.erb
@@ -1,4 +1,6 @@
+<% autogen_exception -%>
 package firebaseappcheck_test
+<% unless version == 'ga' -%>
 
 import (
 	"testing"
@@ -20,7 +22,7 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},
@@ -56,3 +58,4 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
 		},
 	})
 }
+<% end -%>
diff --git a/...check_recaptcha_enterprise_config_test.go → ...k_recaptcha_enterprise_config_test.go.erb b/...check_recaptcha_enterprise_config_test.go → ...k_recaptcha_enterprise_config_test.go.erb
@@ -1,4 +1,6 @@
+<% autogen_exception -%>
 package firebaseappcheck_test
+<% unless version == 'ga' -%>
 
 import (
 	"testing"
@@ -28,7 +30,7 @@ func TestAccFirebaseAppCheckRecaptchaEnterpriseConfig_firebaseAppCheckRecaptchaE
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},
@@ -55,3 +57,4 @@ func TestAccFirebaseAppCheckRecaptchaEnterpriseConfig_firebaseAppCheckRecaptchaE
 		},
 	})
 }
+<% end -%>
diff --git a/...ase_app_check_recaptcha_v3_config_test.go → ...app_check_recaptcha_v3_config_test.go.erb b/...ase_app_check_recaptcha_v3_config_test.go → ...app_check_recaptcha_v3_config_test.go.erb
@@ -1,4 +1,6 @@
+<% autogen_exception -%>
 package firebaseappcheck_test
+<% unless version == 'ga' -%>
 
 import (
 	"testing"
@@ -28,7 +30,7 @@ func TestAccFirebaseAppCheckRecaptchaV3Config_firebaseAppCheckRecaptchaV3ConfigU
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 			"time":   {},
@@ -55,3 +57,4 @@ func TestAccFirebaseAppCheckRecaptchaV3Config_firebaseAppCheckRecaptchaV3ConfigU
 		},
 	})
 }
+<% end -%>