Merge pull request kmesh-net#48 from hzxuzhonghu/rvert-hyper-name

keep hyper_util, so we donot need to change the code once we depend o…

Author: kmesh-bot

Cargo.toml

@@ -25,7 +25,6 @@ hyper-util   = { git = "https://github.com/awgn/hyper-util.git", branch = "event
 
 [workspace.dependencies]
 envoy-data-plane-api = { path = "envoy-data-plane-api" }
-orion-hyper-util     = { package = "hyper-util", version = "0.1.15", features = ["full"] }
 orion-configuration  = { path = "orion-configuration" }
 orion-data-plane-api = { path = "orion-data-plane-api" }
 orion-error          = { path = "orion-error" }
@@ -61,6 +60,7 @@ tracing             = "0.1"
 tracing-subscriber  = "0.3"
 tracing-test        = { version = "0.2", features = ["no-env-filter"] }
 url                 = "2"
+hyper-util          = { version = "0.1.15",   features = ["full"] }
 
 
 [profile.release]

orion-data-plane-api/Cargo.toml

@@ -20,4 +20,4 @@ tower.workspace                = true
 tracing.workspace              = true
 
 [dev-dependencies]
-orion-hyper-util.workspace     = true
+hyper-util.workspace     = true

orion-data-plane-api/tests/xds.rs

@@ -7,6 +7,7 @@ use std::{
     time::Duration,
 };
 
+use hyper_util::rt::tokio::TokioIo;
 use orion_data_plane_api::{
     envoy_data_plane_api::{
         envoy::{
@@ -28,7 +29,6 @@ use orion_data_plane_api::{
     },
     xds::client::DiscoveryClientBuilder,
 };
-use orion_hyper_util::rt::tokio::TokioIo;
 use tonic::transport::Server;
 
 use orion_data_plane_api::xds::{

orion-lib/Cargo.toml

@@ -18,7 +18,7 @@ http-body.workspace           = true
 http-body-util.workspace      = true
 hyper                         = { version = "1", features = ["full"] }
 hyper-rustls                  = { version = "0.27.1", features = ["default", "http2"] }
-orion-hyper-util.workspace    = true
+hyper-util.workspace    = true
 orion-configuration.workspace = true
 orion-error.workspace         = true
 orion-xds.workspace           = true

orion-lib/src/clusters/retry_policy.rs

@@ -85,7 +85,7 @@ impl<'a, B: Body> FailureKind<'a, B> {
             }
         }
 
-        if let Some(h_err) = err.downcast_ref::<orion_hyper_util::client::legacy::Error>() {
+        if let Some(h_err) = err.downcast_ref::<hyper_util::client::legacy::Error>() {
             if let Some(source) = h_err.source() {
                 return Self::try_infer_from_error(source);
             }

orion-lib/src/listeners/filterchain.rs

@@ -33,14 +33,14 @@ use compact_str::CompactString;
 use futures::TryFutureExt;
 use http::Request;
 use hyper::service::Service;
+use hyper_util::{rt::TokioIo, server::conn::auto::Builder as HyperServerBuilder};
 use orion_configuration::config::{
     listener::{FilterChain as FilterChainConfig, MainFilter},
     network_filters::{
         http_connection_manager::CodecType,
         network_rbac::{NetworkContext, NetworkRbac},
     },
 };
-use orion_hyper_util::{rt::TokioIo, server::conn::auto::Builder as HyperServerBuilder};
 use rustls::{server::Acceptor, ServerConfig};
 use std::{net::SocketAddr, sync::Arc};
 use tokio::net::TcpStream;

orion-lib/src/listeners/http_connection_manager/upgrade.rs

@@ -8,11 +8,11 @@ use crate::{
 };
 use http::{uri::Parts as UriParts, StatusCode, Uri, Version};
 use hyper::{body::Incoming, Request, Response};
+use hyper_util::rt::TokioIo;
 use orion_configuration::config::network_filters::http_connection_manager::route::{
     RouteMatchResult, UpgradeAction, UpgradeActionType,
 };
 use orion_error::Context;
-use orion_hyper_util::rt::TokioIo;
 use std::net::SocketAddr;
 use tokio::io::copy_bidirectional;
 use tracing::{debug, error};

orion-lib/src/transport/connector.rs

@@ -28,7 +28,7 @@ use std::{
 
 use http::uri::Authority;
 use hyper::Uri;
-use orion_hyper_util::rt::TokioIo;
+use hyper_util::rt::TokioIo;
 use pingora_timeout::fast_timeout::fast_timeout;
 use tokio::net::{TcpSocket, TcpStream};
 use tower::Service;

orion-lib/src/transport/http_channel.rs

@@ -41,13 +41,13 @@ use http::{
 use http_body_util::BodyExt;
 use hyper::{body::Incoming, Request, Uri};
 use hyper_rustls::{FixedServerNameResolver, HttpsConnector};
+use hyper_util::client::legacy::connect::Connect;
+use hyper_util::client::legacy::{Builder, Client};
+use hyper_util::rt::tokio::TokioTimer;
 use orion_configuration::config::{
     cluster::http_protocol_options::{Codec, HttpProtocolOptions},
     network_filters::http_connection_manager::RetryPolicy,
 };
-use orion_hyper_util::client::legacy::connect::Connect;
-use orion_hyper_util::client::legacy::{Builder, Client};
-use orion_hyper_util::rt::tokio::TokioTimer;
 use pingora_timeout::fast_timeout::fast_timeout;
 use pretty_duration::pretty_duration;
 use rustls::ClientConfig;