Skip to content

Commit a3f4360

Browse files
flemosrflemosr
authored
chore: Update dependencies (#18)
* envoy-types: update dependencies `tonic` v0.13 ; `tonic-build` v0.13 * envoy-types: update generated code * examples: update dependencies `tonic` v0.13 ; `tokio` v1.44
1 parent 1846b8c commit a3f4360

23 files changed

+196
-148
lines changed

‎envoy-types/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ futures-core = "0.3"
2020
prost = { version = "0.13", default-features = false, features = [
2121
"prost-derive",
2222
] }
23-
tonic = { version = ">=0.12.3, <0.13", default-features = false, features = [
23+
tonic = { version = "0.13", default-features = false, features = [
2424
"codegen",
2525
"transport",
2626
"prost",
2727
] }
2828

2929
[dev-dependencies]
3030
glob = "0.3"
31-
tonic-build = { version = ">=0.12.3, <0.13", default-features = false, features = [
31+
tonic-build = { version = "0.13", default-features = false, features = [
3232
"prost",
3333
"cleanup-markdown",
3434
] }

‎envoy-types/src/generated/envoy.service.accesslog.v3.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub mod access_log_service_client {
7272
}
7373
impl<T> AccessLogServiceClient<T>
7474
where
75-
T: tonic::client::GrpcService<tonic::body::BoxBody>,
75+
T: tonic::client::GrpcService<tonic::body::Body>,
7676
T::Error: Into<StdError>,
7777
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
7878
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -93,13 +93,13 @@ pub mod access_log_service_client {
9393
F: tonic::service::Interceptor,
9494
T::ResponseBody: Default,
9595
T: tonic::codegen::Service<
96-
http::Request<tonic::body::BoxBody>,
96+
http::Request<tonic::body::Body>,
9797
Response = http::Response<
98-
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
98+
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
9999
>,
100100
>,
101101
<T as tonic::codegen::Service<
102-
http::Request<tonic::body::BoxBody>,
102+
http::Request<tonic::body::Body>,
103103
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
104104
{
105105
AccessLogServiceClient::new(InterceptedService::new(inner, interceptor))
@@ -267,7 +267,7 @@ pub mod access_log_service_server {
267267
B: Body + std::marker::Send + 'static,
268268
B::Error: Into<StdError> + std::marker::Send + 'static,
269269
{
270-
type Response = http::Response<tonic::body::BoxBody>;
270+
type Response = http::Response<tonic::body::Body>;
271271
type Error = std::convert::Infallible;
272272
type Future = BoxFuture<Self::Response, Self::Error>;
273273
fn poll_ready(
@@ -329,7 +329,9 @@ pub mod access_log_service_server {
329329
}
330330
_ => {
331331
Box::pin(async move {
332-
let mut response = http::Response::new(empty_body());
332+
let mut response = http::Response::new(
333+
tonic::body::Body::default(),
334+
);
333335
let headers = response.headers_mut();
334336
headers
335337
.insert(

‎envoy-types/src/generated/envoy.service.auth.v3.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ pub mod authorization_client {
359359
}
360360
impl<T> AuthorizationClient<T>
361361
where
362-
T: tonic::client::GrpcService<tonic::body::BoxBody>,
362+
T: tonic::client::GrpcService<tonic::body::Body>,
363363
T::Error: Into<StdError>,
364364
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
365365
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -380,13 +380,13 @@ pub mod authorization_client {
380380
F: tonic::service::Interceptor,
381381
T::ResponseBody: Default,
382382
T: tonic::codegen::Service<
383-
http::Request<tonic::body::BoxBody>,
383+
http::Request<tonic::body::Body>,
384384
Response = http::Response<
385-
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
385+
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
386386
>,
387387
>,
388388
<T as tonic::codegen::Service<
389-
http::Request<tonic::body::BoxBody>,
389+
http::Request<tonic::body::Body>,
390390
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
391391
{
392392
AuthorizationClient::new(InterceptedService::new(inner, interceptor))
@@ -534,7 +534,7 @@ pub mod authorization_server {
534534
B: Body + std::marker::Send + 'static,
535535
B::Error: Into<StdError> + std::marker::Send + 'static,
536536
{
537-
type Response = http::Response<tonic::body::BoxBody>;
537+
type Response = http::Response<tonic::body::Body>;
538538
type Error = std::convert::Infallible;
539539
type Future = BoxFuture<Self::Response, Self::Error>;
540540
fn poll_ready(
@@ -591,7 +591,9 @@ pub mod authorization_server {
591591
}
592592
_ => {
593593
Box::pin(async move {
594-
let mut response = http::Response::new(empty_body());
594+
let mut response = http::Response::new(
595+
tonic::body::Body::default(),
596+
);
595597
let headers = response.headers_mut();
596598
headers
597599
.insert(

‎envoy-types/src/generated/envoy.service.cluster.v3.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub mod cluster_discovery_service_client {
2121
}
2222
impl<T> ClusterDiscoveryServiceClient<T>
2323
where
24-
T: tonic::client::GrpcService<tonic::body::BoxBody>,
24+
T: tonic::client::GrpcService<tonic::body::Body>,
2525
T::Error: Into<StdError>,
2626
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
2727
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -42,13 +42,13 @@ pub mod cluster_discovery_service_client {
4242
F: tonic::service::Interceptor,
4343
T::ResponseBody: Default,
4444
T: tonic::codegen::Service<
45-
http::Request<tonic::body::BoxBody>,
45+
http::Request<tonic::body::Body>,
4646
Response = http::Response<
47-
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
47+
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
4848
>,
4949
>,
5050
<T as tonic::codegen::Service<
51-
http::Request<tonic::body::BoxBody>,
51+
http::Request<tonic::body::Body>,
5252
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
5353
{
5454
ClusterDiscoveryServiceClient::new(
@@ -315,7 +315,7 @@ pub mod cluster_discovery_service_server {
315315
B: Body + std::marker::Send + 'static,
316316
B::Error: Into<StdError> + std::marker::Send + 'static,
317317
{
318-
type Response = http::Response<tonic::body::BoxBody>;
318+
type Response = http::Response<tonic::body::Body>;
319319
type Error = std::convert::Infallible;
320320
type Future = BoxFuture<Self::Response, Self::Error>;
321321
fn poll_ready(
@@ -490,7 +490,9 @@ pub mod cluster_discovery_service_server {
490490
}
491491
_ => {
492492
Box::pin(async move {
493-
let mut response = http::Response::new(empty_body());
493+
let mut response = http::Response::new(
494+
tonic::body::Body::default(),
495+
);
494496
let headers = response.headers_mut();
495497
headers
496498
.insert(

‎envoy-types/src/generated/envoy.service.discovery.v3.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ pub mod aggregated_discovery_service_client {
462462
}
463463
impl<T> AggregatedDiscoveryServiceClient<T>
464464
where
465-
T: tonic::client::GrpcService<tonic::body::BoxBody>,
465+
T: tonic::client::GrpcService<tonic::body::Body>,
466466
T::Error: Into<StdError>,
467467
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
468468
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -483,13 +483,13 @@ pub mod aggregated_discovery_service_client {
483483
F: tonic::service::Interceptor,
484484
T::ResponseBody: Default,
485485
T: tonic::codegen::Service<
486-
http::Request<tonic::body::BoxBody>,
486+
http::Request<tonic::body::Body>,
487487
Response = http::Response<
488-
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
488+
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
489489
>,
490490
>,
491491
<T as tonic::codegen::Service<
492-
http::Request<tonic::body::BoxBody>,
492+
http::Request<tonic::body::Body>,
493493
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
494494
{
495495
AggregatedDiscoveryServiceClient::new(
@@ -703,7 +703,7 @@ pub mod aggregated_discovery_service_server {
703703
B: Body + std::marker::Send + 'static,
704704
B::Error: Into<StdError> + std::marker::Send + 'static,
705705
{
706-
type Response = http::Response<tonic::body::BoxBody>;
706+
type Response = http::Response<tonic::body::Body>;
707707
type Error = std::convert::Infallible;
708708
type Future = BoxFuture<Self::Response, Self::Error>;
709709
fn poll_ready(
@@ -824,7 +824,9 @@ pub mod aggregated_discovery_service_server {
824824
}
825825
_ => {
826826
Box::pin(async move {
827-
let mut response = http::Response::new(empty_body());
827+
let mut response = http::Response::new(
828+
tonic::body::Body::default(),
829+
);
828830
let headers = response.headers_mut();
829831
headers
830832
.insert(

‎envoy-types/src/generated/envoy.service.endpoint.v3.rs‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub mod endpoint_discovery_service_client {
2020
}
2121
impl<T> EndpointDiscoveryServiceClient<T>
2222
where
23-
T: tonic::client::GrpcService<tonic::body::BoxBody>,
23+
T: tonic::client::GrpcService<tonic::body::Body>,
2424
T::Error: Into<StdError>,
2525
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
2626
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -41,13 +41,13 @@ pub mod endpoint_discovery_service_client {
4141
F: tonic::service::Interceptor,
4242
T::ResponseBody: Default,
4343
T: tonic::codegen::Service<
44-
http::Request<tonic::body::BoxBody>,
44+
http::Request<tonic::body::Body>,
4545
Response = http::Response<
46-
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
46+
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
4747
>,
4848
>,
4949
<T as tonic::codegen::Service<
50-
http::Request<tonic::body::BoxBody>,
50+
http::Request<tonic::body::Body>,
5151
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
5252
{
5353
EndpointDiscoveryServiceClient::new(
@@ -317,7 +317,7 @@ pub mod endpoint_discovery_service_server {
317317
B: Body + std::marker::Send + 'static,
318318
B::Error: Into<StdError> + std::marker::Send + 'static,
319319
{
320-
type Response = http::Response<tonic::body::BoxBody>;
320+
type Response = http::Response<tonic::body::Body>;
321321
type Error = std::convert::Infallible;
322322
type Future = BoxFuture<Self::Response, Self::Error>;
323323
fn poll_ready(
@@ -492,7 +492,9 @@ pub mod endpoint_discovery_service_server {
492492
}
493493
_ => {
494494
Box::pin(async move {
495-
let mut response = http::Response::new(empty_body());
495+
let mut response = http::Response::new(
496+
tonic::body::Body::default(),
497+
);
496498
let headers = response.headers_mut();
497499
headers
498500
.insert(
@@ -549,7 +551,7 @@ pub mod locality_endpoint_discovery_service_client {
549551
}
550552
impl<T> LocalityEndpointDiscoveryServiceClient<T>
551553
where
552-
T: tonic::client::GrpcService<tonic::body::BoxBody>,
554+
T: tonic::client::GrpcService<tonic::body::Body>,
553555
T::Error: Into<StdError>,
554556
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
555557
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -570,13 +572,13 @@ pub mod locality_endpoint_discovery_service_client {
570572
F: tonic::service::Interceptor,
571573
T::ResponseBody: Default,
572574
T: tonic::codegen::Service<
573-
http::Request<tonic::body::BoxBody>,
575+
http::Request<tonic::body::Body>,
574576
Response = http::Response<
575-
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
577+
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
576578
>,
577579
>,
578580
<T as tonic::codegen::Service<
579-
http::Request<tonic::body::BoxBody>,
581+
http::Request<tonic::body::Body>,
580582
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
581583
{
582584
LocalityEndpointDiscoveryServiceClient::new(
@@ -755,7 +757,7 @@ pub mod locality_endpoint_discovery_service_server {
755757
B: Body + std::marker::Send + 'static,
756758
B::Error: Into<StdError> + std::marker::Send + 'static,
757759
{
758-
type Response = http::Response<tonic::body::BoxBody>;
760+
type Response = http::Response<tonic::body::Body>;
759761
type Error = std::convert::Infallible;
760762
type Future = BoxFuture<Self::Response, Self::Error>;
761763
fn poll_ready(
@@ -827,7 +829,9 @@ pub mod locality_endpoint_discovery_service_server {
827829
}
828830
_ => {
829831
Box::pin(async move {
830-
let mut response = http::Response::new(empty_body());
832+
let mut response = http::Response::new(
833+
tonic::body::Body::default(),
834+
);
831835
let headers = response.headers_mut();
832836
headers
833837
.insert(

‎envoy-types/src/generated/envoy.service.event_reporting.v3.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub mod event_reporting_service_client {
5858
}
5959
impl<T> EventReportingServiceClient<T>
6060
where
61-
T: tonic::client::GrpcService<tonic::body::BoxBody>,
61+
T: tonic::client::GrpcService<tonic::body::Body>,
6262
T::Error: Into<StdError>,
6363
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
6464
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -79,13 +79,13 @@ pub mod event_reporting_service_client {
7979
F: tonic::service::Interceptor,
8080
T::ResponseBody: Default,
8181
T: tonic::codegen::Service<
82-
http::Request<tonic::body::BoxBody>,
82+
http::Request<tonic::body::Body>,
8383
Response = http::Response<
84-
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
84+
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
8585
>,
8686
>,
8787
<T as tonic::codegen::Service<
88-
http::Request<tonic::body::BoxBody>,
88+
http::Request<tonic::body::Body>,
8989
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
9090
{
9191
EventReportingServiceClient::new(InterceptedService::new(inner, interceptor))
@@ -256,7 +256,7 @@ pub mod event_reporting_service_server {
256256
B: Body + std::marker::Send + 'static,
257257
B::Error: Into<StdError> + std::marker::Send + 'static,
258258
{
259-
type Response = http::Response<tonic::body::BoxBody>;
259+
type Response = http::Response<tonic::body::Body>;
260260
type Error = std::convert::Infallible;
261261
type Future = BoxFuture<Self::Response, Self::Error>;
262262
fn poll_ready(
@@ -318,7 +318,9 @@ pub mod event_reporting_service_server {
318318
}
319319
_ => {
320320
Box::pin(async move {
321-
let mut response = http::Response::new(empty_body());
321+
let mut response = http::Response::new(
322+
tonic::body::Body::default(),
323+
);
322324
let headers = response.headers_mut();
323325
headers
324326
.insert(

‎envoy-types/src/generated/envoy.service.ext_proc.v3.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ pub mod external_processor_client {
523523
}
524524
impl<T> ExternalProcessorClient<T>
525525
where
526-
T: tonic::client::GrpcService<tonic::body::BoxBody>,
526+
T: tonic::client::GrpcService<tonic::body::Body>,
527527
T::Error: Into<StdError>,
528528
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
529529
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -544,13 +544,13 @@ pub mod external_processor_client {
544544
F: tonic::service::Interceptor,
545545
T::ResponseBody: Default,
546546
T: tonic::codegen::Service<
547-
http::Request<tonic::body::BoxBody>,
547+
http::Request<tonic::body::Body>,
548548
Response = http::Response<
549-
<T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
549+
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
550550
>,
551551
>,
552552
<T as tonic::codegen::Service<
553-
http::Request<tonic::body::BoxBody>,
553+
http::Request<tonic::body::Body>,
554554
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
555555
{
556556
ExternalProcessorClient::new(InterceptedService::new(inner, interceptor))
@@ -739,7 +739,7 @@ pub mod external_processor_server {
739739
B: Body + std::marker::Send + 'static,
740740
B::Error: Into<StdError> + std::marker::Send + 'static,
741741
{
742-
type Response = http::Response<tonic::body::BoxBody>;
742+
type Response = http::Response<tonic::body::Body>;
743743
type Error = std::convert::Infallible;
744744
type Future = BoxFuture<Self::Response, Self::Error>;
745745
fn poll_ready(
@@ -800,7 +800,9 @@ pub mod external_processor_server {
800800
}
801801
_ => {
802802
Box::pin(async move {
803-
let mut response = http::Response::new(empty_body());
803+
let mut response = http::Response::new(
804+
tonic::body::Body::default(),
805+
);
804806
let headers = response.headers_mut();
805807
headers
806808
.insert(

0 commit comments

Comments
 (0)