feat(volo): add feature vendored for native-tls

Add feature `vendored` that enables `tokio-native-tls/vendored`, and use it in CI to avoid installing additional packages.
cloudwego · Dec 28, 2023 · 2876dfc · 2876dfc
1 parent 89e33b4
commit 2876dfc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -34,6 +34,7 @@ jobs:
     - name: Run tests
       run: |
         cargo check --features multiplex
+        cargo check --features rustls,native-tls,vendored
         cargo test
 
   test-linux-aarch64:
@@ -48,6 +49,7 @@ jobs:
       - name: Run tests
         run: |
           cargo check --features multiplex
+          cargo check --features rustls,native-tls,vendored
           cargo test
 
   test-macos:
@@ -62,6 +64,7 @@ jobs:
       - name: Run tests
         run: |
           cargo check --features multiplex
+          cargo check --features rustls,native-tls,vendored
           cargo test
 
   test-windows:
@@ -76,6 +79,7 @@ jobs:
       - name: Run tests
         run: |
           cargo check --features multiplex
+          cargo check --features rustls,native-tls,vendored
           cargo test
 
   lint:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/volo/Cargo.toml b/volo/Cargo.toml
@@ -58,5 +58,6 @@ tokio-native-tls = { workspace = true, optional = true }
 [features]
 default = []
 
+vendored = ["tokio-native-tls/vendored"]
 rustls = ["tokio-rustls", "librustls"]
 native-tls = ["tokio-native-tls"]
diff --git a/volo/src/net/dial.rs b/volo/src/net/dial.rs
@@ -204,8 +204,8 @@ cfg_rustls_or_native_tls! {
                     match &self.tls_config.connector {
                         #[cfg(feature = "rustls")]
                         TlsConnector::Rustls(connector) => {
-                            let server_name = librustls::ServerName::try_from(&self.tls_config.server_name[..])
-                                .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
+                            let server_name = librustls::pki_types::ServerName::try_from(&self.tls_config.server_name[..])
+                                .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?.to_owned();
                             connector
                                 .connect(server_name, tcp)
                                 .await