Synchronize new proto/yaml changes.

PiperOrigin-RevId: 235606237
pull/540/head
Google APIs 6 years ago committed by Copybara-Service
parent 219c19f9b8
commit 6598bda8b4
  1. 4
      google/bytestream/bytestream.proto
  2. 1
      google/cloud/bigquery/logging/v1/audit_data.proto
  3. 7
      google/logging/type/http_request.proto
  4. 1
      google/logging/type/log_severity.proto
  5. 1
      google/logging/v2/log_entry.proto
  6. 39
      google/logging/v2/logging.proto
  7. 107
      google/logging/v2/logging_config.proto
  8. 1
      google/logging/v2/logging_metrics.proto
  9. 1
      google/rpc/code.proto
  10. 4
      google/rpc/error_details.proto
  11. 32
      google/rpc/status.proto
  12. 1
      google/type/color.proto
  13. 6
      google/type/date.proto
  14. 1
      google/type/dayofweek.proto
  15. 1
      google/type/latlng.proto
  16. 1
      google/type/money.proto
  17. 1
      google/type/postal_address.proto
  18. 4
      google/type/timeofday.proto
  19. 13
      google/watcher/v1/watch.proto

@ -23,7 +23,6 @@ option go_package = "google.golang.org/genproto/googleapis/bytestream;bytestream
option java_outer_classname = "ByteStreamProto";
option java_package = "com.google.bytestream";
// #### Introduction
//
// The Byte Stream API enables a client to read and write a stream of bytes to
@ -91,7 +90,8 @@ service ByteStream {
// evicted. For any sequence of `QueryWriteStatus()` calls for a given
// resource name, the sequence of returned `committed_size` values will be
// non-decreasing.
rpc QueryWriteStatus(QueryWriteStatusRequest) returns (QueryWriteStatusResponse);
rpc QueryWriteStatus(QueryWriteStatusRequest)
returns (QueryWriteStatusResponse);
}
// Request object for ByteStream.Read.

@ -26,7 +26,6 @@ option java_multiple_files = true;
option java_outer_classname = "AuditDataProto";
option java_package = "com.google.cloud.bigquery.logging.v1";
// BigQuery request and response messages for audit log.
// Note: `Table.schema` has been deprecated in favor of `Table.schemaJson`.
// `Table.schema` may continue to be present in your logs during this

@ -27,7 +27,6 @@ option java_outer_classname = "HttpRequestProto";
option java_package = "com.google.logging.type";
option php_namespace = "Google\\Cloud\\Logging\\Type";
// A common proto for logging HTTP requests. Only contains semantics
// defined by the HTTP specification. Product-specific logging
// information MUST be defined in a separate message.
@ -53,7 +52,8 @@ message HttpRequest {
int64 response_size = 5;
// The user agent sent by the client. Example:
// `"Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; Q312461; .NET CLR 1.0.3705)"`.
// `"Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; Q312461; .NET
// CLR 1.0.3705)"`.
string user_agent = 6;
// The IP address (IPv4 or IPv6) of the client that issued the HTTP
@ -65,7 +65,8 @@ message HttpRequest {
string server_ip = 13;
// The referer URL of the request, as defined in
// [HTTP/1.1 Header Field Definitions](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html).
// [HTTP/1.1 Header Field
// Definitions](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html).
string referer = 8;
// The request processing latency on the server, from the time the request was

@ -26,7 +26,6 @@ option java_outer_classname = "LogSeverityProto";
option java_package = "com.google.logging.type";
option php_namespace = "Google\\Cloud\\Logging\\Type";
// The severity of the event described in a log entry, expressed as one of the
// standard severity levels listed below. For your reference, the levels are
// assigned the listed numeric values. The effect of using numeric values other

@ -33,7 +33,6 @@ option java_outer_classname = "LogEntryProto";
option java_package = "com.google.logging.v2";
option php_namespace = "Google\\Cloud\\Logging\\V2";
// An individual entry in a log.
message LogEntry {
// Required. The resource name of the log to which this log entry belongs:

@ -33,7 +33,6 @@ option java_outer_classname = "LoggingProto";
option java_package = "com.google.logging.v2";
option php_namespace = "Google\\Cloud\\Logging\\V2";
// Service for ingesting and querying logs.
service LoggingServiceV2 {
// Deletes all the log entries in a log.
@ -43,15 +42,9 @@ service LoggingServiceV2 {
rpc DeleteLog(DeleteLogRequest) returns (google.protobuf.Empty) {
option (google.api.http) = {
delete: "/v2/{log_name=projects/*/logs/*}"
additional_bindings {
delete: "/v2/{log_name=organizations/*/logs/*}"
}
additional_bindings {
delete: "/v2/{log_name=folders/*/logs/*}"
}
additional_bindings {
delete: "/v2/{log_name=billingAccounts/*/logs/*}"
}
additional_bindings { delete: "/v2/{log_name=organizations/*/logs/*}" }
additional_bindings { delete: "/v2/{log_name=folders/*/logs/*}" }
additional_bindings { delete: "/v2/{log_name=billingAccounts/*/logs/*}" }
};
}
@ -62,7 +55,8 @@ service LoggingServiceV2 {
// A single request may contain log entries for a maximum of 1000
// different resources (projects, organizations, billing accounts or
// folders)
rpc WriteLogEntries(WriteLogEntriesRequest) returns (WriteLogEntriesResponse) {
rpc WriteLogEntries(WriteLogEntriesRequest)
returns (WriteLogEntriesResponse) {
option (google.api.http) = {
post: "/v2/entries:write"
body: "*"
@ -80,7 +74,8 @@ service LoggingServiceV2 {
}
// Lists the descriptors for monitored resource types used by Logging.
rpc ListMonitoredResourceDescriptors(ListMonitoredResourceDescriptorsRequest) returns (ListMonitoredResourceDescriptorsResponse) {
rpc ListMonitoredResourceDescriptors(ListMonitoredResourceDescriptorsRequest)
returns (ListMonitoredResourceDescriptorsResponse) {
option (google.api.http) = {
get: "/v2/monitoredResourceDescriptors"
};
@ -91,18 +86,10 @@ service LoggingServiceV2 {
rpc ListLogs(ListLogsRequest) returns (ListLogsResponse) {
option (google.api.http) = {
get: "/v2/{parent=*/*}/logs"
additional_bindings {
get: "/v2/{parent=projects/*}/logs"
}
additional_bindings {
get: "/v2/{parent=organizations/*}/logs"
}
additional_bindings {
get: "/v2/{parent=folders/*}/logs"
}
additional_bindings {
get: "/v2/{parent=billingAccounts/*}/logs"
}
additional_bindings { get: "/v2/{parent=projects/*}/logs" }
additional_bindings { get: "/v2/{parent=organizations/*}/logs" }
additional_bindings { get: "/v2/{parent=folders/*}/logs" }
additional_bindings { get: "/v2/{parent=billingAccounts/*}/logs" }
};
}
}
@ -201,9 +188,7 @@ message WriteLogEntriesRequest {
// Result returned from WriteLogEntries.
// empty
message WriteLogEntriesResponse {
}
message WriteLogEntriesResponse {}
// Error details for WriteLogEntries with partial success.
message WriteLogEntriesPartialErrors {

@ -30,7 +30,6 @@ option java_outer_classname = "LoggingConfigProto";
option java_package = "com.google.logging.v2";
option php_namespace = "Google\\Cloud\\Logging\\V2";
// Service for configuring sinks used to export log entries out of
// Logging.
service ConfigServiceV2 {
@ -38,18 +37,10 @@ service ConfigServiceV2 {
rpc ListSinks(ListSinksRequest) returns (ListSinksResponse) {
option (google.api.http) = {
get: "/v2/{parent=*/*}/sinks"
additional_bindings {
get: "/v2/{parent=projects/*}/sinks"
}
additional_bindings {
get: "/v2/{parent=organizations/*}/sinks"
}
additional_bindings {
get: "/v2/{parent=folders/*}/sinks"
}
additional_bindings {
get: "/v2/{parent=billingAccounts/*}/sinks"
}
additional_bindings { get: "/v2/{parent=projects/*}/sinks" }
additional_bindings { get: "/v2/{parent=organizations/*}/sinks" }
additional_bindings { get: "/v2/{parent=folders/*}/sinks" }
additional_bindings { get: "/v2/{parent=billingAccounts/*}/sinks" }
};
}
@ -57,18 +48,10 @@ service ConfigServiceV2 {
rpc GetSink(GetSinkRequest) returns (LogSink) {
option (google.api.http) = {
get: "/v2/{sink_name=*/*/sinks/*}"
additional_bindings {
get: "/v2/{sink_name=projects/*/sinks/*}"
}
additional_bindings {
get: "/v2/{sink_name=organizations/*/sinks/*}"
}
additional_bindings {
get: "/v2/{sink_name=folders/*/sinks/*}"
}
additional_bindings {
get: "/v2/{sink_name=billingAccounts/*/sinks/*}"
}
additional_bindings { get: "/v2/{sink_name=projects/*/sinks/*}" }
additional_bindings { get: "/v2/{sink_name=organizations/*/sinks/*}" }
additional_bindings { get: "/v2/{sink_name=folders/*/sinks/*}" }
additional_bindings { get: "/v2/{sink_name=billingAccounts/*/sinks/*}" }
};
}
@ -80,18 +63,12 @@ service ConfigServiceV2 {
option (google.api.http) = {
post: "/v2/{parent=*/*}/sinks"
body: "sink"
additional_bindings {
post: "/v2/{parent=projects/*}/sinks"
body: "sink"
}
additional_bindings { post: "/v2/{parent=projects/*}/sinks" body: "sink" }
additional_bindings {
post: "/v2/{parent=organizations/*}/sinks"
body: "sink"
}
additional_bindings {
post: "/v2/{parent=folders/*}/sinks"
body: "sink"
}
additional_bindings { post: "/v2/{parent=folders/*}/sinks" body: "sink" }
additional_bindings {
post: "/v2/{parent=billingAccounts/*}/sinks"
body: "sink"
@ -147,15 +124,9 @@ service ConfigServiceV2 {
rpc DeleteSink(DeleteSinkRequest) returns (google.protobuf.Empty) {
option (google.api.http) = {
delete: "/v2/{sink_name=*/*/sinks/*}"
additional_bindings {
delete: "/v2/{sink_name=projects/*/sinks/*}"
}
additional_bindings {
delete: "/v2/{sink_name=organizations/*/sinks/*}"
}
additional_bindings {
delete: "/v2/{sink_name=folders/*/sinks/*}"
}
additional_bindings { delete: "/v2/{sink_name=projects/*/sinks/*}" }
additional_bindings { delete: "/v2/{sink_name=organizations/*/sinks/*}" }
additional_bindings { delete: "/v2/{sink_name=folders/*/sinks/*}" }
additional_bindings {
delete: "/v2/{sink_name=billingAccounts/*/sinks/*}"
}
@ -166,18 +137,10 @@ service ConfigServiceV2 {
rpc ListExclusions(ListExclusionsRequest) returns (ListExclusionsResponse) {
option (google.api.http) = {
get: "/v2/{parent=*/*}/exclusions"
additional_bindings {
get: "/v2/{parent=projects/*}/exclusions"
}
additional_bindings {
get: "/v2/{parent=organizations/*}/exclusions"
}
additional_bindings {
get: "/v2/{parent=folders/*}/exclusions"
}
additional_bindings {
get: "/v2/{parent=billingAccounts/*}/exclusions"
}
additional_bindings { get: "/v2/{parent=projects/*}/exclusions" }
additional_bindings { get: "/v2/{parent=organizations/*}/exclusions" }
additional_bindings { get: "/v2/{parent=folders/*}/exclusions" }
additional_bindings { get: "/v2/{parent=billingAccounts/*}/exclusions" }
};
}
@ -185,18 +148,10 @@ service ConfigServiceV2 {
rpc GetExclusion(GetExclusionRequest) returns (LogExclusion) {
option (google.api.http) = {
get: "/v2/{name=*/*/exclusions/*}"
additional_bindings {
get: "/v2/{name=projects/*/exclusions/*}"
}
additional_bindings {
get: "/v2/{name=organizations/*/exclusions/*}"
}
additional_bindings {
get: "/v2/{name=folders/*/exclusions/*}"
}
additional_bindings {
get: "/v2/{name=billingAccounts/*/exclusions/*}"
}
additional_bindings { get: "/v2/{name=projects/*/exclusions/*}" }
additional_bindings { get: "/v2/{name=organizations/*/exclusions/*}" }
additional_bindings { get: "/v2/{name=folders/*/exclusions/*}" }
additional_bindings { get: "/v2/{name=billingAccounts/*/exclusions/*}" }
};
}
@ -254,15 +209,9 @@ service ConfigServiceV2 {
rpc DeleteExclusion(DeleteExclusionRequest) returns (google.protobuf.Empty) {
option (google.api.http) = {
delete: "/v2/{name=*/*/exclusions/*}"
additional_bindings {
delete: "/v2/{name=projects/*/exclusions/*}"
}
additional_bindings {
delete: "/v2/{name=organizations/*/exclusions/*}"
}
additional_bindings {
delete: "/v2/{name=folders/*/exclusions/*}"
}
additional_bindings { delete: "/v2/{name=projects/*/exclusions/*}" }
additional_bindings { delete: "/v2/{name=organizations/*/exclusions/*}" }
additional_bindings { delete: "/v2/{name=folders/*/exclusions/*}" }
additional_bindings {
delete: "/v2/{name=billingAccounts/*/exclusions/*}"
}
@ -431,7 +380,8 @@ message CreateSinkRequest {
// If this field is set to true, or if the sink is owned by a non-project
// resource such as an organization, then the value of `writer_identity` will
// be a unique service account used only for exports from the new sink. For
// more information, see `writer_identity` in [LogSink][google.logging.v2.LogSink].
// more information, see `writer_identity` in
// [LogSink][google.logging.v2.LogSink].
bool unique_writer_identity = 3;
}
@ -611,8 +561,9 @@ message UpdateExclusionRequest {
// Required. A nonempty list of fields to change in the existing exclusion.
// New values for the fields are taken from the corresponding fields in the
// [LogExclusion][google.logging.v2.LogExclusion] included in this request. Fields not mentioned in
// `update_mask` are not changed and are ignored in the request.
// [LogExclusion][google.logging.v2.LogExclusion] included in this request.
// Fields not mentioned in `update_mask` are not changed and are ignored in
// the request.
//
// For example, to change the filter and description of an exclusion,
// specify an `update_mask` of `"filter,description"`.

@ -32,7 +32,6 @@ option java_outer_classname = "LoggingMetricsProto";
option java_package = "com.google.logging.v2";
option php_namespace = "Google\\Cloud\\Logging\\V2";
// Service for configuring logs-based metrics.
service MetricsServiceV2 {
// Lists logs-based metrics.

@ -22,7 +22,6 @@ option java_outer_classname = "CodeProto";
option java_package = "com.google.rpc";
option objc_class_prefix = "RPC";
// The canonical error codes for Google APIs.
//
//

@ -24,7 +24,6 @@ option java_outer_classname = "ErrorDetailsProto";
option java_package = "com.google.rpc";
option objc_class_prefix = "RPC";
// Describes when the clients can retry a failed request. Clients could ignore
// the recommendation here or retry when this information is missing from error
// responses.
@ -154,7 +153,8 @@ message ResourceInfo {
// The name of the resource being accessed. For example, a shared calendar
// name: "example.com_4fghdhgsrgh@group.calendar.google.com", if the current
// error is [google.rpc.Code.PERMISSION_DENIED][google.rpc.Code.PERMISSION_DENIED].
// error is
// [google.rpc.Code.PERMISSION_DENIED][google.rpc.Code.PERMISSION_DENIED].
string resource_name = 2;
// The owner of the resource (optional).

@ -24,25 +24,25 @@ option java_outer_classname = "StatusProto";
option java_package = "com.google.rpc";
option objc_class_prefix = "RPC";
// The `Status` type defines a logical error model that is suitable for different
// programming environments, including REST APIs and RPC APIs. It is used by
// [gRPC](https://github.com/grpc). The error model is designed to be:
// The `Status` type defines a logical error model that is suitable for
// different programming environments, including REST APIs and RPC APIs. It is
// used by [gRPC](https://github.com/grpc). The error model is designed to be:
//
// - Simple to use and understand for most users
// - Flexible enough to meet unexpected needs
//
// # Overview
//
// The `Status` message contains three pieces of data: error code, error message,
// and error details. The error code should be an enum value of
// [google.rpc.Code][google.rpc.Code], but it may accept additional error codes if needed. The
// error message should be a developer-facing English message that helps
// developers *understand* and *resolve* the error. If a localized user-facing
// error message is needed, put the localized message in the error details or
// localize it in the client. The optional error details may contain arbitrary
// information about the error. There is a predefined set of error detail types
// in the package `google.rpc` that can be used for common error conditions.
// The `Status` message contains three pieces of data: error code, error
// message, and error details. The error code should be an enum value of
// [google.rpc.Code][google.rpc.Code], but it may accept additional error codes
// if needed. The error message should be a developer-facing English message
// that helps developers *understand* and *resolve* the error. If a localized
// user-facing error message is needed, put the localized message in the error
// details or localize it in the client. The optional error details may contain
// arbitrary information about the error. There is a predefined set of error
// detail types in the package `google.rpc` that can be used for common error
// conditions.
//
// # Language mapping
//
@ -78,12 +78,14 @@ option objc_class_prefix = "RPC";
// - Logging. If some API errors are stored in logs, the message `Status` could
// be used directly after any stripping needed for security/privacy reasons.
message Status {
// The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code].
// The status code, which should be an enum value of
// [google.rpc.Code][google.rpc.Code].
int32 code = 1;
// A developer-facing error message, which should be in English. Any
// user-facing error message should be localized and sent in the
// [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client.
// [google.rpc.Status.details][google.rpc.Status.details] field, or localized
// by the client.
string message = 2;
// A list of messages that carry the error details. There is a common set of

@ -24,7 +24,6 @@ option java_outer_classname = "ColorProto";
option java_package = "com.google.type";
option objc_class_prefix = "GTP";
// Represents a color in the RGBA color space. This representation is designed
// for simplicity of conversion to/from color representations in various
// languages over compactness; for example, the fields of this representation

@ -23,14 +23,14 @@ option java_outer_classname = "DateProto";
option java_package = "com.google.type";
option objc_class_prefix = "GTP";
// Represents a whole calendar date, e.g. date of birth. The time of day and
// time zone are either specified elsewhere or are not significant. The date
// is relative to the Proleptic Gregorian Calendar. The day may be 0 to
// represent a year and month where the day is not significant, e.g. credit card
// expiration date. The year may be 0 to represent a month and day independent
// of year, e.g. anniversary date. Related types are [google.type.TimeOfDay][google.type.TimeOfDay]
// and `google.protobuf.Timestamp`.
// of year, e.g. anniversary date. Related types are
// [google.type.TimeOfDay][google.type.TimeOfDay] and
// `google.protobuf.Timestamp`.
message Date {
// Year of date. Must be from 1 to 9999, or 0 if specifying a date without
// a year.

@ -22,7 +22,6 @@ option java_outer_classname = "DayOfWeekProto";
option java_package = "com.google.type";
option objc_class_prefix = "GTP";
// Represents a day of week.
enum DayOfWeek {
// The unspecified day-of-week.

@ -22,7 +22,6 @@ option java_outer_classname = "LatLngProto";
option java_package = "com.google.type";
option objc_class_prefix = "GTP";
// An object representing a latitude/longitude pair. This is expressed as a pair
// of doubles representing degrees latitude and degrees longitude. Unless
// specified otherwise, this must conform to the

@ -22,7 +22,6 @@ option java_outer_classname = "MoneyProto";
option java_package = "com.google.type";
option objc_class_prefix = "GTP";
// Represents an amount of money with its currency type.
message Money {
// The 3-letter currency code defined in ISO 4217.

@ -22,7 +22,6 @@ option java_outer_classname = "PostalAddressProto";
option java_package = "com.google.type";
option objc_class_prefix = "GTP";
// Represents a postal address, e.g. for postal delivery or payments addresses.
// Given a postal address, a postal service can deliver items to a premise, P.O.
// Box or similar.

@ -22,10 +22,10 @@ option java_outer_classname = "TimeOfDayProto";
option java_package = "com.google.type";
option objc_class_prefix = "GTP";
// Represents a time of day. The date and time zone are either not significant
// or are specified elsewhere. An API may chose to allow leap seconds. Related
// types are [google.type.Date][google.type.Date] and `google.protobuf.Timestamp`.
// types are [google.type.Date][google.type.Date] and
// `google.protobuf.Timestamp`.
message TimeOfDay {
// Hours of day in 24 hour format. Should be from 0 to 23. An API may choose
// to allow the value "24:00:00" for scenarios like business closing time.

@ -160,14 +160,15 @@ option java_package = "com.google.watcher.v1";
// not deliver any messages for the descendants until the parent
// has been recreated.
// The service that a client uses to connect to the watcher system.
// The errors returned by the service are in the canonical error space,
// see [google.rpc.Code][].
service Watcher {
// Start a streaming RPC to get watch information from the server.
rpc Watch(Request) returns (stream ChangeBatch) {
option (google.api.http) = { get: "/v1/watch" };
option (google.api.http) = {
get: "/v1/watch"
};
}
}
@ -267,15 +268,15 @@ message Change {
State state = 2;
// The actual change data. This field is present only when `state() == EXISTS`
// or `state() == ERROR`. Please see [google.protobuf.Any][google.protobuf.Any] about how to use
// the Any type.
// or `state() == ERROR`. Please see
// [google.protobuf.Any][google.protobuf.Any] about how to use the Any type.
google.protobuf.Any data = 6;
// If present, provides a compact representation of all the messages that have
// been received by the caller for the given entity, e.g., it could be a
// sequence number or a multi-part timestamp/version vector. This marker can
// be provided in the Request message, allowing the caller to resume the stream
// watching at a specific point without fetching the initial state.
// be provided in the Request message, allowing the caller to resume the
// stream watching at a specific point without fetching the initial state.
bytes resume_marker = 4;
// If true, this Change is followed by more Changes that are in the same group

Loading…
Cancel
Save