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.

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

Upgrade tonic and prost #221

Merged
merged 1 commit into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions artifact-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ documentation = "https://docs.rs/google-cloud-artifact-registry/latest/google_cl
[dependencies]
google-cloud-token = { version = "0.1.2", path = "../foundation/token" }
google-cloud-auth = { optional = true, version = "0.13", path="../foundation/auth", default-features=false }
google-cloud-googleapis = { version="0.11.1", path = "../googleapis", features=["artifact-registry"]}
google-cloud-googleapis = { version="0.12.0", path = "../googleapis", features=["artifact-registry"]}
google-cloud-gax = { version = "0.16.0", path = "../foundation/gax"}
google-cloud-longrunning = { version = "0.16.0", path = "../foundation/longrunning" }
tracing = "0.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
prost-types = "0.11"
prost-types = "0.12"

[dev-dependencies]
tokio = { version="1.32", features=["rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion bigquery/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ documentation = "https://docs.rs/google-cloud-bigquery/latest/google_cloud_bigqu
[dependencies]
async-trait = "0.1"
google-cloud-token = { version = "0.1.1", path = "../foundation/token" }
google-cloud-googleapis = { version="0.11.0", path = "../googleapis", features=["bigquery"]}
google-cloud-googleapis = { version="0.12.0", path = "../googleapis", features=["bigquery"]}
google-cloud-gax = { version = "0.16.0", path = "../foundation/gax"}
thiserror = "1.0"
tracing = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion foundation/gax/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description = "Google Cloud Platform gRPC retry library."
[dependencies]
tracing = "0.1"
tokio = { version = "1.32", features = ["macros"] }
tonic = { version = "0.9", features = ["prost", "tls-webpki-roots"] }
tonic = { version = "0.10", features = ["prost", "tls-webpki-roots"] }
thiserror = "1.0"
tower = { version = "0.4", features = ["filter"] }
http = "0.2"
Expand Down
6 changes: 3 additions & 3 deletions foundation/longrunning/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ readme = "README.md"
description = "Google Cloud Platform longrunning library."

[dependencies]
google-cloud-googleapis = { version = "0.11.0", path = "../../googleapis" }
google-cloud-googleapis = { version = "0.12.0", path = "../../googleapis" }
google-cloud-gax = { version = "0.16.0", path = "../gax" }
tonic = { version = "0.9", features = ["tls", "prost"] }
prost = "0.11"
tonic = { version = "0.10", features = ["tls", "prost"] }
prost = "0.12"
12 changes: 6 additions & 6 deletions googleapis/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "google-cloud-googleapis"
version = "0.11.1"
version = "0.12.0"
authors = ["yoshidan <[email protected]>"]
edition = "2021"
repository = "https://github.com/yoshidan/google-cloud-rust/tree/main/googleapis"
Expand All @@ -12,13 +12,13 @@ description = "Google Cloud Platform rust client."
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
tonic = { version = "0.9", features = ["tls", "prost", "gzip"] }
prost = "0.11"
prost-types = "0.11"
tonic = { version = "0.10", features = ["tls", "prost", "gzip"] }
prost = "0.12"
prost-types = "0.12"

[build-dependencies]
tonic-build = { version = "0.9", optional = true }
prost-build = { version = "0.11", optional = true }
tonic-build = { version = "0.10", optional = true }
prost-build = { version = "0.12", optional = true }

[features]
spanner = []
Expand Down
20 changes: 10 additions & 10 deletions googleapis/src/bytes/google.api.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// Defines the HTTP configuration for an API service. It contains a list of
/// \[HttpRule][google.api.HttpRule\], each specifying the mapping of an RPC method
/// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
/// to one or more HTTP REST API methods.
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand All @@ -26,7 +26,7 @@ pub struct Http {
/// APIs](<https://github.com/googleapis/googleapis>),
/// [Cloud Endpoints](<https://cloud.google.com/endpoints>), [gRPC
/// Gateway](<https://github.com/grpc-ecosystem/grpc-gateway>),
/// and \[Envoy\](<https://github.com/envoyproxy/envoy>) proxy support this feature
/// and [Envoy](<https://github.com/envoyproxy/envoy>) proxy support this feature
/// and use it for large scale production services.
///
/// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies
Expand Down Expand Up @@ -187,26 +187,26 @@ pub struct Http {
/// 1. Leaf request fields (recursive expansion nested messages in the request
/// message) are classified into three categories:
/// - Fields referred by the path template. They are passed via the URL path.
/// - Fields referred by the \[HttpRule.body][google.api.HttpRule.body\]. They
/// - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They
/// are passed via the HTTP
/// request body.
/// - All other fields are passed via the URL query parameters, and the
/// parameter name is the field path in the request message. A repeated
/// field can be represented as multiple query parameters under the same
/// name.
/// 2. If \[HttpRule.body][google.api.HttpRule.body\] is "*", there is no URL
/// 2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL
/// query parameter, all fields
/// are passed via URL path and HTTP request body.
/// 3. If \[HttpRule.body][google.api.HttpRule.body\] is omitted, there is no HTTP
/// 3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP
/// request body, all
/// fields are passed via URL path and URL query parameters.
///
/// ### Path template syntax
///
/// Template = "/" Segments [ Verb ] ;
/// Template = "/" Segments \[ Verb \] ;
/// Segments = Segment { "/" Segment } ;
/// Segment = "*" | "**" | LITERAL | Variable ;
/// Variable = "{" FieldPath [ "=" Segments ] "}" ;
/// Variable = "{" FieldPath \[ "=" Segments \] "}" ;
/// FieldPath = IDENT { "." IDENT } ;
/// Verb = ":" LITERAL ;
///
Expand Down Expand Up @@ -295,7 +295,7 @@ pub struct Http {
pub struct HttpRule {
/// Selects a method to which this rule applies.
///
/// Refer to \[selector][google.api.DocumentationRule.selector\] for syntax
/// Refer to [selector][google.api.DocumentationRule.selector] for syntax
/// details.
#[prost(string, tag = "1")]
pub selector: ::prost::alloc::string::String,
Expand Down Expand Up @@ -713,7 +713,7 @@ pub mod method_settings {
/// long-running operation pattern.
/// All default values below are from those used in the client library
/// generators (e.g.
/// \[Java\](<https://github.com/googleapis/gapic-generator-java/blob/04c2faa191a9b5a10b92392fe8482279c4404803/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java>)).
/// [Java](<https://github.com/googleapis/gapic-generator-java/blob/04c2faa191a9b5a10b92392fe8482279c4404803/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java>)).
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct LongRunning {
Expand Down Expand Up @@ -961,7 +961,7 @@ pub struct ResourceDescriptor {
/// Example: `storage.googleapis.com/Bucket`
///
/// The value of the resource_type_kind must follow the regular expression
/// /\[A-Za-z][a-zA-Z0-9\]+/. It should start with an upper case character and
/// /[A-Za-z][a-zA-Z0-9]+/. It should start with an upper case character and
/// should use PascalCase (UpperCamelCase). The maximum number of
/// characters allowed for the `resource_type_kind` is 100.
#[prost(string, tag = "1")]
Expand Down
6 changes: 3 additions & 3 deletions googleapis/src/bytes/google.cloud.bigquery.storage.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ pub struct TableFieldSchema {
/// Values of this NUMERIC or BIGNUMERIC field must be in this range when:
///
/// * Precision (P) and scale (S) are specified:
/// [-10^(P-S) + 10^(-S), 10^(P-S) - 10^(-S)]
/// \[-10^(P-S) + 10^(-S), 10^(P-S) - 10^(-S)\]
/// * Precision (P) is specified but not scale (and thus scale is
/// interpreted to be equal to zero):
/// [-10^P + 1, 10^P - 1].
/// \[-10^P + 1, 10^P - 1\].
///
/// Acceptable values for precision and scale if both are specified:
///
Expand All @@ -227,7 +227,7 @@ pub struct TableFieldSchema {
/// Optional. See documentation for precision.
#[prost(int64, tag = "9")]
pub scale: i64,
/// Optional. A SQL expression to specify the [default value]
/// Optional. A SQL expression to specify the \[default value\]
/// (<https://cloud.google.com/bigquery/docs/default-values>) for this field.
#[prost(string, tag = "10")]
pub default_value_expression: ::prost::alloc::string::String,
Expand Down
4 changes: 2 additions & 2 deletions googleapis/src/bytes/google.devtools.artifactregistry.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1322,8 +1322,8 @@ pub struct Version {
/// Output only. Repository-specific Metadata stored against this version.
/// The fields returned are defined by the underlying repository-specific
/// resource. Currently, the resources could be:
/// \[DockerImage][google.devtools.artifactregistry.v1.DockerImage\]
/// \[MavenArtifact][google.devtools.artifactregistry.v1.MavenArtifact\]
/// [DockerImage][google.devtools.artifactregistry.v1.DockerImage]
/// [MavenArtifact][google.devtools.artifactregistry.v1.MavenArtifact]
#[prost(message, optional, tag = "8")]
pub metadata: ::core::option::Option<::prost_types::Struct>,
}
Expand Down
2 changes: 1 addition & 1 deletion googleapis/src/bytes/google.iam.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ pub struct AuditLogConfig {
/// Specifies the identities that do not cause logging for this type of
/// permission.
/// Follows the same format of
/// \[Binding.members][google.iam.v1.Binding.members\].
/// [Binding.members][google.iam.v1.Binding.members].
#[prost(string, repeated, tag = "2")]
pub exempted_members: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
}
Expand Down
12 changes: 6 additions & 6 deletions googleapis/src/bytes/google.longrunning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ pub mod operation {
Response(::prost_types::Any),
}
}
/// The request message for \[Operations.GetOperation][google.longrunning.Operations.GetOperation\].
/// The request message for [Operations.GetOperation][google.longrunning.Operations.GetOperation].
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct GetOperationRequest {
/// The name of the operation resource.
#[prost(string, tag = "1")]
pub name: ::prost::alloc::string::String,
}
/// The request message for \[Operations.ListOperations][google.longrunning.Operations.ListOperations\].
/// The request message for [Operations.ListOperations][google.longrunning.Operations.ListOperations].
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ListOperationsRequest {
Expand All @@ -73,7 +73,7 @@ pub struct ListOperationsRequest {
#[prost(string, tag = "3")]
pub page_token: ::prost::alloc::string::String,
}
/// The response message for \[Operations.ListOperations][google.longrunning.Operations.ListOperations\].
/// The response message for [Operations.ListOperations][google.longrunning.Operations.ListOperations].
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ListOperationsResponse {
Expand All @@ -84,23 +84,23 @@ pub struct ListOperationsResponse {
#[prost(string, tag = "2")]
pub next_page_token: ::prost::alloc::string::String,
}
/// The request message for \[Operations.CancelOperation][google.longrunning.Operations.CancelOperation\].
/// The request message for [Operations.CancelOperation][google.longrunning.Operations.CancelOperation].
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CancelOperationRequest {
/// The name of the operation resource to be cancelled.
#[prost(string, tag = "1")]
pub name: ::prost::alloc::string::String,
}
/// The request message for \[Operations.DeleteOperation][google.longrunning.Operations.DeleteOperation\].
/// The request message for [Operations.DeleteOperation][google.longrunning.Operations.DeleteOperation].
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct DeleteOperationRequest {
/// The name of the operation resource to be deleted.
#[prost(string, tag = "1")]
pub name: ::prost::alloc::string::String,
}
/// The request message for \[Operations.WaitOperation][google.longrunning.Operations.WaitOperation\].
/// The request message for [Operations.WaitOperation][google.longrunning.Operations.WaitOperation].
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct WaitOperationRequest {
Expand Down
12 changes: 6 additions & 6 deletions googleapis/src/bytes/google.pubsub.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ pub struct Topic {
/// must not start with `"goog"`.
#[prost(string, tag = "1")]
pub name: ::prost::alloc::string::String,
/// See [Creating and managing labels]
/// See \[Creating and managing labels\]
/// (<https://cloud.google.com/pubsub/docs/labels>).
#[prost(map = "string, string", tag = "2")]
pub labels: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>,
Expand Down Expand Up @@ -650,7 +650,7 @@ pub struct Topic {
/// Note that client libraries represent this object differently
/// depending on the language. See the corresponding [client library
/// documentation](<https://cloud.google.com/pubsub/docs/reference/libraries>) for
/// more information. See [quotas and limits]
/// more information. See \[quotas and limits\]
/// (<https://cloud.google.com/pubsub/quotas>) for more information about message
/// limits.
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down Expand Up @@ -901,7 +901,7 @@ pub struct Subscription {
/// Indicates whether to retain acknowledged messages. If true, then
/// messages are not expunged from the subscription's backlog, even if they are
/// acknowledged, until they fall out of the `message_retention_duration`
/// window. This must be true if you would like to [`Seek` to a timestamp]
/// window. This must be true if you would like to \[`Seek` to a timestamp\]
/// (<https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time>) in
/// the past to replay previously-acknowledged messages.
#[prost(bool, tag = "7")]
Expand Down Expand Up @@ -1259,7 +1259,7 @@ pub mod big_query_config {
/// - Pub/Sub SA has not been granted the [appropriate BigQuery IAM
/// permissions](<https://cloud.google.com/pubsub/docs/create-subscription#assign_bigquery_service_account>)
/// - bigquery.googleapis.com API is not enabled for the project
/// (\[instructions\](<https://cloud.google.com/service-usage/docs/enable-disable>))
/// ([instructions](<https://cloud.google.com/service-usage/docs/enable-disable>))
PermissionDenied = 2,
/// Cannot write to the BigQuery table because it does not exist.
NotFound = 3,
Expand Down Expand Up @@ -1767,7 +1767,7 @@ pub struct UpdateSnapshotRequest {
pub update_mask: ::core::option::Option<::prost_types::FieldMask>,
}
/// A snapshot resource. Snapshots are used in
/// \[Seek\](<https://cloud.google.com/pubsub/docs/replay-overview>)
/// [Seek](<https://cloud.google.com/pubsub/docs/replay-overview>)
/// operations, which allow you to manage message acknowledgments in bulk. That
/// is, you can set the acknowledgment state of messages in an existing
/// subscription to the state captured by a snapshot.
Expand All @@ -1792,7 +1792,7 @@ pub struct Snapshot {
/// snapshot that would expire in less than 1 hour after creation.
#[prost(message, optional, tag = "3")]
pub expire_time: ::core::option::Option<::prost_types::Timestamp>,
/// See [Creating and managing labels]
/// See \[Creating and managing labels\]
/// (<https://cloud.google.com/pubsub/docs/labels>).
#[prost(map = "string, string", tag = "4")]
pub labels: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>,
Expand Down
2 changes: 1 addition & 1 deletion googleapis/src/bytes/google.r#type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub struct Expr {
/// * A year and month value, with a zero day, such as a credit card expiration
/// date
///
/// Related types are \[google.type.TimeOfDay][google.type.TimeOfDay\] and
/// Related types are [google.type.TimeOfDay][google.type.TimeOfDay] and
/// `google.protobuf.Timestamp`.
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand Down
6 changes: 3 additions & 3 deletions googleapis/src/bytes/google.rpc.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// 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>). Each `Status` message contains
/// used by [gRPC](<https://github.com/grpc>). Each `Status` message contains
/// three pieces of data: error code, error message, and error details.
///
/// You can find out more about this error model and how to work with it in the
Expand All @@ -9,12 +9,12 @@
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Status {
/// The status code, which should be an enum value of
/// \[google.rpc.Code][google.rpc.Code\].
/// [google.rpc.Code][google.rpc.Code].
#[prost(int32, tag = "1")]
pub code: i32,
/// 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
/// [google.rpc.Status.details][google.rpc.Status.details] field, or localized
/// by the client.
#[prost(string, tag = "2")]
pub message: ::prost::alloc::string::String,
Expand Down
Loading
Loading