From 1bca9bdf9ad8177ba53ef36e8a2b35ac6a0c1795 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Sun, 23 Jun 2024 19:25:43 +0000 Subject: [PATCH 01/11] Add a new resource Schema. --- mmv1/products/discoveryengine/Schema.yaml | 0 .../terraform/examples/discoveryengine_schema_basic.tf.erb | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mmv1/products/discoveryengine/Schema.yaml create mode 100644 mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb diff --git a/mmv1/products/discoveryengine/Schema.yaml b/mmv1/products/discoveryengine/Schema.yaml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb new file mode 100644 index 000000000000..e69de29bb2d1 From ecf736d798047aacd1730c0f8ddc04060c30656a Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Sun, 23 Jun 2024 19:31:39 +0000 Subject: [PATCH 02/11] Add a new resource Schema. --- mmv1/products/discoveryengine/Schema.yaml | 101 ++++++++++++++++++ .../discoveryengine_schema_basic.tf.erb | 16 +++ 2 files changed, 117 insertions(+) diff --git a/mmv1/products/discoveryengine/Schema.yaml b/mmv1/products/discoveryengine/Schema.yaml index e69de29bb2d1..fc7248c6ca4b 100644 --- a/mmv1/products/discoveryengine/Schema.yaml +++ b/mmv1/products/discoveryengine/Schema.yaml @@ -0,0 +1,101 @@ +# Copyright 2024 Google Inc. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- !ruby/object:Api::Resource +name: 'Schema' +description: | + Schema defines the structure and layout of a type of document data. +references: !ruby/object:Api::Resource::ReferenceLinks + guides: + 'Provide a schema for your data store': 'https://cloud.google.com/generative-ai-app-builder/docs/provide-schema' + api: 'https://cloud.google.com/generative-ai-app-builder/docs/reference/rest/v1/projects.locations.collections.dataStores.schemas' + +base_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas' +self_link: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas/{{schema_id}}' +create_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores?schemaId={{schema_id}}' +update_verb: :PATCH +update_mask: true +delete_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas/{{schema_id}}' +import_format: + [ + 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas/{{schema_id}}', + ] + +autogen_async: true +async: !ruby/object:Api::OpAsync + operation: !ruby/object:Api::OpAsync::Operation + path: "name" + base_url: "{{op_id}}" + wait_ms: 1000 + timeouts: !ruby/object:Api::Timeouts + insert_minutes: 60 + update_minutes: 60 + delete_minutes: 60 + result: !ruby/object:Api::OpAsync::Result + path: "response" + status: !ruby/object:Api::OpAsync::Status + path: "done" + complete: true + allowed: + - true + - false + error: !ruby/object:Api::OpAsync::Error + path: "error" + message: "message" + +examples: +- !ruby/object:Provider::Terraform::Examples + name: "discoveryengine_schema_basic" + primary_resource_id: 'basic' + primary_resource_name: + 'fmt.Sprintf("tf_test_data_store%s", context["random_suffix"])' + vars: + data_store_id: "data-store-id" + schema_id: "schema-id" +parameters: +- !ruby/object:Api::Type::String + name: 'location' + required: true + immutable: true + url_param_only: true + description: | + The geographic location where the data store should reside. The value can + only be one of "global", "us" and "eu". +- !ruby/object:Api::Type::String + name: 'dataStoreId' + required: true + immutable: true + url_param_only: true + description: | + The unique id of the data store. +- !ruby/object:Api::Type::String + name: 'schemaId' + required: true + immutable: true + url_param_only: true + description: | + The unique id of the schema. + +properties: +- !ruby/object:Api::Type::String + name: 'name' + description: | + The unique full resource name of the schema. Values are of the format + `projects/{project}/locations/{location}/collections/{collection_id}/dataStores/{data_store_id}/schemas/{schema_id}`. + This field must be a UTF-8 encoded string with a length limit of 1024 + characters. + output: true +- !ruby/object:Api::Type::String + name: 'jsonSchema' + description: | + The JSON representation of the schema. diff --git a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb index e69de29bb2d1..6ad36b5fc2e3 100644 --- a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb +++ b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb @@ -0,0 +1,16 @@ +resource "google_discovery_engine_data_store" "basic" { + location = "global" + data_store_id = "<%= ctx[:vars]['data_store_id'] %>" + display_name = "tf-test-structured-datastore" + industry_vertical = "GENERIC" + content_config = "NO_CONTENT" + solution_types = ["SOLUTION_TYPE_SEARCH"] + create_advanced_site_search = false +} + +resource "google_discovery_engine_schema" "basic" { + location = google_discovery_engine_data_store.basic.location + data_store_id = google_discovery_engine_data_store.basic.data_store_id + schema_id = "<%= ctx[:vars]['schema_id'] %>" + json_schema = "{}" +} \ No newline at end of file From a0a6c17149a322cadd3ced168866a5f0d7efad33 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Sun, 23 Jun 2024 20:35:40 +0000 Subject: [PATCH 03/11] Add a new resource Schema: active schema already exists error. --- mmv1/products/discoveryengine/Schema.yaml | 4 ++-- .../examples/discoveryengine_schema_basic.tf.erb | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mmv1/products/discoveryengine/Schema.yaml b/mmv1/products/discoveryengine/Schema.yaml index fc7248c6ca4b..414eb5322cc6 100644 --- a/mmv1/products/discoveryengine/Schema.yaml +++ b/mmv1/products/discoveryengine/Schema.yaml @@ -22,7 +22,7 @@ references: !ruby/object:Api::Resource::ReferenceLinks base_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas' self_link: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas/{{schema_id}}' -create_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores?schemaId={{schema_id}}' +create_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas?schemaId={{schema_id}}' update_verb: :PATCH update_mask: true delete_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas/{{schema_id}}' @@ -58,7 +58,7 @@ examples: name: "discoveryengine_schema_basic" primary_resource_id: 'basic' primary_resource_name: - 'fmt.Sprintf("tf_test_data_store%s", context["random_suffix"])' + 'fmt.Sprintf("tf_test_schema%s", context["random_suffix"])' vars: data_store_id: "data-store-id" schema_id: "schema-id" diff --git a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb index 6ad36b5fc2e3..f3373f3f96ec 100644 --- a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb +++ b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb @@ -1,3 +1,10 @@ +resource "google_discovery_engine_schema" "basic" { + location = google_discovery_engine_data_store.basic.location + data_store_id = google_discovery_engine_data_store.basic.data_store_id + schema_id = "<%= ctx[:vars]['schema_id'] %>" + json_schema = "{\"$schema\": \"https://json-schema.org/draft/2020-12/schema\", \"type\": \"object\", \"date_detection\": true, \"geolocation_detection\": true}" +} + resource "google_discovery_engine_data_store" "basic" { location = "global" data_store_id = "<%= ctx[:vars]['data_store_id'] %>" @@ -6,11 +13,4 @@ resource "google_discovery_engine_data_store" "basic" { content_config = "NO_CONTENT" solution_types = ["SOLUTION_TYPE_SEARCH"] create_advanced_site_search = false -} - -resource "google_discovery_engine_schema" "basic" { - location = google_discovery_engine_data_store.basic.location - data_store_id = google_discovery_engine_data_store.basic.data_store_id - schema_id = "<%= ctx[:vars]['schema_id'] %>" - json_schema = "{}" } \ No newline at end of file From efe71368207677706f8dd47287d0a33c27883952 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Sun, 23 Jun 2024 23:19:19 +0000 Subject: [PATCH 04/11] Fix wrong indentation error in Schema.yaml --- mmv1/products/discoveryengine/Schema.yaml | 88 +++++++++++------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/mmv1/products/discoveryengine/Schema.yaml b/mmv1/products/discoveryengine/Schema.yaml index 414eb5322cc6..b29c6d18dbde 100644 --- a/mmv1/products/discoveryengine/Schema.yaml +++ b/mmv1/products/discoveryengine/Schema.yaml @@ -47,55 +47,55 @@ async: !ruby/object:Api::OpAsync path: "done" complete: true allowed: - - true - - false + - true + - false error: !ruby/object:Api::OpAsync::Error path: "error" message: "message" examples: -- !ruby/object:Provider::Terraform::Examples - name: "discoveryengine_schema_basic" - primary_resource_id: 'basic' - primary_resource_name: - 'fmt.Sprintf("tf_test_schema%s", context["random_suffix"])' - vars: - data_store_id: "data-store-id" - schema_id: "schema-id" + - !ruby/object:Provider::Terraform::Examples + name: "discoveryengine_schema_basic" + primary_resource_id: 'basic' + primary_resource_name: + 'fmt.Sprintf("tf_test_schema%s", context["random_suffix"])' + vars: + data_store_id: "data-store-id" + schema_id: "schema-id" parameters: -- !ruby/object:Api::Type::String - name: 'location' - required: true - immutable: true - url_param_only: true - description: | - The geographic location where the data store should reside. The value can - only be one of "global", "us" and "eu". -- !ruby/object:Api::Type::String - name: 'dataStoreId' - required: true - immutable: true - url_param_only: true - description: | - The unique id of the data store. -- !ruby/object:Api::Type::String - name: 'schemaId' - required: true - immutable: true - url_param_only: true - description: | - The unique id of the schema. + - !ruby/object:Api::Type::String + name: 'location' + required: true + immutable: true + url_param_only: true + description: | + The geographic location where the data store should reside. The value can + only be one of "global", "us" and "eu". + - !ruby/object:Api::Type::String + name: 'dataStoreId' + required: true + immutable: true + url_param_only: true + description: | + The unique id of the data store. + - !ruby/object:Api::Type::String + name: 'schemaId' + required: true + immutable: true + url_param_only: true + description: | + The unique id of the schema. properties: -- !ruby/object:Api::Type::String - name: 'name' - description: | - The unique full resource name of the schema. Values are of the format - `projects/{project}/locations/{location}/collections/{collection_id}/dataStores/{data_store_id}/schemas/{schema_id}`. - This field must be a UTF-8 encoded string with a length limit of 1024 - characters. - output: true -- !ruby/object:Api::Type::String - name: 'jsonSchema' - description: | - The JSON representation of the schema. + - !ruby/object:Api::Type::String + name: 'name' + description: | + The unique full resource name of the schema. Values are of the format + `projects/{project}/locations/{location}/collections/{collection_id}/dataStores/{data_store_id}/schemas/{schema_id}`. + This field must be a UTF-8 encoded string with a length limit of 1024 + characters. + output: true + - !ruby/object:Api::Type::String + name: 'jsonSchema' + description: | + The JSON representation of the schema. From 18dd64d23ae40da9794f232eba98885ac91e3045 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Wed, 7 Aug 2024 22:03:47 +0000 Subject: [PATCH 05/11] Skip default schema creation when creating data store. --- .../examples/discoveryengine_schema_basic.tf.erb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb index f3373f3f96ec..d97a588639ae 100644 --- a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb +++ b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb @@ -6,11 +6,12 @@ resource "google_discovery_engine_schema" "basic" { } resource "google_discovery_engine_data_store" "basic" { - location = "global" - data_store_id = "<%= ctx[:vars]['data_store_id'] %>" - display_name = "tf-test-structured-datastore" - industry_vertical = "GENERIC" - content_config = "NO_CONTENT" - solution_types = ["SOLUTION_TYPE_SEARCH"] - create_advanced_site_search = false + location = "global" + data_store_id = "<%= ctx[:vars]['data_store_id'] %>" + display_name = "tf-test-structured-datastore" + industry_vertical = "GENERIC" + content_config = "NO_CONTENT" + solution_types = ["SOLUTION_TYPE_SEARCH"] + create_advanced_site_search = false + skip_default_schema_creation = true } \ No newline at end of file From 232df1c6f3f5bf0aab39be42c88b787ce0dc4229 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Thu, 8 Aug 2024 01:08:59 +0000 Subject: [PATCH 06/11] Remove whitespaces in JSON string. --- .../terraform/examples/discoveryengine_schema_basic.tf.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb index d97a588639ae..672bc773bea0 100644 --- a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb +++ b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb @@ -2,7 +2,7 @@ resource "google_discovery_engine_schema" "basic" { location = google_discovery_engine_data_store.basic.location data_store_id = google_discovery_engine_data_store.basic.data_store_id schema_id = "<%= ctx[:vars]['schema_id'] %>" - json_schema = "{\"$schema\": \"https://json-schema.org/draft/2020-12/schema\", \"type\": \"object\", \"date_detection\": true, \"geolocation_detection\": true}" + json_schema = "{\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"date_detection\":true,\"type\":\"object\",\"geolocation_detection\":true}" } resource "google_discovery_engine_data_store" "basic" { From 8da44b82c7c40a9f8cf5160cca603e524c6b6a16 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Fri, 9 Aug 2024 05:38:18 +0000 Subject: [PATCH 07/11] Modify properties for fields. --- mmv1/products/discoveryengine/Schema.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mmv1/products/discoveryengine/Schema.yaml b/mmv1/products/discoveryengine/Schema.yaml index b29c6d18dbde..8b725ea02902 100644 --- a/mmv1/products/discoveryengine/Schema.yaml +++ b/mmv1/products/discoveryengine/Schema.yaml @@ -56,9 +56,6 @@ async: !ruby/object:Api::OpAsync examples: - !ruby/object:Provider::Terraform::Examples name: "discoveryengine_schema_basic" - primary_resource_id: 'basic' - primary_resource_name: - 'fmt.Sprintf("tf_test_schema%s", context["random_suffix"])' vars: data_store_id: "data-store-id" schema_id: "schema-id" @@ -99,3 +96,13 @@ properties: name: 'jsonSchema' description: | The JSON representation of the schema. + exactly_one_of: + - struct_schema + - json_schema + custom_expand: 'templates/terraform/custom_expand/json_schema.erb' + custom_flatten: 'templates/terraform/custom_flatten/json_schema.erb' + state_func: + 'func(v interface{}) string { s, _ := structure.NormalizeJsonString(v); + return s }' + validation: !ruby/object:Provider::Terraform::Validation + function: 'validation.StringIsJSON' From 6a6bd73b69d04018e2dbe05f6c0a0abebe7585d0 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Fri, 9 Aug 2024 18:07:44 +0000 Subject: [PATCH 08/11] Remove struct_schema from exactly_one_of property. --- mmv1/products/discoveryengine/Schema.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/mmv1/products/discoveryengine/Schema.yaml b/mmv1/products/discoveryengine/Schema.yaml index 8b725ea02902..ac200f8a7a08 100644 --- a/mmv1/products/discoveryengine/Schema.yaml +++ b/mmv1/products/discoveryengine/Schema.yaml @@ -97,7 +97,6 @@ properties: description: | The JSON representation of the schema. exactly_one_of: - - struct_schema - json_schema custom_expand: 'templates/terraform/custom_expand/json_schema.erb' custom_flatten: 'templates/terraform/custom_flatten/json_schema.erb' From ec1d0101db47fc1a03cef210d0e4c88d22cb3821 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Mon, 12 Aug 2024 22:41:16 +0000 Subject: [PATCH 09/11] Set custom_flatten on field json_schema by normalizing JSON string to solve whiltespace diffs. --- mmv1/products/discoveryengine/Schema.yaml | 4 +-- .../discoveryengine_schema_json_schema.go.erb | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 mmv1/templates/terraform/custom_flatten/discoveryengine_schema_json_schema.go.erb diff --git a/mmv1/products/discoveryengine/Schema.yaml b/mmv1/products/discoveryengine/Schema.yaml index ac200f8a7a08..9734f438a483 100644 --- a/mmv1/products/discoveryengine/Schema.yaml +++ b/mmv1/products/discoveryengine/Schema.yaml @@ -56,6 +56,7 @@ async: !ruby/object:Api::OpAsync examples: - !ruby/object:Provider::Terraform::Examples name: "discoveryengine_schema_basic" + primary_resource_id: 'basic' vars: data_store_id: "data-store-id" schema_id: "schema-id" @@ -98,8 +99,7 @@ properties: The JSON representation of the schema. exactly_one_of: - json_schema - custom_expand: 'templates/terraform/custom_expand/json_schema.erb' - custom_flatten: 'templates/terraform/custom_flatten/json_schema.erb' + custom_flatten: 'templates/terraform/custom_flatten/discoveryengine_schema_json_schema.go.erb' state_func: 'func(v interface{}) string { s, _ := structure.NormalizeJsonString(v); return s }' diff --git a/mmv1/templates/terraform/custom_flatten/discoveryengine_schema_json_schema.go.erb b/mmv1/templates/terraform/custom_flatten/discoveryengine_schema_json_schema.go.erb new file mode 100644 index 000000000000..d0c6a9d7a30f --- /dev/null +++ b/mmv1/templates/terraform/custom_flatten/discoveryengine_schema_json_schema.go.erb @@ -0,0 +1,25 @@ +<%# The license inside this block applies to this file. + # Copyright 2024 Google Inc. + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. +-%> + +func flatten<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} { + if v == nil { + return nil + } + s, err := structure.NormalizeJsonString(v) + if err != nil { + log.Printf("[ERROR] failed to normalize JSON string: %v", err) + } + return s +} \ No newline at end of file From fd447a23bed75ca9958d32014465ed31da738946 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Tue, 13 Aug 2024 18:21:19 +0000 Subject: [PATCH 10/11] Mark immutable at resource level to support only create & delete APIs. --- mmv1/products/discoveryengine/Schema.yaml | 2 ++ .../terraform/examples/discoveryengine_schema_basic.tf.erb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mmv1/products/discoveryengine/Schema.yaml b/mmv1/products/discoveryengine/Schema.yaml index 9734f438a483..e7b630359684 100644 --- a/mmv1/products/discoveryengine/Schema.yaml +++ b/mmv1/products/discoveryengine/Schema.yaml @@ -20,6 +20,7 @@ references: !ruby/object:Api::Resource::ReferenceLinks 'Provide a schema for your data store': 'https://cloud.google.com/generative-ai-app-builder/docs/provide-schema' api: 'https://cloud.google.com/generative-ai-app-builder/docs/reference/rest/v1/projects.locations.collections.dataStores.schemas' +immutable: true base_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas' self_link: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas/{{schema_id}}' create_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas?schemaId={{schema_id}}' @@ -97,6 +98,7 @@ properties: name: 'jsonSchema' description: | The JSON representation of the schema. + immutable: true exactly_one_of: - json_schema custom_flatten: 'templates/terraform/custom_flatten/discoveryengine_schema_json_schema.go.erb' diff --git a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb index 672bc773bea0..799a7f563304 100644 --- a/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb +++ b/mmv1/templates/terraform/examples/discoveryengine_schema_basic.tf.erb @@ -2,7 +2,7 @@ resource "google_discovery_engine_schema" "basic" { location = google_discovery_engine_data_store.basic.location data_store_id = google_discovery_engine_data_store.basic.data_store_id schema_id = "<%= ctx[:vars]['schema_id'] %>" - json_schema = "{\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"date_detection\":true,\"type\":\"object\",\"geolocation_detection\":true}" + json_schema = "{\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"datetime_detection\":true,\"type\":\"object\",\"geolocation_detection\":true}" } resource "google_discovery_engine_data_store" "basic" { From 95afa4f62c8fcfd4815e82779179643c4caf23b8 Mon Sep 17 00:00:00 2001 From: Jialei Chen Date: Tue, 13 Aug 2024 20:45:18 +0000 Subject: [PATCH 11/11] Remove update_verb and update_mask. --- mmv1/products/discoveryengine/Schema.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/mmv1/products/discoveryengine/Schema.yaml b/mmv1/products/discoveryengine/Schema.yaml index e7b630359684..11562a00e12d 100644 --- a/mmv1/products/discoveryengine/Schema.yaml +++ b/mmv1/products/discoveryengine/Schema.yaml @@ -24,8 +24,6 @@ immutable: true base_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas' self_link: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas/{{schema_id}}' create_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas?schemaId={{schema_id}}' -update_verb: :PATCH -update_mask: true delete_url: 'projects/{{project}}/locations/{{location}}/collections/default_collection/dataStores/{{data_store_id}}/schemas/{{schema_id}}' import_format: [