Skip to content

Commit 86f6c47

Browse files
modular-magicianmodular-magician
authored
Fix hashicorp/terraform-provider-google#17388 (only run tests in beta) (#10120) (#7154)
[upstream:44041dc299e47e3f5e99822485e70d8f321117ec] Signed-off-by: Modular Magician <[email protected]>
1 parent 8bc06db commit 86f6c47

16 files changed

+79
-16
lines changed

‎.changelog/10120.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
test only
3+
```

‎google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_generated_test.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigMinim
3737

3838
acctest.VcrTest(t, resource.TestCase{
3939
PreCheck: func() { acctest.AccTestPreCheck(t) },
40-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
40+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
4141
ExternalProviders: map[string]resource.ExternalProvider{
4242
"random": {},
4343
"time": {},
@@ -59,6 +59,8 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigMinim
5959
func testAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigMinimalExample(context map[string]interface{}) string {
6060
return acctest.Nprintf(`
6161
resource "google_firebase_apple_app" "default" {
62+
provider = google-beta
63+
6264
project = "%{project_id}"
6365
display_name = "Apple app"
6466
bundle_id = "bundle.id.appattest%{random_suffix}"
@@ -73,6 +75,8 @@ resource "time_sleep" "wait_30s" {
7375
}
7476
7577
resource "google_firebase_app_check_app_attest_config" "default" {
78+
provider = google-beta
79+
7680
project = "%{project_id}"
7781
app_id = google_firebase_apple_app.default.app_id
7882
@@ -100,7 +104,7 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigFullE
100104

101105
acctest.VcrTest(t, resource.TestCase{
102106
PreCheck: func() { acctest.AccTestPreCheck(t) },
103-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
107+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
104108
ExternalProviders: map[string]resource.ExternalProvider{
105109
"random": {},
106110
"time": {},
@@ -122,6 +126,8 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigFullE
122126
func testAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigFullExample(context map[string]interface{}) string {
123127
return acctest.Nprintf(`
124128
resource "google_firebase_apple_app" "default" {
129+
provider = google-beta
130+
125131
project = "%{project_id}"
126132
display_name = "Apple app"
127133
bundle_id = "bundle.id.appattest%{random_suffix}"
@@ -136,6 +142,8 @@ resource "time_sleep" "wait_30s" {
136142
}
137143
138144
resource "google_firebase_app_check_app_attest_config" "default" {
145+
provider = google-beta
146+
139147
project = "%{project_id}"
140148
app_id = google_firebase_apple_app.default.app_id
141149
token_ttl = "%{token_ttl}"

‎google-beta/services/firebaseappcheck/resource_firebase_app_check_app_attest_config_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestAccFirebaseAppCheckAppAttestConfig_firebaseAppCheckAppAttestConfigUpdat
2323

2424
acctest.VcrTest(t, resource.TestCase{
2525
PreCheck: func() { acctest.AccTestPreCheck(t) },
26-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
26+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
2727
ExternalProviders: map[string]resource.ExternalProvider{
2828
"random": {},
2929
"time": {},

‎google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_generated_test.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenBasicExample(t
4242

4343
acctest.VcrTest(t, resource.TestCase{
4444
PreCheck: func() { acctest.AccTestPreCheck(t) },
45-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
45+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
4646
ExternalProviders: map[string]resource.ExternalProvider{
4747
"random": {},
4848
"time": {},
@@ -65,18 +65,22 @@ func TestAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenBasicExample(t
6565
func testAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenBasicExample(context map[string]interface{}) string {
6666
return acctest.Nprintf(`
6767
resource "google_firebase_web_app" "default" {
68-
project = "%{project_id}"
68+
provider = google-beta
69+
70+
project = "%{project_id}"
6971
display_name = "Web App for debug token"
7072
}
7173
7274
# It takes a while for App Check to recognize the new app
7375
# If your app already exists, you don't have to wait 30 seconds.
7476
resource "time_sleep" "wait_30s" {
75-
depends_on = [google_firebase_web_app.default]
77+
depends_on = [google_firebase_web_app.default]
7678
create_duration = "30s"
7779
}
7880
7981
resource "google_firebase_app_check_debug_token" "default" {
82+
provider = google-beta
83+
8084
project = "%{project_id}"
8185
app_id = google_firebase_web_app.default.app_id
8286
display_name = "Debug Token%{random_suffix}"

‎google-beta/services/firebaseappcheck/resource_firebase_app_check_debug_token_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenUpdate(t *testi
2828

2929
acctest.VcrTest(t, resource.TestCase{
3030
PreCheck: func() { acctest.AccTestPreCheck(t) },
31-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
31+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
3232
ExternalProviders: map[string]resource.ExternalProvider{
3333
"random": {},
3434
"time": {},
@@ -60,6 +60,8 @@ func TestAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenUpdate(t *testi
6060
func testAccFirebaseAppCheckDebugToken_firebaseAppCheckDebugTokenTemplate(context map[string]interface{}) string {
6161
return acctest.Nprintf(`
6262
resource "google_firebase_web_app" "default" {
63+
provider = google-beta
64+
6365
project = "%{project_id}"
6466
display_name = "Web App for debug token"
6567
}
@@ -72,6 +74,8 @@ resource "time_sleep" "wait_30s" {
7274
}
7375
7476
resource "google_firebase_app_check_debug_token" "default" {
77+
provider = google-beta
78+
7579
project = "%{project_id}"
7680
app_id = google_firebase_web_app.default.app_id
7781
display_name = "%{display_name}"

‎google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_generated_test.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
3636

3737
acctest.VcrTest(t, resource.TestCase{
3838
PreCheck: func() { acctest.AccTestPreCheck(t) },
39-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
39+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
4040
ExternalProviders: map[string]resource.ExternalProvider{
4141
"random": {},
4242
"time": {},
@@ -58,6 +58,8 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
5858
func testAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityConfigMinimalExample(context map[string]interface{}) string {
5959
return acctest.Nprintf(`
6060
resource "google_firebase_android_app" "default" {
61+
provider = google-beta
62+
6163
project = "%{project_id}"
6264
display_name = "Play Integrity app"
6365
package_name = "package.name.playintegrity%{random_suffix}"
@@ -73,6 +75,8 @@ resource "time_sleep" "wait_30s" {
7375
}
7476
7577
resource "google_firebase_app_check_play_integrity_config" "default" {
78+
provider = google-beta
79+
7680
project = "%{project_id}"
7781
app_id = google_firebase_android_app.default.app_id
7882
@@ -99,7 +103,7 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
99103

100104
acctest.VcrTest(t, resource.TestCase{
101105
PreCheck: func() { acctest.AccTestPreCheck(t) },
102-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
106+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
103107
ExternalProviders: map[string]resource.ExternalProvider{
104108
"random": {},
105109
"time": {},
@@ -121,6 +125,8 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
121125
func testAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityConfigFullExample(context map[string]interface{}) string {
122126
return acctest.Nprintf(`
123127
resource "google_firebase_android_app" "default" {
128+
provider = google-beta
129+
124130
project = "%{project_id}"
125131
display_name = "Play Integrity app"
126132
package_name = "package.name.playintegrity%{random_suffix}"
@@ -136,6 +142,8 @@ resource "time_sleep" "wait_30s" {
136142
}
137143
138144
resource "google_firebase_app_check_play_integrity_config" "default" {
145+
provider = google-beta
146+
139147
project = "%{project_id}"
140148
app_id = google_firebase_android_app.default.app_id
141149
token_ttl = "%{token_ttl}"

‎google-beta/services/firebaseappcheck/resource_firebase_app_check_play_integrity_config_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccFirebaseAppCheckPlayIntegrityConfig_firebaseAppCheckPlayIntegrityCon
2222

2323
acctest.VcrTest(t, resource.TestCase{
2424
PreCheck: func() { acctest.AccTestPreCheck(t) },
25-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
25+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
2626
ExternalProviders: map[string]resource.ExternalProvider{
2727
"random": {},
2828
"time": {},

‎google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_generated_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestAccFirebaseAppCheckRecaptchaEnterpriseConfig_firebaseAppCheckRecaptchaE
3838

3939
acctest.VcrTest(t, resource.TestCase{
4040
PreCheck: func() { acctest.AccTestPreCheck(t) },
41-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
41+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
4242
ExternalProviders: map[string]resource.ExternalProvider{
4343
"random": {},
4444
"time": {},
@@ -60,6 +60,8 @@ func TestAccFirebaseAppCheckRecaptchaEnterpriseConfig_firebaseAppCheckRecaptchaE
6060
func testAccFirebaseAppCheckRecaptchaEnterpriseConfig_firebaseAppCheckRecaptchaEnterpriseConfigBasicExample(context map[string]interface{}) string {
6161
return acctest.Nprintf(`
6262
resource "google_firebase_web_app" "default" {
63+
provider = google-beta
64+
6365
project = "%{project_id}"
6466
display_name = "Web App for reCAPTCHA Enterprise"
6567
}
@@ -72,6 +74,8 @@ resource "time_sleep" "wait_30s" {
7274
}
7375
7476
resource "google_firebase_app_check_recaptcha_enterprise_config" "default" {
77+
provider = google-beta
78+
7579
project = "%{project_id}"
7680
app_id = google_firebase_web_app.default.app_id
7781
site_key = "%{site_key}"

‎google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_enterprise_config_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestAccFirebaseAppCheckRecaptchaEnterpriseConfig_firebaseAppCheckRecaptchaE
3030

3131
acctest.VcrTest(t, resource.TestCase{
3232
PreCheck: func() { acctest.AccTestPreCheck(t) },
33-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
33+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
3434
ExternalProviders: map[string]resource.ExternalProvider{
3535
"random": {},
3636
"time": {},

‎google-beta/services/firebaseappcheck/resource_firebase_app_check_recaptcha_v3_config_generated_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestAccFirebaseAppCheckRecaptchaV3Config_firebaseAppCheckRecaptchaV3ConfigB
3838

3939
acctest.VcrTest(t, resource.TestCase{
4040
PreCheck: func() { acctest.AccTestPreCheck(t) },
41-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
41+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
4242
ExternalProviders: map[string]resource.ExternalProvider{
4343
"random": {},
4444
"time": {},
@@ -60,6 +60,8 @@ func TestAccFirebaseAppCheckRecaptchaV3Config_firebaseAppCheckRecaptchaV3ConfigB
6060
func testAccFirebaseAppCheckRecaptchaV3Config_firebaseAppCheckRecaptchaV3ConfigBasicExample(context map[string]interface{}) string {
6161
return acctest.Nprintf(`
6262
resource "google_firebase_web_app" "default" {
63+
provider = google-beta
64+
6365
project = "%{project_id}"
6466
display_name = "Web App for reCAPTCHA V3"
6567
}
@@ -72,6 +74,8 @@ resource "time_sleep" "wait_30s" {
7274
}
7375
7476
resource "google_firebase_app_check_recaptcha_v3_config" "default" {
77+
provider = google-beta
78+
7579
project = "%{project_id}"
7680
app_id = google_firebase_web_app.default.app_id
7781
site_secret = "%{site_secret}"

0 commit comments

Comments
 (0)