fix!: Update C# namespace to follow naming conventions.

fix!: Use the common Location resource name.
BREAKING CHANGE: rename stocking_unit_retrievable_fields to variant_retrievable_fields in Product.proto. Since the API is still under development and not yet launched and the client library generation is not started, this change should be safe.
BREAKING_CHNAGE: remove event_source field in the user_event.proto. API is not used anywhere so it's safe.

PiperOrigin-RevId: 337386065
This commit is contained in:
Google APIs 2020-10-15 14:42:25 -07:00 committed by Copybara-Service
parent 215c12ade7
commit 4004f5e263
26 changed files with 28 additions and 83 deletions

View File

@ -28,10 +28,6 @@ option java_package = "com.google.cloud.retail.v2";
option objc_class_prefix = "RETAIL";
option php_namespace = "Google\\Cloud\\Retail\\V2";
option ruby_package = "Google::Cloud::Retail::V2";
option (google.api.resource_definition) = {
type: "retail.googleapis.com/Location"
pattern: "projects/{project}/locations/{location}"
};
// Configures what level the product should be uploaded with regards to
// how users will be send events and how predictions will be made.

View File

@ -69,7 +69,7 @@ message ListCatalogsRequest {
// returned.
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = { type: "retail.googleapis.com/Location" }
(google.api.resource_reference) = { type: "locations.googleapis.com/Location" }
];
// Maximum number of [Catalog][google.cloud.retail.v2.Catalog]s to return. If

View File

@ -280,5 +280,5 @@ message Product {
//
// Maximum number of paths is 10. Otherwise, an INVALID_ARGUMENT error is
// returned.
google.protobuf.FieldMask stocking_unit_retrievable_fields = 30;
google.protobuf.FieldMask variant_retrievable_fields = 30;
}

View File

@ -169,20 +169,6 @@ message UserEvent {
// automatically generated if using the client side event reporting with
// JavaScript pixel and Google Tag Manager.
string page_view_id = 15;
// User event source.
// Acceptable values are:
//
// * `client_tag` if the event is ingested via a JavaScript tag or
// Recommendations AI Tag through automl datalayer or JS Macros.
// * `client_tag_ecommerce` if the event is ingested via Recommendations AI
// Tag through
// Enhanced Ecommerce datalayer.
// * 'batch_upload' if the event is ingested via ImportUserEvents API.
//
// This field should *not* be set when using client side event reporting with
// JavaScript pixel and Google Tag Manager or the Recommendations AI Tag.
string event_source = 16;
}
// Detailed product information associated with a user event.

View File

@ -20,7 +20,7 @@ import "google/api/annotations.proto";
import "google/api/field_behavior.proto";
import "google/api/resource.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "CatalogProto";
@ -28,10 +28,6 @@ option java_package = "com.google.cloud.retail.v2alpha";
option objc_class_prefix = "RETAIL";
option php_namespace = "Google\\Cloud\\Retail\\V2alpha";
option ruby_package = "Google::Cloud::Retail::V2alpha";
option (google.api.resource_definition) = {
type: "retail.googleapis.com/Location"
pattern: "projects/{project}/locations/{location}"
};
// Configures what level the product should be uploaded with regards to
// how users will be send events and how predictions will be made.

View File

@ -23,7 +23,7 @@ import "google/api/resource.proto";
import "google/cloud/retail/v2alpha/catalog.proto";
import "google/protobuf/field_mask.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "CatalogServiceProto";
@ -69,7 +69,7 @@ message ListCatalogsRequest {
// error is returned.
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = { type: "retail.googleapis.com/Location" }
(google.api.resource_reference) = { type: "locations.googleapis.com/Location" }
];
// Maximum number of [Catalog][google.cloud.retail.v2alpha.Catalog]s to

View File

@ -20,7 +20,7 @@ import "google/api/annotations.proto";
import "google/api/field_behavior.proto";
import "google/protobuf/timestamp.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "CommonProto";

View File

@ -22,7 +22,7 @@ import "google/api/resource.proto";
import "google/protobuf/timestamp.proto";
import "google/rpc/status.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "ExportConfigProto";

View File

@ -25,7 +25,7 @@ import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";
import "google/rpc/status.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "ImportConfigProto";

View File

@ -22,7 +22,7 @@ import "google/api/field_behavior.proto";
import "google/cloud/retail/v2alpha/user_event.proto";
import "google/protobuf/struct.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "PredictionServiceProto";

View File

@ -24,7 +24,7 @@ import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "ProductProto";
@ -297,5 +297,5 @@ message Product {
//
// Maximum number of paths is 10. Otherwise, an INVALID_ARGUMENT error is
// returned.
google.protobuf.FieldMask stocking_unit_retrievable_fields = 30;
google.protobuf.FieldMask variant_retrievable_fields = 30;
}

View File

@ -28,7 +28,7 @@ import "google/longrunning/operations.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "ProductServiceProto";

View File

@ -19,7 +19,7 @@ package google.cloud.retail.v2alpha;
import "google/api/annotations.proto";
import "google/api/field_behavior.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "PurgeConfigProto";

View File

@ -23,7 +23,7 @@ import "google/cloud/retail/v2alpha/product.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "UserEventProto";
@ -169,20 +169,6 @@ message UserEvent {
// automatically generated if using the client side event reporting with
// JavaScript pixel and Google Tag Manager.
string page_view_id = 15;
// User event source.
// Acceptable values are:
//
// * `client_tag` if the event is ingested via a JavaScript tag or
// Recommendations AI Tag through automl datalayer or JS Macros.
// * `client_tag_ecommerce` if the event is ingested via Recommendations AI
// Tag through
// Enhanced Ecommerce datalayer.
// * 'batch_upload' if the event is ingested via ImportUserEvents API.
//
// This field should *not* be set when using client side event reporting with
// JavaScript pixel and Google Tag Manager or the Recommendations AI Tag.
string event_source = 16;
}
// Detailed product information associated with a user event.

View File

@ -26,7 +26,7 @@ import "google/cloud/retail/v2alpha/purge_config.proto";
import "google/cloud/retail/v2alpha/user_event.proto";
import "google/longrunning/operations.proto";
option csharp_namespace = "Google.Cloud.Retail.V2alpha";
option csharp_namespace = "Google.Cloud.Retail.V2Alpha";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2alpha;retail";
option java_multiple_files = true;
option java_outer_classname = "UserEventServiceProto";

View File

@ -20,7 +20,7 @@ import "google/api/annotations.proto";
import "google/api/field_behavior.proto";
import "google/api/resource.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "CatalogProto";
@ -28,10 +28,6 @@ option java_package = "com.google.cloud.retail.v2beta";
option objc_class_prefix = "RETAIL";
option php_namespace = "Google\\Cloud\\Retail\\V2beta";
option ruby_package = "Google::Cloud::Retail::V2beta";
option (google.api.resource_definition) = {
type: "retail.googleapis.com/Location"
pattern: "projects/{project}/locations/{location}"
};
// Configures what level the product should be uploaded with regards to
// how users will be send events and how predictions will be made.

View File

@ -23,7 +23,7 @@ import "google/api/resource.proto";
import "google/cloud/retail/v2beta/catalog.proto";
import "google/protobuf/field_mask.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "CatalogServiceProto";
@ -69,7 +69,7 @@ message ListCatalogsRequest {
// error is returned.
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = { type: "retail.googleapis.com/Location" }
(google.api.resource_reference) = { type: "locations.googleapis.com/Location" }
];
// Maximum number of [Catalog][google.cloud.retail.v2beta.Catalog]s to return.

View File

@ -20,7 +20,7 @@ import "google/api/annotations.proto";
import "google/api/field_behavior.proto";
import "google/protobuf/timestamp.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "CommonProto";

View File

@ -22,7 +22,7 @@ import "google/api/resource.proto";
import "google/protobuf/timestamp.proto";
import "google/rpc/status.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "ExportConfigProto";

View File

@ -25,7 +25,7 @@ import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";
import "google/rpc/status.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "ImportConfigProto";

View File

@ -22,7 +22,7 @@ import "google/api/field_behavior.proto";
import "google/cloud/retail/v2beta/user_event.proto";
import "google/protobuf/struct.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "PredictionServiceProto";

View File

@ -24,7 +24,7 @@ import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "ProductProto";
@ -281,5 +281,5 @@ message Product {
//
// Maximum number of paths is 10. Otherwise, an INVALID_ARGUMENT error is
// returned.
google.protobuf.FieldMask stocking_unit_retrievable_fields = 30;
google.protobuf.FieldMask variant_retrievable_fields = 30;
}

View File

@ -28,7 +28,7 @@ import "google/longrunning/operations.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "ProductServiceProto";

View File

@ -19,7 +19,7 @@ package google.cloud.retail.v2beta;
import "google/api/annotations.proto";
import "google/api/field_behavior.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "PurgeConfigProto";
@ -51,7 +51,6 @@ message PurgeProductsResponse {
// The total count of products purged as a result of the operation.
int64 purged_count = 1;
}
// Request message for PurgeUserEvents method.
message PurgeUserEventsRequest {
// Required. The resource name of the catalog under which the events are

View File

@ -23,7 +23,7 @@ import "google/cloud/retail/v2beta/product.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "UserEventProto";
@ -169,20 +169,6 @@ message UserEvent {
// automatically generated if using the client side event reporting with
// JavaScript pixel and Google Tag Manager.
string page_view_id = 15;
// User event source.
// Acceptable values are:
//
// * `client_tag` if the event is ingested via a JavaScript tag or
// Recommendations AI Tag through automl datalayer or JS Macros.
// * `client_tag_ecommerce` if the event is ingested via Recommendations AI
// Tag through
// Enhanced Ecommerce datalayer.
// * 'batch_upload' if the event is ingested via ImportUserEvents API.
//
// This field should *not* be set when using client side event reporting with
// JavaScript pixel and Google Tag Manager or the Recommendations AI Tag.
string event_source = 16;
}
// Detailed product information associated with a user event.

View File

@ -26,7 +26,7 @@ import "google/cloud/retail/v2beta/purge_config.proto";
import "google/cloud/retail/v2beta/user_event.proto";
import "google/longrunning/operations.proto";
option csharp_namespace = "Google.Cloud.Retail.V2beta";
option csharp_namespace = "Google.Cloud.Retail.V2Beta";
option go_package = "google.golang.org/genproto/googleapis/cloud/retail/v2beta;retail";
option java_multiple_files = true;
option java_outer_classname = "UserEventServiceProto";