Skip to content

Commit 29492ae

Browse files
authored
Fix TestAccFirebaseAppHostingBackend (#13395)
1 parent 5074e85 commit 29492ae

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

mmv1/products/firebaseapphosting/Backend.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,22 @@ examples:
3131
primary_resource_id: example
3232
vars:
3333
backend_id: "mini"
34+
service_act_id: "firebase-app-hosting-compute"
3435
test_env_vars:
3536
project_id: "PROJECT_NAME"
37+
test_vars_overrides:
38+
# prevent tests from colliding with each other
39+
service_act_id: '"tf-test-fah-minimal"'
3640
- name: firebase_app_hosting_backend_full
3741
primary_resource_id: example
3842
vars:
3943
backend_id: "full"
44+
service_act_id: "firebase-app-hosting-compute"
4045
test_env_vars:
4146
project_id: "PROJECT_NAME"
47+
test_vars_overrides:
48+
# prevent tests from colliding with each other
49+
service_act_id: '"tf-test-fah-full"'
4250
- name: firebase_app_hosting_backend_github
4351
primary_resource_id: example
4452
vars:

mmv1/templates/terraform/examples/firebase_app_hosting_backend_full.tf.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ resource "google_service_account" "service_account" {
2626
project = "{{index $.TestEnvVars "project_id"}}"
2727

2828
# Must be firebase-app-hosting-compute
29-
account_id = "firebase-app-hosting-compute"
29+
account_id = "{{index $.Vars "service_act_id"}}"
3030
display_name = "Firebase App Hosting compute service account"
3131

3232
# Do not throw if already exists

mmv1/templates/terraform/examples/firebase_app_hosting_backend_minimal.tf.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resource "google_service_account" "service_account" {
1616
project = "{{index $.TestEnvVars "project_id"}}"
1717

1818
# Must be firebase-app-hosting-compute
19-
account_id = "firebase-app-hosting-compute"
19+
account_id = "{{index $.Vars "service_act_id"}}"
2020
display_name = "Firebase App Hosting compute service account"
2121

2222
# Do not throw if already exists

0 commit comments

Comments
 (0)