update to actix-web 4.4 for rustls 2.1

bottlerocket-os · Aug 31, 2023 · c1e021c · c1e021c
1 parent 358b064
commit c1e021c
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 54 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apiserver/Cargo.toml b/apiserver/Cargo.toml
@@ -15,7 +15,7 @@ server = []
 models = { path = "../models", version = "0.1.0" }
 
 # tracing-actix-web version must align with actix-web version
-actix-web = { version = "4", features = ["rustls"] }
+actix-web = { version = "4.4", features = ["rustls-0_21"] }
 awc = "3"
 actix-web-opentelemetry = { version = "0.13", features = ["metrics", "metrics-prometheus"] }
 rustls = { version = "0.21" }

diff --git a/apiserver/src/api/error.rs b/apiserver/src/api/error.rs
@@ -53,7 +53,7 @@ pub enum Error {
     CertExtract { path: String, source: io::Error },
 
     #[snafu(display("Failed to add CA to cert store: {}", source))]
-    CertStore { source: webpki::Error },
+    CertStore { source: rustls::Error },
 
     #[snafu(display("Failed to build TLS config from loaded certs: {}", source))]
     TLSConfigBuild { source: rustls::Error },