Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Logging: copy lintified proto files (via synth). #7450

Merged
merged 1 commit into from
Feb 26, 2019
Merged

Logging: copy lintified proto files (via synth). #7450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion logging/google/cloud/logging_v2/proto/log_entry.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
39 changes: 12 additions & 27 deletions logging/google/cloud/logging_v2/proto/logging.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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/*}" }
};
}

Expand All @@ -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: "*"
Expand All @@ -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"
};
Expand All @@ -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" }
};
}
}
Expand Down Expand Up @@ -201,9 +188,7 @@ message WriteLogEntriesRequest {

// Result returned from WriteLogEntries.
// empty
message WriteLogEntriesResponse {

}
message WriteLogEntriesResponse {}

// Error details for WriteLogEntries with partial success.
message WriteLogEntriesPartialErrors {
Expand Down
107 changes: 29 additions & 78 deletions logging/google/cloud/logging_v2/proto/logging_config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,45 +30,28 @@ 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 {
// Lists sinks.
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" }
};
}

// Gets a sink.
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/*}" }
};
}

Expand All @@ -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"
Expand Down Expand Up @@ -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/*}"
}
Expand All @@ -166,37 +137,21 @@ 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" }
};
}

// Gets the description of an exclusion.
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/*}" }
};
}

Expand Down Expand Up @@ -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/*}"
}
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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"`.
Expand Down
1 change: 0 additions & 1 deletion logging/google/cloud/logging_v2/proto/logging_metrics.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions logging/synth.metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"updateTime": "2019-01-30T13:24:12.640581Z",
"updateTime": "2019-02-26T13:20:43.903128Z",
"sources": [
{
"generator": {
"name": "artman",
"version": "0.16.7",
"dockerImage": "googleapis/artman@sha256:d6c8ced606eb49973ca95d2af7c55a681acc042db0f87d135968349e7bf6dd80"
"version": "0.16.14",
"dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "f0195b40fd5f5f412e6819ac01df08cedb8e5fd7",
"internalRef": "231440809"
"sha": "29f098cb03a9983cc9cb15993de5da64419046f2",
"internalRef": "235621085"
}
},
{
Expand Down