refactor(proxy/http): create linkerd-http-insert crate

this pulls out the `insert` module from `linkerd-proxy-http`. a reëxport is added so that this does not affect the public api of the http crate. NB: based on #3379. Signed-off-by: katelyn martin <[email protected]>
linkerd · Nov 21, 2024 · 3a3807e · 3a3807e
1 parent 9241bbb
commit 3a3807e
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
@@ -1722,6 +1722,17 @@ dependencies = [
 name = "linkerd-http-h2"
 version = "0.1.0"
 
+[[package]]
+name = "linkerd-http-insert"
+version = "0.1.0"
+dependencies = [
+ "futures",
+ "http",
+ "linkerd-stack",
+ "pin-project",
+ "tower",
+]
+
 [[package]]
 name = "linkerd-http-metrics"
 version = "0.1.0"
@@ -2166,6 +2177,7 @@ dependencies = [
  "linkerd-http-classify",
  "linkerd-http-executor",
  "linkerd-http-h2",
+ "linkerd-http-insert",
  "linkerd-http-version",
  "linkerd-io",
  "linkerd-proxy-balance",

diff --git a/Cargo.toml b/Cargo.toml
@@ -29,6 +29,7 @@ members = [
     "linkerd/http/classify",
     "linkerd/http/executor",
     "linkerd/http/h2",
+    "linkerd/http/insert",
     "linkerd/http/metrics",
     "linkerd/http/prom",
     "linkerd/http/retry",

diff --git a/linkerd/http/insert/Cargo.toml b/linkerd/http/insert/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "linkerd-http-insert"
+version = "0.1.0"
+authors = ["Linkerd Developers <[email protected]>"]
+license = "Apache-2.0"
+edition = "2021"
+publish = false
+description = """
+Tower middleware to insert parameters into HTTP extensions.
+"""
+
+[dependencies]
+futures = { version = "0.3", default-features = false }
+http = "0.2"
+pin-project = "1"
+tower = { version = "0.4", default-features = false }
+
+linkerd-stack = { path = "../../stack" }
diff --git a/linkerd/proxy/http/src/insert.rs → linkerd/http/insert/src/lib.rs b/linkerd/proxy/http/src/insert.rs → linkerd/http/insert/src/lib.rs
diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml
@@ -45,6 +45,7 @@ linkerd-http-box = { path = "../../http/box" }
 linkerd-http-classify = { path = "../../http/classify" }
 linkerd-http-executor = { path = "../../http/executor" }
 linkerd-http-h2 = { path = "../../http/h2" }
+linkerd-http-insert = { path = "../../http/insert" }
 linkerd-http-version = { path = "../../http/version" }
 linkerd-io = { path = "../../io" }
 linkerd-proxy-balance = { path = "../balance" }

diff --git a/linkerd/proxy/http/src/lib.rs b/linkerd/proxy/http/src/lib.rs
@@ -13,7 +13,6 @@ mod glue;
 pub mod h1;
 pub mod h2;
 mod header_from_target;
-pub mod insert;
 pub mod normalize_uri;
 pub mod orig_proto;
 mod override_authority;
@@ -48,6 +47,7 @@ pub use http::{
 pub use hyper::body::HttpBody;
 pub use linkerd_http_box::{BoxBody, BoxRequest, BoxResponse, EraseResponse};
 pub use linkerd_http_executor::TracingExecutor;
+pub use linkerd_http_insert as insert;
 pub use linkerd_http_version::{self as version, Version};
 
 #[derive(Clone, Debug)]