Skip to content

Commit 502491a

Browse files
authored
fix(transport): Remove with_rustls for tls config (#188)
1 parent 3eb76ab commit 502491a

File tree

13 files changed

+17
-9
lines changed

13 files changed

+17
-9
lines changed

examples/src/gcp/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
2727

2828
let certs = tokio::fs::read("tonic-examples/data/gcp/roots.pem").await?;
2929

30-
let tls_config = ClientTlsConfig::with_rustls()
30+
let tls_config = ClientTlsConfig::new()
3131
.ca_certificate(Certificate::from_pem(certs.as_slice()))
3232
.domain_name("pubsub.googleapis.com");
3333

examples/src/tls/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
1010
let pem = tokio::fs::read("tonic-examples/data/tls/ca.pem").await?;
1111
let ca = Certificate::from_pem(pem);
1212

13-
let tls = ClientTlsConfig::with_rustls()
13+
let tls = ClientTlsConfig::new()
1414
.ca_certificate(ca)
1515
.domain_name("example.com");
1616

examples/src/tls/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
6060
let server = EchoServer::default();
6161

6262
Server::builder()
63-
.tls_config(ServerTlsConfig::with_rustls().identity(identity))
63+
.tls_config(ServerTlsConfig::new().identity(identity))
6464
.add_service(pb::echo_server::EchoServer::new(server))
6565
.serve(addr)
6666
.await?;

examples/src/tls_client_auth/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
1313
let client_key = tokio::fs::read("tonic-examples/data/tls/client1.key").await?;
1414
let client_identity = Identity::from_pem(client_cert, client_key);
1515

16-
let tls = ClientTlsConfig::with_rustls()
16+
let tls = ClientTlsConfig::new()
1717
.domain_name("localhost")
1818
.ca_certificate(server_root_ca_cert)
1919
.identity(client_identity);

examples/src/tls_client_auth/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3737
let addr = "[::1]:50051".parse().unwrap();
3838
let server = EchoServer::default();
3939

40-
let tls = ServerTlsConfig::with_rustls()
40+
let tls = ServerTlsConfig::new()
4141
.identity(server_identity)
4242
.client_ca_root(client_ca_cert);
4343

interop/src/bin/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
3535
let pem = tokio::fs::read("interop/data/ca.pem").await?;
3636
let ca = Certificate::from_pem(pem);
3737
endpoint = endpoint.tls_config(
38-
ClientTlsConfig::with_rustls()
38+
ClientTlsConfig::new()
3939
.ca_certificate(ca)
4040
.domain_name("foo.test.google.fr"),
4141
);

interop/src/bin/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
5353
let key = tokio::fs::read("interop/data/server1.key").await?;
5454
let identity = Identity::from_pem(cert, key);
5555

56-
builder = builder.tls_config(ServerTlsConfig::with_rustls().identity(identity));
56+
builder = builder.tls_config(ServerTlsConfig::new().identity(identity));
5757
}
5858

5959
let test_service = server::TestServiceServer::new(server::TestService::default());

tonic/src/transport/channel/endpoint.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ impl Endpoint {
167167

168168
/// Configures TLS for the endpoint.
169169
#[cfg(feature = "tls")]
170+
#[cfg_attr(docsrs, doc(cfg(feature = "tls")))]
170171
pub fn tls_config(self, tls_config: ClientTlsConfig) -> Self {
171172
Endpoint {
172173
tls: Some(tls_config.tls_connector(self.uri.clone()).unwrap()),

tonic/src/transport/channel/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
mod endpoint;
44
#[cfg(feature = "tls")]
5+
#[cfg_attr(docsrs, doc(cfg(feature = "tls")))]
56
mod tls;
67

78
pub use endpoint::Endpoint;

tonic/src/transport/channel/tls.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use std::fmt;
77

88
/// Configures TLS settings for endpoints.
99
#[cfg(feature = "tls")]
10+
#[cfg_attr(docsrs, doc(cfg(feature = "tls")))]
1011
#[derive(Clone)]
1112
pub struct ClientTlsConfig {
1213
domain: Option<String>,
@@ -29,7 +30,7 @@ impl fmt::Debug for ClientTlsConfig {
2930
#[cfg(feature = "tls")]
3031
impl ClientTlsConfig {
3132
/// Creates a new `ClientTlsConfig` using Rustls.
32-
pub fn with_rustls() -> Self {
33+
pub fn new() -> Self {
3334
ClientTlsConfig {
3435
domain: None,
3536
cert: None,

0 commit comments

Comments
 (0)