Merge pull request #94 from taosdata/enhance/taos-ws-with-rustls

enh(ws): add features `rustls`/`native-tls` for ssl libs
taosdata · Nov 22, 2022 · 0c39c7d · 0c39c7d
2 parents eab128e + 8e01a72
commit 0c39c7d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/taos-ws-sys/Cargo.toml b/taos-ws-sys/Cargo.toml
@@ -26,3 +26,5 @@ pretty_env_logger = "0.4.0"
 
 [features]
 native-tls-vendored = ["taos-ws/native-tls-vendored"]
+native-tls = ["taos-ws/native-tls"]
+rustls = ["taos-ws/rustls"]
diff --git a/taos-ws/Cargo.toml b/taos-ws/Cargo.toml
@@ -27,12 +27,19 @@ serde_with = "2.0.0"
 taos-query = { path = "../taos-query", version = "0.3.5" }
 thiserror = "1"
 tokio = { version = "1", features = ["full"] }
-tokio-tungstenite = { version = "0.17", features = ["native-tls"] }
+tokio-tungstenite = { version = "0.17" }
+
 [dev-dependencies]
 pretty_env_logger = "0.4.0"
 
+[package.metadata.docs.rs]
+features = ["native-tls", "__rustls-tls"]
+
 [features]
 default = ["tmq"]
-native-tls-vendored = ["tokio-tungstenite/native-tls-vendored"]
+
+rustls = ["tokio-tungstenite/__rustls-tls"]
+native-tls = ["tokio-tungstenite/native-tls"]
+native-tls-vendored = ["tokio-tungstenite/native-tls-vendored","native-tls"]
 sync = []
 tmq = []
diff --git a/taos/Cargo.toml b/taos/Cargo.toml
@@ -33,8 +33,10 @@ serde_json = "1"
 tokio = { version = "1", features = ["full"] }
 
 [features]
-default = ["ws", "native", "r2d2"]
+default = ["ws-rustls", "native", "r2d2"]
 ws = ["taos-ws"]
 optin = ["taos-optin"]
 native = ["taos-sys"]
 r2d2 = ["taos-query/r2d2"]
+ws-native-tls = ["taos-ws", "taos-ws/native-tls-vendored"]
+ws-rustls = ["taos-ws", "taos-ws/rustls"]