chore: Move s2n-tls-hyper to a separate workspace

aws · Dec 17, 2024 · 239b731 · 239b731
1 parent dee300e
commit 239b731
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 7 deletions.
diff --git a/bindings/rust/standard/Cargo.toml b/bindings/rust/standard/Cargo.toml
@@ -0,0 +1,4 @@
+[workspace]
+members = [
+    "s2n-tls-hyper"
+]
diff --git a/s2n-tls-hyper/rust-toolchain → bindings/rust/standard/rust-toolchain b/s2n-tls-hyper/rust-toolchain → bindings/rust/standard/rust-toolchain
diff --git a/s2n-tls-hyper/Cargo.toml → ...gs/rust/standard/s2n-tls-hyper/Cargo.toml b/s2n-tls-hyper/Cargo.toml → ...gs/rust/standard/s2n-tls-hyper/Cargo.toml
@@ -4,7 +4,7 @@ description = "A compatbility crate allowing s2n-tls to be used with the hyper H
 version = "0.0.1"
 authors = ["AWS s2n"]
 edition = "2021"
-rust-version = "1.63.0"
+rust-version = "1.70.0"
 repository = "https://github.com/aws/s2n-tls"
 license = "Apache-2.0"
 publish = false
@@ -13,8 +13,8 @@ publish = false
 default = []
 
 [dependencies]
-s2n-tls = { version = "=0.3.9", path = "../bindings/rust/s2n-tls" }
-s2n-tls-tokio = { version = "=0.3.9", path = "../bindings/rust/s2n-tls-tokio" }
+s2n-tls = { version = "=0.3", path = "../../s2n-tls" }
+s2n-tls-tokio = { version = "=0.3", path = "../../s2n-tls-tokio" }
 hyper = { version = "1" }
 hyper-util = { version = "0.1", features = ["client-legacy", "tokio", "http1", "http2"] }
 tower-service = { version = "0.3" }

diff --git a/s2n-tls-hyper/README.md → ...ngs/rust/standard/s2n-tls-hyper/README.md b/s2n-tls-hyper/README.md → ...ngs/rust/standard/s2n-tls-hyper/README.md
diff --git a/s2n-tls-hyper/src/connector.rs → ...t/standard/s2n-tls-hyper/src/connector.rs b/s2n-tls-hyper/src/connector.rs → ...t/standard/s2n-tls-hyper/src/connector.rs
diff --git a/s2n-tls-hyper/src/error.rs → .../rust/standard/s2n-tls-hyper/src/error.rs b/s2n-tls-hyper/src/error.rs → .../rust/standard/s2n-tls-hyper/src/error.rs
diff --git a/s2n-tls-hyper/src/lib.rs → ...gs/rust/standard/s2n-tls-hyper/src/lib.rs b/s2n-tls-hyper/src/lib.rs → ...gs/rust/standard/s2n-tls-hyper/src/lib.rs
diff --git a/s2n-tls-hyper/src/stream.rs → ...rust/standard/s2n-tls-hyper/src/stream.rs b/s2n-tls-hyper/src/stream.rs → ...rust/standard/s2n-tls-hyper/src/stream.rs
diff --git a/s2n-tls-hyper/tests/common/echo.rs → ...andard/s2n-tls-hyper/tests/common/echo.rs b/s2n-tls-hyper/tests/common/echo.rs → ...andard/s2n-tls-hyper/tests/common/echo.rs
diff --git a/s2n-tls-hyper/tests/common/mod.rs → ...tandard/s2n-tls-hyper/tests/common/mod.rs b/s2n-tls-hyper/tests/common/mod.rs → ...tandard/s2n-tls-hyper/tests/common/mod.rs
@@ -7,8 +7,8 @@ pub mod echo;
 
 /// NOTE: this certificate and key are used for testing purposes only!
 pub const CERT_PEM: &[u8] =
-    include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/cert.pem"));
-pub const KEY_PEM: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/key.pem"));
+    include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../certs/cert.pem"));
+pub const KEY_PEM: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../certs/key.pem"));
 
 pub fn config() -> Result<config::Builder, Error> {
     let mut builder = config::Config::builder();

diff --git a/s2n-tls-hyper/tests/http.rs → ...rust/standard/s2n-tls-hyper/tests/http.rs b/s2n-tls-hyper/tests/http.rs → ...rust/standard/s2n-tls-hyper/tests/http.rs
@@ -231,11 +231,11 @@ async fn ipv6() -> Result<(), Box<dyn Error + Send + Sync>> {
         // matches this identity.
         let localhost_ipv6_cert: &[u8] = include_bytes!(concat!(
             env!("CARGO_MANIFEST_DIR"),
-            "/../certs/cert_localhost_ipv6.pem"
+            "/../../certs/cert_localhost_ipv6.pem"
         ));
         let localhost_ipv6_key: &[u8] = include_bytes!(concat!(
             env!("CARGO_MANIFEST_DIR"),
-            "/../certs/key_localhost_ipv6.pem"
+            "/../../certs/key_localhost_ipv6.pem"
         ));
 
         let mut builder = config::Config::builder();