Fix import formats of Firebase apps (#7959) (#14638)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/7959.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+firebase: added additional import formats for app resources, removed the need to supply duplicate projects in some cases
+```

website/docs/r/firebase_android_app.html.markdown

@@ -82,7 +82,7 @@ serving traffic. Set to `DELETE` to delete the AndroidApp. Defaults to `DELETE`.
 
 In addition to the arguments listed above, the following computed attributes are exported:
 
-* `id` - an identifier for the resource with format `{{name}}`
+* `id` - an identifier for the resource with format `projects/{{project}}/androidApps/{{app_id}}`
 
 * `name` -
   The fully qualified resource name of the AndroidApp, for example:
@@ -112,10 +112,11 @@ This resource provides the following
 AndroidApp can be imported using any of these accepted formats:
 
 ```
-$ terraform import google_firebase_android_app.default projects/{{project}}/androidApps/{{appId}}
-$ terraform import google_firebase_android_app.default {{project}}/{{appId}}
-$ terraform import google_firebase_android_app.default androidApps/{{appId}}
-$ terraform import google_firebase_android_app.default {{appId}}
+$ terraform import google_firebase_android_app.default {{project}} projects/{{project}}/androidApps/{{app_id}}
+$ terraform import google_firebase_android_app.default projects/{{project}}/androidApps/{{app_id}}
+$ terraform import google_firebase_android_app.default {{project}}/{{project}}/{{app_id}}
+$ terraform import google_firebase_android_app.default androidApps/{{app_id}}
+$ terraform import google_firebase_android_app.default {{app_id}}
 ```
 
 ## User Project Overrides

website/docs/r/firebase_apple_app.html.markdown

@@ -92,7 +92,7 @@ serving traffic. Set to `DELETE` to delete the Apple. Defaults to `DELETE`.
 
 In addition to the arguments listed above, the following computed attributes are exported:
 
-* `id` - an identifier for the resource with format `{{name}}`
+* `id` - an identifier for the resource with format `projects/{{project}}/iosApps/{{app_id}}`
 
 * `name` -
   The fully qualified resource name of the App, for example:
@@ -118,10 +118,11 @@ This resource provides the following
 AppleApp can be imported using any of these accepted formats:
 
 ```
-$ terraform import google_firebase_apple_app.default projects/{{project}}/iosApps/{{appId}}
-$ terraform import google_firebase_apple_app.default {{project}}/{{appId}}
-$ terraform import google_firebase_apple_app.default iosApps/{{appId}}
-$ terraform import google_firebase_apple_app.default {{appId}}
+$ terraform import google_firebase_apple_app.default {{project}} projects/{{project}}/iosApps/{{app_id}}
+$ terraform import google_firebase_apple_app.default projects/{{project}}/iosApps/{{app_id}}
+$ terraform import google_firebase_apple_app.default {{project}}/{{project}}/{{app_id}}
+$ terraform import google_firebase_apple_app.default iosApps/{{app_id}}
+$ terraform import google_firebase_apple_app.default {{app_id}}
 ```
 
 ## User Project Overrides

website/docs/r/firebase_web_app.html.markdown

@@ -113,7 +113,7 @@ serving traffic. Set to `DELETE` to delete the WebApp. Default to `ABANDON`
 
 In addition to the arguments listed above, the following computed attributes are exported:
 
-* `id` - an identifier for the resource with format `{{name}}`
+* `id` - an identifier for the resource with format `projects/{{project}}/webApps/{{app_id}}`
 
 * `name` -
   The fully qualified resource name of the App, for example:
@@ -142,9 +142,11 @@ This resource provides the following
 WebApp can be imported using any of these accepted formats:
 
 ```
-$ terraform import google_firebase_web_app.default {{project}}/{{name}}
-$ terraform import google_firebase_web_app.default {{project}} {{name}}
-$ terraform import google_firebase_web_app.default {{name}}
+$ terraform import google_firebase_web_app.default {{project}} projects/{{project}}/webApps/{{app_id}}
+$ terraform import google_firebase_web_app.default projects/{{project}}/webApps/{{app_id}}
+$ terraform import google_firebase_web_app.default {{project}}/{{project}}/{{app_id}}
+$ terraform import google_firebase_web_app.default webApps/{{app_id}}
+$ terraform import google_firebase_web_app.default {{app_id}}
 ```
 
 ## User Project Overrides