make connector entities mutable (#15390)

Author: kefang2

mmv1/products/discoveryengine/DataConnector.yaml

@@ -136,11 +136,14 @@ properties:
     type: Array
     description: |
       List of entities from the connected data source to ingest.
-    immutable: true
+    update_mask_fields:
+      - 'entities.params'
+      - 'entities.keyPropertyMappings'
     item_type:
       type: NestedObject
       properties:
         - name: 'entityName'
+          immutable: true
           type: String
           description: |
             The name of the entity. Supported values by data source:
@@ -149,6 +152,7 @@ properties:
             * Confluence: `Content`, `Space`
         - name: 'keyPropertyMappings'
           type: KeyValuePairs
+          diff_suppress_func: 'DataConnectorEntitiesFieldsDiffSuppress'
           description: |
             Attributes for indexing.
             Key: Field name.
@@ -169,7 +173,7 @@ properties:
           output: true
         - name: 'params'
           description: 'The parameters for the entity to facilitate data ingestion.'
-          diff_suppress_func: 'DataConnectorEntitiesParamsDiffSuppress'
+          diff_suppress_func: 'DataConnectorEntitiesFieldsDiffSuppress'
           custom_flatten: 'templates/terraform/custom_flatten/json_schema.tmpl'
           custom_expand: 'templates/terraform/custom_expand/json_schema.tmpl'
           state_func: 'func(v interface{}) string { s, _ := structure.NormalizeJsonString(v); return s }'

mmv1/templates/terraform/constants/discoveryengine_data_connector.go.tmpl

@@ -1,3 +1,3 @@
-func DataConnectorEntitiesParamsDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
+func DataConnectorEntitiesFieldsDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
     return (old == "" && new == "{}") || (old == "{}" && new == "")
 }

mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_data_connector_test.go

@@ -126,7 +126,7 @@ resource "google_discovery_engine_data_connector" "servicenow-basic" {
     params                     = jsonencode({
       "inclusion_filters": {
         "knowledgeBaseSysId": [
-          "123"
+          "456"
         ]
       }
     })
@@ -136,7 +136,7 @@ resource "google_discovery_engine_data_connector" "servicenow-basic" {
     params                     = jsonencode({
       "inclusion_filters": {
         "knowledgeBaseSysId": [
-          "123"
+          "456"
         ]
       }
     })
@@ -146,7 +146,7 @@ resource "google_discovery_engine_data_connector" "servicenow-basic" {
     params                     = jsonencode({
       "inclusion_filters": {
         "knowledgeBaseSysId": [
-          "123"
+          "456"
         ]
       }
     })
@@ -184,7 +184,7 @@ func TestAccDiscoveryEngineDataConnector_DataConnectorEntitiesParamsDiffSuppress
 	}
 
 	for tn, tc := range cases {
-		if discoveryengine.DataConnectorEntitiesParamsDiffSuppress("entities_params_diff_supress", tc.Old, tc.New, nil) != tc.ExpectDiffSuppress {
+		if discoveryengine.DataConnectorEntitiesFieldsDiffSuppress("entities_params_diff_supress", tc.Old, tc.New, nil) != tc.ExpectDiffSuppress {
 			t.Errorf("bad: %s, %q => %q expect DiffSuppress to return %t", tn, tc.Old, tc.New, tc.ExpectDiffSuppress)
 		}
 	}