Fix issue#20603 (#13295) (#9506)

[upstream:184ff95c3ca98aa0cbae943cc9dadd4eb3b6b89e]

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

Author: modular-magician

.changelog/13295.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+discoveryengine: changed field `dataStoreIds` to mutable in `google_discovery_engine_search_engine`
+```

google-beta/services/discoveryengine/resource_discovery_engine_search_engine.go

@@ -66,7 +66,6 @@ func ResourceDiscoveryEngineSearchEngine() *schema.Resource {
 			"data_store_ids": {
 				Type:        schema.TypeList,
 				Required:    true,
-				ForceNew:    true,
 				Description: `The data stores associated with this engine. For SOLUTION_TYPE_SEARCH type of engines, they can only associate with at most one data store.`,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
@@ -375,6 +374,12 @@ func resourceDiscoveryEngineSearchEngineUpdate(d *schema.ResourceData, meta inte
 	} else if v, ok := d.GetOkExists("display_name"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, displayNameProp)) {
 		obj["displayName"] = displayNameProp
 	}
+	dataStoreIdsProp, err := expandDiscoveryEngineSearchEngineDataStoreIds(d.Get("data_store_ids"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("data_store_ids"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, dataStoreIdsProp)) {
+		obj["dataStoreIds"] = dataStoreIdsProp
+	}
 	searchEngineConfigProp, err := expandDiscoveryEngineSearchEngineSearchEngineConfig(d.Get("search_engine_config"), d, config)
 	if err != nil {
 		return err
@@ -400,6 +405,10 @@ func resourceDiscoveryEngineSearchEngineUpdate(d *schema.ResourceData, meta inte
 		updateMask = append(updateMask, "displayName")
 	}
 
+	if d.HasChange("data_store_ids") {
+		updateMask = append(updateMask, "dataStoreIds")
+	}
+
 	if d.HasChange("search_engine_config") {
 		updateMask = append(updateMask, "searchEngineConfig")
 	}

google-beta/services/discoveryengine/resource_discovery_engine_search_engine_test.go

@@ -3,9 +3,10 @@
 package discoveryengine_test
 
 import (
+	"testing"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest"
-	"testing"
 )
 
 func TestAccDiscoveryEngineSearchEngine_discoveryengineSearchengineBasicExample_update(t *testing.T) {
@@ -55,12 +56,21 @@ resource "google_discovery_engine_data_store" "basic" {
     solution_types              = ["SOLUTION_TYPE_SEARCH"]
     create_advanced_site_search = false
     }
+resource "google_discovery_engine_data_store" "second" {
+    location                    = "global"
+    data_store_id               = "tf-test-example2-datastore%{random_suffix}"
+    display_name                = "tf-test-structured-datastore2"
+    industry_vertical           = "GENERIC"
+    content_config              = "NO_CONTENT"
+    solution_types              = ["SOLUTION_TYPE_SEARCH"]
+    create_advanced_site_search = false
+    }
 resource "google_discovery_engine_search_engine" "basic" {
   engine_id = "tf-test-example-engine-id%{random_suffix}"
   collection_id = "default_collection"
   location = google_discovery_engine_data_store.basic.location
   display_name = "Example Display Name"
-  data_store_ids = [google_discovery_engine_data_store.basic.data_store_id]
+  data_store_ids = [google_discovery_engine_data_store.basic.data_store_id, google_discovery_engine_data_store.second.data_store_id]
   industry_vertical = google_discovery_engine_data_store.basic.industry_vertical
   common_config {
     company_name = "Example Company Name"
@@ -84,6 +94,15 @@ resource "google_discovery_engine_data_store" "basic" {
     solution_types              = ["SOLUTION_TYPE_SEARCH"]
     create_advanced_site_search = false
     }
+resource "google_discovery_engine_data_store" "second" {
+    location                    = "global"
+    data_store_id               = "tf-test-example2-datastore%{random_suffix}"
+    display_name                = "tf-test-structured-datastore2"
+    industry_vertical           = "GENERIC"
+    content_config              = "NO_CONTENT"
+    solution_types              = ["SOLUTION_TYPE_SEARCH"]
+    create_advanced_site_search = false
+    }
 resource "google_discovery_engine_search_engine" "basic" {
   engine_id = "tf-test-example-engine-id%{random_suffix}"
   collection_id = "default_collection"