Make bundle_id required and immutable for Firebase AppleApp. (#7849) (#…

…5577) Signed-off-by: Modular Magician <[email protected]>
hashicorp · May 2, 2023 · d396c8e · d396c8e
1 parent 9b72955
commit d396c8e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/.changelog/7849.txt b/.changelog/7849.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+firebase: specified required argument `bundle_id` in `google_firebase_apple_app`
+```
diff --git a/google-beta/resource_firebase_apple_app.go b/google-beta/resource_firebase_apple_app.go
@@ -43,6 +43,12 @@ func ResourceFirebaseAppleApp() *schema.Resource {
 		},
 
 		Schema: map[string]*schema.Schema{
+			"bundle_id": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: `The canonical bundle ID of the Apple app as it would appear in the Apple AppStore.`,
+			},
 			"display_name": {
 				Type:        schema.TypeString,
 				Required:    true,
@@ -53,11 +59,6 @@ func ResourceFirebaseAppleApp() *schema.Resource {
 				Optional:    true,
 				Description: `The automatically generated Apple ID assigned to the Apple app by Apple in the Apple App Store.`,
 			},
-			"bundle_id": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Description: `The canonical bundle ID of the Apple app as it would appear in the Apple AppStore.`,
-			},
 			"team_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -271,12 +272,6 @@ func resourceFirebaseAppleAppUpdate(d *schema.ResourceData, meta interface{}) er
 	} else if v, ok := d.GetOkExists("display_name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, displayNameProp)) {
 		obj["displayName"] = displayNameProp
 	}
-	bundleIdProp, err := expandFirebaseAppleAppBundleId(d.Get("bundle_id"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("bundle_id"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, bundleIdProp)) {
-		obj["bundleId"] = bundleIdProp
-	}
 	appStoreIdProp, err := expandFirebaseAppleAppAppStoreId(d.Get("app_store_id"), d, config)
 	if err != nil {
 		return err
@@ -302,10 +297,6 @@ func resourceFirebaseAppleAppUpdate(d *schema.ResourceData, meta interface{}) er
 		updateMask = append(updateMask, "displayName")
 	}
 
-	if d.HasChange("bundle_id") {
-		updateMask = append(updateMask, "bundleId")
-	}
-
 	if d.HasChange("app_store_id") {
 		updateMask = append(updateMask, "appStoreId")
 	}

diff --git a/website/docs/r/firebase_apple_app.html.markdown b/website/docs/r/firebase_apple_app.html.markdown
@@ -64,13 +64,13 @@ The following arguments are supported:
   (Required)
   The user-assigned display name of the App.
 
+* `bundle_id` -
+  (Required)
+  The canonical bundle ID of the Apple app as it would appear in the Apple AppStore.
 
-- - -
 
+- - -
 
-* `bundle_id` -
-  (Optional)
-  The canonical bundle ID of the Apple app as it would appear in the Apple AppStore.
 
 * `app_store_id` -
   (Optional)