feat: [merchantapi] New field product_review_data_source added in m…

…essage `.google.shopping.merchant.datasources.v1beta.DataSource` to specify the datasource of the product review (#5932) * feat: New field `product_review_data_source` added in message `.google.shopping.merchant.datasources.v1beta.DataSource` to specify the datasource of the product review feat: New field `merchant_review_data_source` added in message `.google.shopping.merchant.datasources.v1beta.DataSource` to specify the datasource of the merchant review feat: A new message `ProductReviewDataSource` is added to specify the datasource of the product review feat: A new message `MerchantReviewDataSource` is added to specify the datasource of the merchant review docs: A comment for field `take_from_data_sources` in message `.google.shopping.merchant.datasources.v1beta.PrimaryProductDataSource` is changed docs: A comment for message `SupplementalProductDataSource` is changed docs: A comment for field `feed_label` in message `.google.shopping.merchant.datasources.v1beta.SupplementalProductDataSource` is changed docs: A comment for field `username` in message `.google.shopping.merchant.datasources.v1beta.FileInput` is changed docs: A comment for field `password` in message `.google.shopping.merchant.datasources.v1beta.FileInput` is changed docs: A comment for enum value `FETCH` in enum `FileInputType` is changed docs: A comment for enum value `GOOGLE_SHEETS` in enum `FileInputType` is changed PiperOrigin-RevId: 713234506 Source-Link: googleapis/googleapis@51b9a3d Source-Link: googleapis/googleapis-gen@6b4a55f Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LWRhdGFzb3VyY2VzLy5Pd2xCb3QueWFtbCIsImgiOiI2YjRhNTVmMGY0ZmYyNDRkYjg4OGU0YzQ1YTVlY2U1NjM0NjMyY2IwIn0= * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: d-goog <[email protected]>
googleapis · Jan 10, 2025 · 866f6b0 · 866f6b0
1 parent 36be8cd
commit 866f6b0
Show file tree

Hide file tree

Showing 6 changed files with 682 additions and 57 deletions.
diff --git a/...merchant-datasources/protos/google/shopping/merchant/datasources/v1beta/datasources.proto b/...merchant-datasources/protos/google/shopping/merchant/datasources/v1beta/datasources.proto
@@ -145,37 +145,42 @@ message DataSource {
     AUTOFEED = 4;
   }
 
-  // The data source type.
+  // Required. The data source type.
   oneof Type {
-    // Required. The [primary data
+    // The [primary data
     // source](https://support.google.com/merchants/answer/7439058) for local
     // and online products.
-    PrimaryProductDataSource primary_product_data_source = 4
-        [(google.api.field_behavior) = REQUIRED];
+    PrimaryProductDataSource primary_product_data_source = 4;
 
-    // Required. The [supplemental data
+    // The [supplemental data
     // source](https://support.google.com/merchants/answer/7439058) for local
     // and online products.
-    SupplementalProductDataSource supplemental_product_data_source = 5
-        [(google.api.field_behavior) = REQUIRED];
+    SupplementalProductDataSource supplemental_product_data_source = 5;
 
-    // Required. The [local
+    // The [local
     // inventory](https://support.google.com/merchants/answer/7023001) data
     // source.
-    LocalInventoryDataSource local_inventory_data_source = 6
-        [(google.api.field_behavior) = REQUIRED];
+    LocalInventoryDataSource local_inventory_data_source = 6;
 
-    // Required. The [regional
+    // The [regional
     // inventory](https://support.google.com/merchants/answer/7439058) data
     // source.
-    RegionalInventoryDataSource regional_inventory_data_source = 7
-        [(google.api.field_behavior) = REQUIRED];
+    RegionalInventoryDataSource regional_inventory_data_source = 7;
 
-    // Required. The
+    // The
     // [promotion](https://support.google.com/merchants/answer/2906014) data
     // source.
-    PromotionDataSource promotion_data_source = 8
-        [(google.api.field_behavior) = REQUIRED];
+    PromotionDataSource promotion_data_source = 8;
+
+    // The [product
+    // review](https://support.google.com/merchants/answer/7045996)
+    // data source.
+    ProductReviewDataSource product_review_data_source = 9;
+
+    // The [merchant
+    // review](https://support.google.com/merchants/answer/7045996)
+    // data source.
+    MerchantReviewDataSource merchant_review_data_source = 12;
   }
 
   // Identifier. The name of the data source.

diff --git a/...hant-datasources/protos/google/shopping/merchant/datasources/v1beta/datasourcetypes.proto b/...hant-datasources/protos/google/shopping/merchant/datasources/v1beta/datasourcetypes.proto
@@ -41,10 +41,8 @@ message PrimaryProductDataSource {
     // To link the data source to the default rule, you need to add a
     // new reference to this list (in sequential order).
     //
-    // To unlink the data source from the default rule, you need to remove the
-    // given reference from this list. To create attribute rules that are
-    // different from the default rule, see [Set up your attribute
-    // rules](//support.google.com/merchants/answer/14994083).
+    // To unlink the data source from the default rule, you need to
+    // remove the given reference from this list.
     //
     // Changing the order of this list will result in changing the priority of
     // data sources in the default rule.
@@ -127,12 +125,9 @@ message PrimaryProductDataSource {
   DefaultRule default_rule = 7 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// The supplemental data source for local and online products. Supplemental API
-// data sources must not have `feedLabel` and `contentLanguage` fields set. You
-// can only use supplemental data sources to update existing products. For
-// information about creating a supplemental data source, see [Create a
-// supplemental data source and link it to the primary data
-// source](/merchant/api/guides/data-sources/overview#create-supplemental-data-source).
+// The supplemental data source for local and online products. After creation,
+// you should make sure to link the supplemental product data source into one or
+// more primary product data sources.
 message SupplementalProductDataSource {
   // Optional. Immutable. The feed label that is specified on the data source
   // level.
@@ -145,7 +140,11 @@ message SupplementalProductDataSource {
   //
   // `feedLabel` and `contentLanguage` must be either both set or unset for data
   // sources with product content type.
-  // They must be set for data sources with a file input.
+  //
+  // They must be set for data sources with a [file
+  // input][google.shopping.merchant.datasources.v1main.FileInput].
+  // The fields must be unset for data sources without [file
+  // input][google.shopping.merchant.datasources.v1main.FileInput].
   //
   // If set, the data source will only accept products matching this
   // combination. If unset, the data source will accept produts without that
@@ -243,6 +242,12 @@ message PromotionDataSource {
   ];
 }
 
+// The product review data source.
+message ProductReviewDataSource {}
+
+// The merchant review data source.
+message MerchantReviewDataSource {}
+
 // Data source reference can be used to manage related data sources within the
 // data source service.
 message DataSourceReference {

diff --git a/...-merchant-datasources/protos/google/shopping/merchant/datasources/v1beta/fileinputs.proto b/...-merchant-datasources/protos/google/shopping/merchant/datasources/v1beta/fileinputs.proto
@@ -93,14 +93,14 @@ message FileInput {
     // one of those three protocols. Immutable for Google Sheets files.
     string fetch_uri = 7 [(google.api.field_behavior) = OPTIONAL];
 
-    // Optional. An optional user name for [fetch
-    // url][google.shopping.content.bundles.DataSources.FileInput.fetch_url].
+    // Optional. An optional user name for
+    // [fetch_uri][google.shopping.merchant.datasources.v1beta.FileInput.FetchSettings.fetch_uri].
     // Used for [submitting data sources through
     // SFTP](https://support.google.com/merchants/answer/13813117).
     string username = 8 [(google.api.field_behavior) = OPTIONAL];
 
-    // Optional. An optional password for [fetch
-    // url][google.shopping.content.bundles.DataSources.FileInput.fetch_url].
+    // Optional. An optional password for
+    // [fetch_uri][google.shopping.merchant.datasources.v1beta.FileInput.FetchSettings.fetch_uri].
     // Used for [submitting data sources through
     // SFTP](https://support.google.com/merchants/answer/13813117).
     string password = 9 [(google.api.field_behavior) = OPTIONAL];
@@ -116,11 +116,11 @@ message FileInput {
     UPLOAD = 1;
 
     // The file is fetched from the configured
-    // [fetch_uri][google.shopping.content.bundles.DataSources.FileInput.FetchSettings.fetch_uri].
+    // [fetch_uri][google.shopping.merchant.datasources.v1beta.FileInput.FetchSettings.fetch_uri].
     FETCH = 2;
 
     // The file is fetched from Google Sheets specified in the
-    // [fetch_uri][google.shopping.content.bundles.DataSources.FileInput.FetchSettings.fetch_uri].
+    // [fetch_uri][google.shopping.merchant.datasources.v1beta.FileInput.FetchSettings.fetch_uri].
     GOOGLE_SHEETS = 3;
   }