diff --git a/mmv1/products/firebaseapphosting/Backend.yaml b/mmv1/products/firebaseapphosting/Backend.yaml index b3cda10f5185..46144847f68f 100644 --- a/mmv1/products/firebaseapphosting/Backend.yaml +++ b/mmv1/products/firebaseapphosting/Backend.yaml @@ -26,25 +26,21 @@ import_format: - "projects/{{project}}/locations/{{location}}/backends/{{backend_id}}" - "{{project}}/{{location}}/{{backend_id}}" - "{{location}}/{{backend_id}}" -min_version: beta examples: - name: firebase_app_hosting_backend_minimal primary_resource_id: example - min_version: beta vars: backend_id: "mini" test_env_vars: project_id: "PROJECT_NAME" - name: firebase_app_hosting_backend_full primary_resource_id: example - min_version: beta vars: backend_id: "full" test_env_vars: project_id: "PROJECT_NAME" - name: firebase_app_hosting_backend_github primary_resource_id: example - min_version: beta vars: backend_id: "my-backend-gh" test_env_vars: diff --git a/mmv1/templates/terraform/examples/firebase_app_hosting_backend_full.tf.tmpl b/mmv1/templates/terraform/examples/firebase_app_hosting_backend_full.tf.tmpl index 200796f7450d..d1acbed8ae17 100644 --- a/mmv1/templates/terraform/examples/firebase_app_hosting_backend_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/firebase_app_hosting_backend_full.tf.tmpl @@ -1,7 +1,5 @@ ### Include these blocks only once per project if you are starting from scratch ### resource "google_service_account" "service_account" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" # Must be firebase-app-hosting-compute @@ -13,8 +11,6 @@ resource "google_service_account" "service_account" { } resource "google_project_iam_member" "app_hosting_sa_developerconnect" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" # For reading connected Github repos @@ -23,8 +19,6 @@ resource "google_project_iam_member" "app_hosting_sa_developerconnect" { } resource "google_project_iam_member" "app_hosting_sa_adminsdk" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" # For Firebase Admin SDK @@ -33,8 +27,6 @@ resource "google_project_iam_member" "app_hosting_sa_adminsdk" { } resource "google_project_iam_member" "app_hosting_sa_runner" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" # For App Hosting @@ -43,8 +35,6 @@ resource "google_project_iam_member" "app_hosting_sa_runner" { } resource "google_project_service" "fah" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" service = "firebaseapphosting.googleapis.com" @@ -53,8 +43,6 @@ resource "google_project_service" "fah" { ### resource "google_firebase_app_hosting_backend" "example" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" # Choose the region closest to your users diff --git a/mmv1/templates/terraform/examples/firebase_app_hosting_backend_github.tf.tmpl b/mmv1/templates/terraform/examples/firebase_app_hosting_backend_github.tf.tmpl index 8622a1fed518..b2c1132a0937 100644 --- a/mmv1/templates/terraform/examples/firebase_app_hosting_backend_github.tf.tmpl +++ b/mmv1/templates/terraform/examples/firebase_app_hosting_backend_github.tf.tmpl @@ -1,6 +1,4 @@ resource "google_developer_connect_connection" "my-connection" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" location = "us-central1" connection_id = "tf-test-connection-new" @@ -11,8 +9,6 @@ resource "google_developer_connect_connection" "my-connection" { } resource "google_developer_connect_git_repository_link" "my-repository" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" location = "us-central1" @@ -36,16 +32,12 @@ resource "google_project_service_identity" "devconnect-p4sa" { } resource "google_project_iam_member" "devconnect-secret" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" role = "roles/secretmanager.admin" member = google_project_service_identity.devconnect-p4sa.member } resource "google_firebase_app_hosting_backend" "example" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" # Choose the region closest to your users diff --git a/mmv1/templates/terraform/examples/firebase_app_hosting_backend_minimal.tf.tmpl b/mmv1/templates/terraform/examples/firebase_app_hosting_backend_minimal.tf.tmpl index 60134bd331c5..d5f9b6d76aaa 100644 --- a/mmv1/templates/terraform/examples/firebase_app_hosting_backend_minimal.tf.tmpl +++ b/mmv1/templates/terraform/examples/firebase_app_hosting_backend_minimal.tf.tmpl @@ -1,7 +1,5 @@ ### Include these blocks only once per project if you are starting from scratch ### resource "google_service_account" "service_account" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" # Must be firebase-app-hosting-compute @@ -13,8 +11,6 @@ resource "google_service_account" "service_account" { } resource "google_project_iam_member" "app_hosting_sa_runner" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" # For App Hosting @@ -23,8 +19,6 @@ resource "google_project_iam_member" "app_hosting_sa_runner" { } resource "google_project_service" "fah" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" service = "firebaseapphosting.googleapis.com" @@ -33,8 +27,6 @@ resource "google_project_service" "fah" { ### resource "google_firebase_app_hosting_backend" "example" { - provider = google-beta - project = "{{index $.TestEnvVars "project_id"}}" # Choose the region closest to your users diff --git a/mmv1/third_party/terraform/services/firebaseapphosting/resource_firebase_app_hosting_backend_test.go b/mmv1/third_party/terraform/services/firebaseapphosting/resource_firebase_app_hosting_backend_test.go index f5e8cf3c3097..d1948d3d3770 100644 --- a/mmv1/third_party/terraform/services/firebaseapphosting/resource_firebase_app_hosting_backend_test.go +++ b/mmv1/third_party/terraform/services/firebaseapphosting/resource_firebase_app_hosting_backend_test.go @@ -22,7 +22,7 @@ func TestAccFirebaseAppHostingBackend_update(t *testing.T) { acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccCheckFirebaseAppHostingBackendDestroyProducer(t), Steps: []resource.TestStep{ { @@ -50,8 +50,6 @@ func TestAccFirebaseAppHostingBackend_update(t *testing.T) { func testAccFirebaseAppHostingBackend_firebaseAppHostingBackendBefore(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_service_account" "service_account" { - provider = google-beta - project = "%{project_id}" # Must be firebase-app-hosting-compute @@ -63,8 +61,6 @@ resource "google_service_account" "service_account" { } resource "google_firebase_app_hosting_backend" "example" { - provider = google-beta - project = "%{project_id}" # Choose the region closest to your users location = "us-central1" @@ -89,8 +85,6 @@ resource "google_firebase_app_hosting_backend" "example" { func testAccFirebaseAppHostingBackend_firebaseAppHostingBackendAfter(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_service_account" "service_account" { - provider = google-beta - project = "%{project_id}" # Must be firebase-app-hosting-compute @@ -102,8 +96,6 @@ resource "google_service_account" "service_account" { } resource "google_firebase_app_hosting_backend" "example" { - provider = google-beta - project = "%{project_id}" # Choose the region closest to your users location = "us-central1"