Merge pull request #226 from influxdata/dependabot/cargo/rustls-pemfile-2.0

chore(deps): update rustls-pemfile requirement from 1.0 to 2.0

Author: kodiakhq[bot]

Cargo.toml

@@ -49,7 +49,7 @@ once_cell = "1.9"
 procspawn = "1.0"
 proptest = "1"
 proptest-derive = "0.4"
-rustls-pemfile = "1.0"
+rustls-pemfile = "2.0"
 rdkafka = { version = "0.34", default-features = false, features = ["libz", "tokio", "zstd"] }
 tokio = { version = "1.14", features = ["macros", "rt-multi-thread"] }
 tracing-log = "0.2"

tests/client.rs

@@ -213,26 +213,22 @@ async fn test_tls() {
     let mut reader = std::io::BufReader::new(file);
     match rustls_pemfile::read_one(&mut reader).unwrap().unwrap() {
         rustls_pemfile::Item::X509Certificate(key) => {
-            root_store
-                .add(rustls::pki_types::CertificateDer::from(key))
-                .unwrap();
+            root_store.add(key).unwrap();
         }
         _ => unreachable!(),
     }
 
     let file = std::fs::File::open("/tmp/ca.crt").unwrap();
     let mut reader = std::io::BufReader::new(file);
     let producer_root = match rustls_pemfile::read_one(&mut reader).unwrap().unwrap() {
-        rustls_pemfile::Item::X509Certificate(key) => rustls::pki_types::CertificateDer::from(key),
+        rustls_pemfile::Item::X509Certificate(key) => key,
         _ => unreachable!(),
     };
 
     let file = std::fs::File::open("/tmp/ca.key").unwrap();
     let mut reader = std::io::BufReader::new(file);
     let private_key = match rustls_pemfile::read_one(&mut reader).unwrap().unwrap() {
-        rustls_pemfile::Item::PKCS8Key(key) => rustls::pki_types::PrivateKeyDer::Pkcs1(
-            rustls::pki_types::PrivatePkcs1KeyDer::from(key),
-        ),
+        rustls_pemfile::Item::Pkcs8Key(key) => rustls::pki_types::PrivateKeyDer::Pkcs8(key),
         _ => unreachable!(),
     };