Skip to content

Commit

Permalink
Revert "Fix hashicorp/terraform-provider-google#17388 (only run tests…
Browse files Browse the repository at this point in the history 
… in beta)" (#10111) (#7042)

This reverts commit ae819d0619edd36414af1c5dc5f9e68a6b999174.

[upstream:712cce7da0b4d17e9ee5295c2df2ae67df9d4118]

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
@modular-magician
modular-magician authored Mar 4, 2024
1 parent bef56ad commit a36b852
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 76 deletions.
2 changes: 2 additions & 0 deletions .changelog/10111.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
```release-note:none
```
12 changes: 2 additions & 10 deletions ...services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigMinim

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": {},
Expand All @@ -59,8 +59,6 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigMinim
func testAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigMinimalExample(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_firebase_apple_app" "default" {
provider = google-beta
project = "%{project_id}"
display_name = "Apple app"
bundle_id = "bundle.id.appattest%{random_suffix}"
Expand All @@ -75,8 +73,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_app_attest_config" "default" {
provider = google-beta
project = "%{project_id}"
app_id = google_firebase_apple_app.default.app_id
Expand Down Expand Up @@ -104,7 +100,7 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigFullE

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": {},
Expand All @@ -126,8 +122,6 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigFullE
func testAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigFullExample(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_firebase_apple_app" "default" {
provider = google-beta
project = "%{project_id}"
display_name = "Apple app"
bundle_id = "bundle.id.appattest%{random_suffix}"
Expand All @@ -142,8 +136,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_app_attest_config" "default" {
provider = google-beta
project = "%{project_id}"
app_id = google_firebase_apple_app.default.app_id
token_ttl = "%{token_ttl}"
Expand Down
2 changes: 1 addition & 1 deletion google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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": {},
Expand Down
10 changes: 3 additions & 7 deletions ...-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenBasicExample(t

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": {},
Expand All @@ -65,22 +65,18 @@ func TestAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenBasicExample(t
func testAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenBasicExample(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_firebase_web_app" "default" {
provider = google-beta
project = "%{project_id}"
project = "%{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 = "%{project_id}"
app_id = google_firebase_web_app.default.app_id
display_name = "Debug Token%{random_suffix}"
Expand Down
6 changes: 1 addition & 5 deletions google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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": {},
Expand Down Expand Up @@ -60,8 +60,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"
}
Expand All @@ -74,8 +72,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}"
Expand Down
12 changes: 2 additions & 10 deletions ...ices/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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": {},
Expand All @@ -58,8 +58,6 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
func testAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityConfigMinimalExample(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_firebase_android_app" "default" {
provider = google-beta
project = "%{project_id}"
display_name = "Play Integrity app"
package_name = "package.name.playintegrity%{random_suffix}"
Expand All @@ -75,8 +73,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_play_integrity_config" "default" {
provider = google-beta
project = "%{project_id}"
app_id = google_firebase_android_app.default.app_id
Expand All @@ -103,7 +99,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": {},
Expand All @@ -125,8 +121,6 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
func testAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityConfigFullExample(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_firebase_android_app" "default" {
provider = google-beta
project = "%{project_id}"
display_name = "Play Integrity app"
package_name = "package.name.playintegrity%{random_suffix}"
Expand All @@ -142,8 +136,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_play_integrity_config" "default" {
provider = google-beta
project = "%{project_id}"
app_id = google_firebase_android_app.default.app_id
token_ttl = "%{token_ttl}"
Expand Down
2 changes: 1 addition & 1 deletion ...-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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": {},
Expand Down
6 changes: 1 addition & 5 deletions ...irebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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": {},
Expand All @@ -60,8 +60,6 @@ func TestAccFirebaseAppCheckRecaptchaEnterpriseConfig_firebaseAppCheckRecaptchaE
func testAccFirebaseAppCheckRecaptchaEnterpriseConfig_firebaseAppCheckRecaptchaEnterpriseConfigBasicExample(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 reCAPTCHA Enterprise"
}
Expand All @@ -74,8 +72,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_recaptcha_enterprise_config" "default" {
provider = google-beta
project = "%{project_id}"
app_id = google_firebase_web_app.default.app_id
site_key = "%{site_key}"
Expand Down
2 changes: 1 addition & 1 deletion ...services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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": {},
Expand Down
6 changes: 1 addition & 5 deletions ...rvices/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestAccFirebaseAppCheckRecaptchaV3Config_firebaseAppCheckRecaptchaV3ConfigB

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": {},
Expand All @@ -60,8 +60,6 @@ func TestAccFirebaseAppCheckRecaptchaV3Config_firebaseAppCheckRecaptchaV3ConfigB
func testAccFirebaseAppCheckRecaptchaV3Config_firebaseAppCheckRecaptchaV3ConfigBasicExample(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 reCAPTCHA V3"
}
Expand All @@ -74,8 +72,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_recaptcha_v3_config" "default" {
provider = google-beta
project = "%{project_id}"
app_id = google_firebase_web_app.default.app_id
site_secret = "%{site_secret}"
Expand Down
2 changes: 1 addition & 1 deletion ...le-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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": {},
Expand Down
8 changes: 0 additions & 8 deletions website/docs/r/firebase_app_check_app_attest_config.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ To get more information about AppAttestConfig, see:

```hcl
resource "google_firebase_apple_app" "default" {
provider = google-beta
project = "my-project-name"
display_name = "Apple app"
bundle_id = "bundle.id.appattest"
Expand All @@ -50,8 +48,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_app_attest_config" "default" {
provider = google-beta
project = "my-project-name"
app_id = google_firebase_apple_app.default.app_id
Expand All @@ -70,8 +66,6 @@ resource "google_firebase_app_check_app_attest_config" "default" {

```hcl
resource "google_firebase_apple_app" "default" {
provider = google-beta
project = "my-project-name"
display_name = "Apple app"
bundle_id = "bundle.id.appattest"
Expand All @@ -86,8 +80,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_app_attest_config" "default" {
provider = google-beta
project = "my-project-name"
app_id = google_firebase_apple_app.default.app_id
token_ttl = "7200s"
Expand Down
8 changes: 2 additions & 6 deletions website/docs/r/firebase_app_check_debug_token.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,18 @@ values will be stored in the raw state as plain text: `token`.

```hcl
resource "google_firebase_web_app" "default" {
provider = google-beta
project = "my-project-name"
project = "my-project-name"
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 = "my-project-name"
app_id = google_firebase_web_app.default.app_id
display_name = "Debug Token"
Expand Down
8 changes: 0 additions & 8 deletions website/docs/r/firebase_app_check_play_integrity_config.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ To get more information about PlayIntegrityConfig, see:

```hcl
resource "google_firebase_android_app" "default" {
provider = google-beta
project = "my-project-name"
display_name = "Play Integrity app"
package_name = "package.name.playintegrity"
Expand All @@ -51,8 +49,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_play_integrity_config" "default" {
provider = google-beta
project = "my-project-name"
app_id = google_firebase_android_app.default.app_id
Expand All @@ -71,8 +67,6 @@ resource "google_firebase_app_check_play_integrity_config" "default" {

```hcl
resource "google_firebase_android_app" "default" {
provider = google-beta
project = "my-project-name"
display_name = "Play Integrity app"
package_name = "package.name.playintegrity"
Expand All @@ -88,8 +82,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_play_integrity_config" "default" {
provider = google-beta
project = "my-project-name"
app_id = google_firebase_android_app.default.app_id
token_ttl = "7200s"
Expand Down
4 changes: 0 additions & 4 deletions website/docs/r/firebase_app_check_recaptcha_enterprise_config.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ To get more information about RecaptchaEnterpriseConfig, see:

```hcl
resource "google_firebase_web_app" "default" {
provider = google-beta
project = "my-project-name"
display_name = "Web App for reCAPTCHA Enterprise"
}
Expand All @@ -47,8 +45,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_recaptcha_enterprise_config" "default" {
provider = google-beta
project = "my-project-name"
app_id = google_firebase_web_app.default.app_id
site_key = "6LdpMXIpAAAAANkwWQPgEdjEhal7ugkH9RK9ytuw"
Expand Down
4 changes: 0 additions & 4 deletions website/docs/r/firebase_app_check_recaptcha_v3_config.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ values will be stored in the raw state as plain text: `site_secret`.

```hcl
resource "google_firebase_web_app" "default" {
provider = google-beta
project = "my-project-name"
display_name = "Web App for reCAPTCHA V3"
}
Expand All @@ -51,8 +49,6 @@ resource "time_sleep" "wait_30s" {
}
resource "google_firebase_app_check_recaptcha_v3_config" "default" {
provider = google-beta
project = "my-project-name"
app_id = google_firebase_web_app.default.app_id
site_secret = "6Lf9YnQpAAAAAC3-MHmdAllTbPwTZxpUw5d34YzX"
Expand Down

0 comments on commit a36b852

Please sign in to comment.