Actually we don't need a project at all

GoogleCloudPlatform · Nov 11, 2022 · a7e9a82 · a7e9a82
1 parent bdbbffe
commit a7e9a82
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/mmv1/products/firebasehosting/api.yaml b/mmv1/products/firebasehosting/api.yaml
@@ -87,15 +87,6 @@ objects:
         input: true
         required: true
         url_param_only: true
-      - !ruby/object:Api::Type::String
-        name: billing_project
-        description: |
-          Required. The project whose identity will be used when calling Firebase Hosting API.
-          It also specifies the project for API enablement check, quota, and billing. It should
-          usually be the same project the Hosting Site is associated with.
-        input: true
-        required: true
-        url_param_only: true
     properties:
       - !ruby/object:Api::Type::Integer
         name: maxVersions

diff --git a/mmv1/products/firebasehosting/terraform.yaml b/mmv1/products/firebasehosting/terraform.yaml
@@ -33,7 +33,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         test_env_vars:
           project_id: :PROJECT_NAME
   SiteConfig: !ruby/object:Overrides::Terraform::ResourceOverride
-    import_format: ['projects/{{billing_project}}/sites/{{site_id}}/config', 'sites/{{site_id}}/config', '{{site_id}}/config']
+    import_format: ['sites/{{site_id}}/config', '{{site_id}}/config']
     skip_delete: true # SiteConfig is a singleton child of Site
     skip_sweeper: true # no sweeper
     examples:

diff --git a/mmv1/templates/terraform/examples/firebasehosting_siteconfig_basic.tf.erb b/mmv1/templates/terraform/examples/firebasehosting_siteconfig_basic.tf.erb
@@ -6,6 +6,5 @@ resource "google_firebase_hosting_site" "default" {
 
 resource "google_firebase_hosting_site_config" "default" {
   provider = google-beta
-  billing_project  = "<%= ctx[:test_env_vars]['project_id'] %>"
   site_id = google_firebase_hosting_site.default.site_id
 }
diff --git a/mmv1/templates/terraform/examples/firebasehosting_siteconfig_full.tf.erb b/mmv1/templates/terraform/examples/firebasehosting_siteconfig_full.tf.erb
@@ -6,7 +6,6 @@ resource "google_firebase_hosting_site" "default" {
 
 resource "google_firebase_hosting_site_config" "full" {
   provider = google-beta
-  billing_project  = "<%= ctx[:test_env_vars]['project_id'] %>"
   site_id = google_firebase_hosting_site.default.site_id
   max_versions = 100
   cloud_logging_enabled = true