add new fields and update examples (#15296)

Co-authored-by: Stephen Lewis (Burrows) <[email protected]>

Author: kefang2

mmv1/products/discoveryengine/DataConnector.yaml

@@ -33,6 +33,10 @@ update_mask: true
 delete_url: 'projects/{{project}}/locations/{{location}}/collections/{{collection_id}}'
 import_format:
   - 'projects/{{project}}/locations/{{location}}/collections/{{collection_id}}/dataConnector'
+custom_code:
+  constants: "templates/terraform/constants/discoveryengine_data_connector.go.tmpl"
+state_upgraders: true
+schema_version: 1
 timeouts:
   insert_minutes: 20
   update_minutes: 5
@@ -46,15 +50,10 @@ async:
   result:
     resource_inside_response: true
 examples:
-  - name: 'discoveryengine_dataconnector_jira_basic'
-    primary_resource_id: 'jira-basic'
+  - name: 'discoveryengine_dataconnector_servicenow_basic'
+    primary_resource_id: 'servicenow-basic'
     vars:
       collection_id: 'collection-id'
-      client_id: 'client-id'
-      client_secret: 'client-secret'
-    test_vars_overrides:
-      client_id: '"tf-test-client-id"'
-      client_secret: '"tf-test-client-secret"'
 parameters:
   - name: 'location'
     type: String
@@ -86,6 +85,7 @@ parameters:
     url_param_only: true
     required: true
     immutable: true
+    ignore_read: true
 properties:
   - name: 'name'
     type: String
@@ -168,9 +168,13 @@ properties:
             method, a DataStore is automatically created for each source entity.
           output: true
         - name: 'params'
-          type: KeyValuePairs
-          description: |
-            The parameters for the entity to facilitate data ingestion.
+          description: 'The parameters for the entity to facilitate data ingestion.'
+          diff_suppress_func: 'DataConnectorEntitiesParamsDiffSuppress'
+          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 }'
+          validation:
+            function: 'validation.StringIsJSON'
   - name: 'createTime'
     type: Time
     description: |
@@ -275,3 +279,36 @@ properties:
       'STATE_UNSPECIFIED', 'CREATING', 'ACTIVE', 'FAILED', 'RUNNING', 'WARNING',
       'INITIALIZATION_FAILED', 'UPDATING'.
     output: true
+  - name: 'connectorModes'
+    type: Array
+    description: |
+      The modes enabled for this connector. The possible value can be:
+      'DATA_INGESTION', 'ACTIONS', 'FEDERATED'
+      'EUA', 'FEDERATED_AND_EUA'.
+    item_type:
+      type: String
+  - name: 'syncMode'
+    type: String
+    description: |
+      The data synchronization mode supported by the data connector. The possible value can be:
+      'PERIODIC', 'STREAMING'.
+    ignore_read: true
+  - name: 'incrementalRefreshInterval'
+    type: String
+    description: |
+      The refresh interval specifically for incremental data syncs. If unset,
+      incremental syncs will use the default from env, set to 3hrs.
+      The minimum is 30 minutes and maximum is 7 days. Applicable to only 3P
+      connectors. When the refresh interval is
+      set to the same value as the incremental refresh interval, incremental
+      sync will be disabled.
+  - name: 'autoRunDisabled'
+    type: Boolean
+    description: |
+      Indicates whether full syncs are paused for this connector
+    ignore_read: true
+  - name: 'incrementalSyncDisabled'
+    type: Boolean
+    description: |
+      Indicates whether incremental syncs are paused for this connector.
+    ignore_read: true

mmv1/products/discoveryengine/SearchEngine.yaml

@@ -162,3 +162,14 @@ properties:
     type: KeyValuePairs
     description: |
       A map of the feature config for the engine to opt in or opt out of features.
+  - name: 'kmsKeyName'
+    ignore_read: true
+    type: String
+    description: |
+      The KMS key to be used to protect this Engine at creation time.
+
+      Must be set for requests that need to comply with CMEK Org Policy
+      protections.
+
+      If this field is set and processed successfully, the Engine will be
+      protected by the KMS key, as indicated in the cmek_config field.

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

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

mmv1/templates/terraform/examples/discoveryengine_dataconnector_jira_basic.tf.tmpl

@@ -0,0 +1,50 @@
+resource "google_discovery_engine_data_connector" "servicenow-basic" {
+  location                     = "global"
+  collection_id                = "{{index $.Vars "collection_id"}}"
+  collection_display_name      = "tf-test-dataconnector-servicenow"
+  data_source                  = "servicenow"
+  params = {
+    auth_type                  = "OAUTH_PASSWORD_GRANT"
+    instance_uri               = "https://gcpconnector1.service-now.com/"
+    client_id                  = "SECRET_MANAGER_RESOURCE_NAME"
+    client_secret              = "SECRET_MANAGER_RESOURCE_NAME"
+    static_ip_enabled          = "false"
+    user_account               = "[email protected]"
+    password                   = "SECRET_MANAGER_RESOURCE_NAME"
+  }
+  refresh_interval             = "86400s"
+  incremental_refresh_interval = "21600s"
+  entities {
+    entity_name                = "catalog"
+    params                     = jsonencode({
+      "inclusion_filters": {
+        "knowledgeBaseSysId": [
+          "123"
+        ]
+      }
+    })
+  }
+  entities {
+    entity_name                = "incident"
+    params                     = jsonencode({
+      "inclusion_filters": {
+        "knowledgeBaseSysId": [
+          "123"
+        ]
+      }
+    })
+  }
+  entities {
+    entity_name                = "knowledge_base"
+    params                     = jsonencode({
+      "inclusion_filters": {
+        "knowledgeBaseSysId": [
+          "123"
+        ]
+      }
+    })
+  }
+  static_ip_enabled            = false
+  connector_modes              = ["DATA_INGESTION"]
+  sync_mode                    = "PERIODIC"
+}

mmv1/templates/terraform/examples/discoveryengine_dataconnector_servicenow_basic.tf.tmpl

@@ -14,6 +14,7 @@ resource "google_discovery_engine_search_engine" "agentspace_basic" {
   display_name                = "tf-test-agentspace-search-engine"
   data_store_ids              = [google_discovery_engine_data_store.agentspace_basic.data_store_id]
   industry_vertical           = "GENERIC"
+  app_type                    = "APP_TYPE_INTRANET"
   search_engine_config {
   }
 }