Update appId to app_id for import formats of Firebase apps

GoogleCloudPlatform · May 17, 2023 · c3b2551 · c3b2551
1 parent 3e34153
commit c3b2551
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/mmv1/products/firebase/AndroidApp.yaml b/mmv1/products/firebase/AndroidApp.yaml
@@ -15,11 +15,11 @@
 name: 'AndroidApp'
 min_version: beta
 base_url: projects/{{project}}/androidApps
-self_link: '{{name}}'
+self_link: 'projects/{{project}}/androidApps/{{app_id}}'
 update_verb: :PATCH
 update_mask: true
 delete_verb: :POST
-delete_url: '{{name}}:remove'
+delete_url: 'projects/{{project}}/androidApps/{{app_id}}:remove'
 description: |
   A Google Cloud Firebase Android application instance
 references: !ruby/object:Api::Resource::ReferenceLinks
@@ -46,12 +46,16 @@ async: !ruby/object:Api::OpAsync
     message: 'message'
 import_format:
   [
-    'projects/{{project}}/androidApps/{{appId}}',
-    'androidApps/{{appId}}',
-    '{{appId}}',
+    '{{project}} projects/{{project}}/androidApps/{{app_id}}',
+    'projects/{{project}}/androidApps/{{app_id}}',
+    'androidApps/{{app_id}}',
+    '{{app_id}}',
   ]
 autogen_async: true
 skip_sweeper: true
+identity:
+  - appId
+  - name
 examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'firebase_android_app_basic'
@@ -78,7 +82,6 @@ virtual_fields:
       serving traffic. Set to `DELETE` to delete the AndroidApp. Defaults to `DELETE`.
     default_value: DELETE
 custom_code: !ruby/object:Provider::Terraform::CustomCode
-  custom_import: templates/terraform/custom_import/self_link_as_name.erb
   custom_delete: templates/terraform/custom_delete/firebase_app_deletion_policy.erb
 properties:
   - !ruby/object:Api::Type::String

diff --git a/mmv1/products/firebase/AppleApp.yaml b/mmv1/products/firebase/AppleApp.yaml
@@ -15,7 +15,7 @@
 name: 'AppleApp'
 min_version: beta
 base_url: projects/{{project}}/iosApps
-self_link: '{{name}}'
+self_link: 'projects/{{project}}/iosApps/{{app_id}}'
 update_verb: :PATCH
 delete_verb: :POST
 delete_url: 'projects/{{project}}/iosApps/{{app_id}}:remove'
@@ -45,9 +45,17 @@ async: !ruby/object:Api::OpAsync
     path: 'error'
     message: 'message'
 import_format:
-  ['projects/{{project}}/iosApps/{{appId}}', 'iosApps/{{appId}}', '{{appId}}']
+  [
+    '{{project}} projects/{{project}}/iosApps/{{app_id}}',
+    'projects/{{project}}/iosApps/{{app_id}}',
+    'iosApps/{{app_id}}',
+    '{{app_id}}'
+  ]
 autogen_async: true
 skip_sweeper: true
+identity:
+  - appId
+  - name
 examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'firebase_apple_app_basic'
@@ -90,7 +98,6 @@ virtual_fields:
       serving traffic. Set to `DELETE` to delete the Apple. Defaults to `DELETE`.
     default_value: DELETE
 custom_code: !ruby/object:Provider::Terraform::CustomCode
-  custom_import: templates/terraform/custom_import/self_link_as_name.erb
   custom_delete: templates/terraform/custom_delete/firebase_app_deletion_policy.erb
 properties:
   - !ruby/object:Api::Type::String

diff --git a/mmv1/products/firebase/WebApp.yaml b/mmv1/products/firebase/WebApp.yaml
@@ -15,11 +15,11 @@
 name: 'WebApp'
 min_version: beta
 base_url: projects/{{project}}/webApps
-self_link: '{{name}}'
+self_link: 'projects/{{project}}/webApps/{{app_id}}'
 update_verb: :PATCH
 update_mask: true
 delete_verb: :POST
-delete_url: '{{name}}:remove'
+delete_url: 'projects/{{project}}/webApps/{{app_id}}:remove'
 description: |
   A Google Cloud Firebase web application instance
 references: !ruby/object:Api::Resource::ReferenceLinks
@@ -44,9 +44,18 @@ async: !ruby/object:Api::OpAsync
   error: !ruby/object:Api::OpAsync::Error
     path: 'error'
     message: 'message'
-import_format: ['{{project}} {{name}}']
+import_format:
+  [
+    '{{project}} projects/{{project}}/webApps/{{app_id}}',
+    'projects/{{project}}/webApps/{{app_id}}',
+    'webApps/{{app_id}}',
+    '{{app_id}}',
+  ]
 autogen_async: true
 skip_sweeper: true
+identity:
+  - appId
+  - name
 examples:
   - !ruby/object:Provider::Terraform::Examples  # TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
     skip_vcr: true
@@ -73,7 +82,6 @@ virtual_fields:
       serving traffic. Set to `DELETE` to delete the WebApp. Default to `ABANDON`
     default_value: ABANDON
 custom_code: !ruby/object:Provider::Terraform::CustomCode
-  custom_import: templates/terraform/custom_import/self_link_as_name.erb
   custom_delete: templates/terraform/custom_delete/firebase_app_deletion_policy.erb
 properties:
   - !ruby/object:Api::Type::String