chore: Group HTTP crates in a directory

This commit moves all linkerd/http-* crates into a common directory. Linkerd dependencies are grouped distinctly in Cargo.toml files.
linkerd · Mar 25, 2024 · 1a89f45 · 1a89f45
1 parent 239e497
commit 1a89f45
Show file tree

Hide file tree

Showing 52 changed files with 89 additions and 75 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,12 +24,12 @@ members = [
     "linkerd/errno",
     "linkerd/error-respond",
     "linkerd/exp-backoff",
-    "linkerd/http-access-log",
-    "linkerd/http-box",
-    "linkerd/http-classify",
-    "linkerd/http-metrics",
-    "linkerd/http-retry",
-    "linkerd/http-route",
+    "linkerd/http/access-log",
+    "linkerd/http/box",
+    "linkerd/http/classify",
+    "linkerd/http/metrics",
+    "linkerd/http/retry",
+    "linkerd/http/route",
     "linkerd/identity",
     "linkerd/idle-cache",
     "linkerd/io",

diff --git a/linkerd/app/admin/Cargo.toml b/linkerd/app/admin/Cargo.toml
@@ -19,16 +19,17 @@ deflate = { version = "1", optional = true, features = ["gzip"] }
 http = "0.2"
 hyper = { version = "0.14", features = ["http1", "http2"] }
 futures = { version = "0.3", default-features = false }
-linkerd-app-core = { path = "../core" }
-linkerd-app-inbound = { path = "../inbound" }
-linkerd-tracing = { path = "../../tracing" }
 pprof = { version = "0.13", optional = true, features = ["prost-codec"] }
 serde = "1"
 serde_json = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
 tracing = "0.1"
 
+linkerd-app-core = { path = "../core" }
+linkerd-app-inbound = { path = "../inbound" }
+linkerd-tracing = { path = "../../tracing" }
+
 [dependencies.tower]
 version = "0.4"
 default-features = false

diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -20,6 +20,17 @@ http-body = "0.4"
 hyper = { version = "0.14", features = ["http1", "http2"] }
 futures = { version = "0.3", default-features = false }
 ipnet = "2.7"
+prometheus-client = "0.22"
+regex = "1"
+serde_json = "1"
+thiserror = "1"
+tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
+tokio-stream = { version = "0.1", features = ["time"] }
+tonic = { version = "0.10", default-features = false, features = ["prost"] }
+tracing = "0.1"
+parking_lot = "0.12"
+pin-project = "1"
+
 linkerd-addr = { path = "../../addr" }
 linkerd-conditional = { path = "../../conditional" }
 linkerd-dns = { path = "../../dns" }
@@ -29,7 +40,7 @@ linkerd-errno = { path = "../../errno" }
 linkerd-error = { path = "../../error" }
 linkerd-error-respond = { path = "../../error-respond" }
 linkerd-exp-backoff = { path = "../../exp-backoff" }
-linkerd-http-metrics = { path = "../../http-metrics" }
+linkerd-http-metrics = { path = "../../http/metrics" }
 linkerd-identity = { path = "../../identity" }
 linkerd-idle-cache = { path = "../../idle-cache" }
 linkerd-io = { path = "../../io" }
@@ -60,16 +71,6 @@ linkerd-transport-header = { path = "../../transport-header" }
 linkerd-transport-metrics = { path = "../../transport-metrics" }
 linkerd-tls = { path = "../../tls" }
 linkerd-trace-context = { path = "../../trace-context" }
-prometheus-client = "0.22"
-regex = "1"
-serde_json = "1"
-thiserror = "1"
-tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
-tokio-stream = { version = "0.1", features = ["time"] }
-tonic = { version = "0.10", default-features = false, features = ["prost"] }
-tracing = "0.1"
-parking_lot = "0.12"
-pin-project = "1"
 
 [dependencies.tower]
 version = "0.4"

diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml
@@ -23,7 +23,7 @@ http = "0.2"
 futures = { version = "0.3", default-features = false }
 linkerd-app-core = { path = "../core" }
 linkerd-app-test = { path = "../test", optional = true }
-linkerd-http-access-log = { path = "../../http-access-log" }
+linkerd-http-access-log = { path = "../../http/access-log" }
 linkerd-idle-cache = { path = "../../idle-cache" }
 linkerd-meshtls = { path = "../../meshtls", optional = true }
 linkerd-meshtls-rustls = { path = "../../meshtls/rustls", optional = true }
@@ -53,7 +53,7 @@ libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
 [dev-dependencies]
 hyper = { version = "0.14", features = ["http1", "http2"] }
 linkerd-app-test = { path = "../test" }
-linkerd-http-metrics = { path = "../../http-metrics", features = ["test-util"] }
+linkerd-http-metrics = { path = "../../http/metrics", features = ["test-util"] }
 linkerd-idle-cache = { path = "../../idle-cache", features = ["test-util"] }
 linkerd-io = { path = "../../io", features = ["tokio-test"] }
 linkerd-meshtls = { path = "../../meshtls", features = ["rustls"] }

diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -21,12 +21,22 @@ bytes = "1"
 http = "0.2"
 futures = { version = "0.3", default-features = false }
 linkerd2-proxy-api = { version = "0.13", features = ["outbound"] }
+once_cell = "1"
+parking_lot = "0.12"
+prometheus-client = "0.22"
+thiserror = "1"
+tokio = { version = "1", features = ["sync"] }
+tonic = { version = "0.10", default-features = false }
+tower = { version = "0.4", features = ["util"] }
+tracing = "0.1"
+pin-project = "1"
+
 linkerd-app-core = { path = "../core" }
 linkerd-app-test = { path = "../test", optional = true }
 linkerd-distribute = { path = "../../distribute" }
-linkerd-http-classify = { path = "../../http-classify" }
-linkerd-http-retry = { path = "../../http-retry" }
-linkerd-http-route = { path = "../../http-route" }
+linkerd-http-classify = { path = "../../http/classify" }
+linkerd-http-retry = { path = "../../http/retry" }
+linkerd-http-route = { path = "../../http/route" }
 linkerd-identity = { path = "../../identity" }
 linkerd-meshtls-rustls = { path = "../../meshtls/rustls", optional = true }
 linkerd-proxy-client-policy = { path = "../../proxy/client-policy", features = [
@@ -35,15 +45,6 @@ linkerd-proxy-client-policy = { path = "../../proxy/client-policy", features = [
 linkerd-retry = { path = "../../retry" }
 linkerd-tonic-stream = { path = "../../tonic-stream" }
 linkerd-tonic-watch = { path = "../../tonic-watch" }
-once_cell = "1"
-parking_lot = "0.12"
-prometheus-client = "0.22"
-thiserror = "1"
-tokio = { version = "1", features = ["sync"] }
-tonic = { version = "0.10", default-features = false }
-tower = { version = "0.4", features = ["util"] }
-tracing = "0.1"
-pin-project = "1"
 
 [dev-dependencies]
 hyper = { version = "0.14", features = ["http1", "http2"] }

diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml
@@ -19,7 +19,7 @@ http = "0.2"
 http-body = "0.4"
 hyper = { version = "0.14", features = ["http1", "http2"] }
 linkerd-app-core = { path = "../core" }
-linkerd-http-route = { path = "../../http-route", optional = true }
+linkerd-http-route = { path = "../../http/route", optional = true }
 linkerd-identity = { path = "../../identity" }
 linkerd-proxy-client-policy = { path = "../../proxy/client-policy", optional = true }
 linkerd-io = { path = "../../io", features = ["tokio-test"] }

diff --git a/linkerd/http-access-log/Cargo.toml → linkerd/http/access-log/Cargo.toml b/linkerd/http-access-log/Cargo.toml → linkerd/http/access-log/Cargo.toml
@@ -11,10 +11,11 @@ futures-core = "0.3"
 http = "0.2"
 humantime = "2"
 pin-project = "1"
-linkerd-stack = { path = "../stack" }
-linkerd-identity = { path = "../identity" }
-linkerd-tls = { path = "../tls" }
-linkerd-proxy-transport = { path = "../proxy/transport" }
-linkerd-tracing = { path = "../tracing" }
 tokio = { version = "1", features = ["time"] }
 tracing = "0.1"
+
+linkerd-stack = { path = "../../stack" }
+linkerd-identity = { path = "../../identity" }
+linkerd-tls = { path = "../../tls" }
+linkerd-proxy-transport = { path = "../../proxy/transport" }
+linkerd-tracing = { path = "../../tracing" }
diff --git a/linkerd/http-access-log/src/lib.rs → linkerd/http/access-log/src/lib.rs b/linkerd/http-access-log/src/lib.rs → linkerd/http/access-log/src/lib.rs
diff --git a/linkerd/http-box/Cargo.toml → linkerd/http/box/Cargo.toml b/linkerd/http-box/Cargo.toml → linkerd/http/box/Cargo.toml
@@ -11,6 +11,7 @@ bytes = "1"
 futures = { version = "0.3", default-features = false }
 http = "0.2"
 http-body = "0.4"
-linkerd-error = { path = "../error" }
-linkerd-stack = { path = "../stack" }
 pin-project = "1"
+
+linkerd-error = { path = "../../error" }
+linkerd-stack = { path = "../../stack" }
diff --git a/linkerd/http-box/src/body.rs → linkerd/http/box/src/body.rs b/linkerd/http-box/src/body.rs → linkerd/http/box/src/body.rs
diff --git a/linkerd/http-box/src/erase_request.rs → linkerd/http/box/src/erase_request.rs b/linkerd/http-box/src/erase_request.rs → linkerd/http/box/src/erase_request.rs
diff --git a/linkerd/http-box/src/erase_response.rs → linkerd/http/box/src/erase_response.rs b/linkerd/http-box/src/erase_response.rs → linkerd/http/box/src/erase_response.rs
diff --git a/linkerd/http-box/src/lib.rs → linkerd/http/box/src/lib.rs b/linkerd/http-box/src/lib.rs → linkerd/http/box/src/lib.rs
diff --git a/linkerd/http-box/src/request.rs → linkerd/http/box/src/request.rs b/linkerd/http-box/src/request.rs → linkerd/http/box/src/request.rs
diff --git a/linkerd/http-box/src/response.rs → linkerd/http/box/src/response.rs b/linkerd/http-box/src/response.rs → linkerd/http/box/src/response.rs
diff --git a/linkerd/http-classify/Cargo.toml → linkerd/http/classify/Cargo.toml b/linkerd/http-classify/Cargo.toml → linkerd/http/classify/Cargo.toml
@@ -8,4 +8,5 @@ publish = false
 
 [dependencies]
 http = "0.2"
-linkerd-error = { path = "../error" }
+
+linkerd-error = { path = "../../error" }
diff --git a/linkerd/http-classify/src/lib.rs → linkerd/http/classify/src/lib.rs b/linkerd/http-classify/src/lib.rs → linkerd/http/classify/src/lib.rs
diff --git a/linkerd/http-classify/src/service.rs → linkerd/http/classify/src/service.rs b/linkerd/http-classify/src/service.rs → linkerd/http/classify/src/service.rs
diff --git a/linkerd/http-metrics/Cargo.toml → linkerd/http/metrics/Cargo.toml b/linkerd/http-metrics/Cargo.toml → linkerd/http/metrics/Cargo.toml
@@ -15,12 +15,13 @@ futures = { version = "0.3", default-features = false }
 http = "0.2"
 http-body = "0.4"
 hyper = { version = "0.14", features = ["http1", "http2"] }
-linkerd-error = { path = "../error" }
-linkerd-http-classify = { path = "../http-classify" }
-linkerd-metrics = { path = "../metrics", features = ["linkerd-stack"] }
-linkerd-stack = { path = "../stack" }
 parking_lot = "0.12"
 pin-project = "1"
 tokio = { version = "1", features = ["time"] }
 tower = "0.4"
 tracing = "0.1"
+
+linkerd-error = { path = "../../error" }
+linkerd-http-classify = { path = "../classify" }
+linkerd-metrics = { path = "../../metrics", features = ["linkerd-stack"] }
+linkerd-stack = { path = "../../stack" }
diff --git a/linkerd/http-metrics/src/lib.rs → linkerd/http/metrics/src/lib.rs b/linkerd/http-metrics/src/lib.rs → linkerd/http/metrics/src/lib.rs
diff --git a/linkerd/http-metrics/src/requests.rs → linkerd/http/metrics/src/requests.rs b/linkerd/http-metrics/src/requests.rs → linkerd/http/metrics/src/requests.rs
diff --git a/linkerd/http-metrics/src/requests/report.rs → linkerd/http/metrics/src/requests/report.rs b/linkerd/http-metrics/src/requests/report.rs → linkerd/http/metrics/src/requests/report.rs
diff --git a/linkerd/http-metrics/src/requests/service.rs → linkerd/http/metrics/src/requests/service.rs b/linkerd/http-metrics/src/requests/service.rs → linkerd/http/metrics/src/requests/service.rs
diff --git a/linkerd/http-metrics/src/retries.rs → linkerd/http/metrics/src/retries.rs b/linkerd/http-metrics/src/retries.rs → linkerd/http/metrics/src/retries.rs
diff --git a/linkerd/http-retry/Cargo.toml → linkerd/http/retry/Cargo.toml b/linkerd/http-retry/Cargo.toml → linkerd/http/retry/Cargo.toml
@@ -11,13 +11,14 @@ bytes = "1"
 futures = { version = "0.3", default-features = false }
 http-body = "0.4"
 http = "0.2"
-linkerd-error = { path = "../error" }
-linkerd-stack = { path = "../stack" }
 parking_lot = "0.12"
 tracing = "0.1"
 thiserror = "1"
 
+linkerd-error = { path = "../../error" }
+linkerd-stack = { path = "../../stack" }
+
 [dev-dependencies]
 hyper = "0.14"
-linkerd-tracing = { path = "../tracing", features = ["ansi"] }
+linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
 tokio = { version = "1", features = ["macros", "rt"] }
diff --git a/linkerd/http-retry/src/lib.rs → linkerd/http/retry/src/lib.rs b/linkerd/http-retry/src/lib.rs → linkerd/http/retry/src/lib.rs
diff --git a/linkerd/http-retry/src/replay.rs → linkerd/http/retry/src/replay.rs b/linkerd/http-retry/src/replay.rs → linkerd/http/retry/src/replay.rs
diff --git a/linkerd/http-retry/src/with_trailers.rs → linkerd/http/retry/src/with_trailers.rs b/linkerd/http-retry/src/with_trailers.rs → linkerd/http/retry/src/with_trailers.rs
diff --git a/linkerd/http-route/Cargo.toml → linkerd/http/route/Cargo.toml b/linkerd/http-route/Cargo.toml → linkerd/http/route/Cargo.toml
diff --git a/linkerd/http-route/src/grpc.rs → linkerd/http/route/src/grpc.rs b/linkerd/http-route/src/grpc.rs → linkerd/http/route/src/grpc.rs
diff --git a/linkerd/http-route/src/grpc/filter.rs → linkerd/http/route/src/grpc/filter.rs b/linkerd/http-route/src/grpc/filter.rs → linkerd/http/route/src/grpc/filter.rs
diff --git a/...p-route/src/grpc/filter/inject_failure.rs → ...p/route/src/grpc/filter/inject_failure.rs b/...p-route/src/grpc/filter/inject_failure.rs → ...p/route/src/grpc/filter/inject_failure.rs
diff --git a/linkerd/http-route/src/grpc/match.rs → linkerd/http/route/src/grpc/match.rs b/linkerd/http-route/src/grpc/match.rs → linkerd/http/route/src/grpc/match.rs
diff --git a/linkerd/http-route/src/grpc/match/tests.rs → linkerd/http/route/src/grpc/match/tests.rs b/linkerd/http-route/src/grpc/match/tests.rs → linkerd/http/route/src/grpc/match/tests.rs
diff --git a/linkerd/http-route/src/grpc/tests.rs → linkerd/http/route/src/grpc/tests.rs b/linkerd/http-route/src/grpc/tests.rs → linkerd/http/route/src/grpc/tests.rs
diff --git a/linkerd/http-route/src/http.rs → linkerd/http/route/src/http.rs b/linkerd/http-route/src/http.rs → linkerd/http/route/src/http.rs
diff --git a/linkerd/http-route/src/http/filter.rs → linkerd/http/route/src/http/filter.rs b/linkerd/http-route/src/http/filter.rs → linkerd/http/route/src/http/filter.rs
diff --git a/...p-route/src/http/filter/inject_failure.rs → ...p/route/src/http/filter/inject_failure.rs b/...p-route/src/http/filter/inject_failure.rs → ...p/route/src/http/filter/inject_failure.rs
diff --git a/...tp-route/src/http/filter/modify_header.rs → ...tp/route/src/http/filter/modify_header.rs b/...tp-route/src/http/filter/modify_header.rs → ...tp/route/src/http/filter/modify_header.rs
diff --git a/...rd/http-route/src/http/filter/redirect.rs → ...rd/http/route/src/http/filter/redirect.rs b/...rd/http-route/src/http/filter/redirect.rs → ...rd/http/route/src/http/filter/redirect.rs
diff --git a/linkerd/http-route/src/http/match.rs → linkerd/http/route/src/http/match.rs b/linkerd/http-route/src/http/match.rs → linkerd/http/route/src/http/match.rs
diff --git a/linkerd/http-route/src/http/match/header.rs → linkerd/http/route/src/http/match/header.rs b/linkerd/http-route/src/http/match/header.rs → linkerd/http/route/src/http/match/header.rs
diff --git a/linkerd/http-route/src/http/match/host.rs → linkerd/http/route/src/http/match/host.rs b/linkerd/http-route/src/http/match/host.rs → linkerd/http/route/src/http/match/host.rs
diff --git a/linkerd/http-route/src/http/match/path.rs → linkerd/http/route/src/http/match/path.rs b/linkerd/http-route/src/http/match/path.rs → linkerd/http/route/src/http/match/path.rs
diff --git a/.../http-route/src/http/match/query_param.rs → .../http/route/src/http/match/query_param.rs b/.../http-route/src/http/match/query_param.rs → .../http/route/src/http/match/query_param.rs
diff --git a/linkerd/http-route/src/http/match/tests.rs → linkerd/http/route/src/http/match/tests.rs b/linkerd/http-route/src/http/match/tests.rs → linkerd/http/route/src/http/match/tests.rs
diff --git a/linkerd/http-route/src/http/tests.rs → linkerd/http/route/src/http/tests.rs b/linkerd/http-route/src/http/tests.rs → linkerd/http/route/src/http/tests.rs
diff --git a/linkerd/http-route/src/lib.rs → linkerd/http/route/src/lib.rs b/linkerd/http-route/src/lib.rs → linkerd/http/route/src/lib.rs
diff --git a/linkerd/proxy/client-policy/Cargo.toml b/linkerd/proxy/client-policy/Cargo.toml
@@ -18,19 +18,22 @@ proto = [
 ahash = "0.8"
 ipnet = "2"
 http = "0.2"
-linkerd2-proxy-api = { version = "0.13", optional = true, features = [
-    "outbound",
-] }
-linkerd-error = { path = "../../error" }
-linkerd-exp-backoff = { path = "../../exp-backoff" }
-linkerd-http-route = { path = "../../http-route" }
-linkerd-proxy-api-resolve = { path = "../api-resolve" }
-linkerd-proxy-core = { path = "../core" }
 once_cell = { version = "1" }
 prost-types = { version = "0.12", optional = true }
 tonic = { version = "0.10", default-features = false }
 thiserror = { version = "1", optional = true }
 
+linkerd-error = { path = "../../error" }
+linkerd-exp-backoff = { path = "../../exp-backoff" }
+linkerd-http-route = { path = "../../http/route" }
+linkerd-proxy-api-resolve = { path = "../api-resolve" }
+linkerd-proxy-core = { path = "../core" }
+
+[dependencies.linkerd2-proxy-api]
+version = "0.13"
+optional = true
+features = ["outbound"]
+
 [dev-dependencies]
 maplit = "1"
 quickcheck = { version = "1", default-features = false }
diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml
@@ -29,14 +29,6 @@ hyper = { version = "0.14", features = [
     "runtime",
 ] }
 hyper-balance = { path = "../../../hyper-balance" }
-linkerd-detect = { path = "../../detect" }
-linkerd-duplex = { path = "../../duplex" }
-linkerd-error = { path = "../../error" }
-linkerd-http-box = { path = "../../http-box" }
-linkerd-http-classify = { path = "../../http-classify" }
-linkerd-io = { path = "../../io" }
-linkerd-proxy-balance = { path = "../balance" }
-linkerd-stack = { path = "../../stack" }
 pin-project = "1"
 rand = "0.8"
 thiserror = "1"
@@ -45,6 +37,15 @@ tower = { version = "0.4", default-features = false }
 tracing = "0.1"
 try-lock = "0.2"
 
+linkerd-detect = { path = "../../detect" }
+linkerd-duplex = { path = "../../duplex" }
+linkerd-error = { path = "../../error" }
+linkerd-http-box = { path = "../../http/box" }
+linkerd-http-classify = { path = "../../http/classify" }
+linkerd-io = { path = "../../io" }
+linkerd-proxy-balance = { path = "../balance" }
+linkerd-stack = { path = "../../stack" }
+
 [target.'cfg(fuzzing)'.dependencies]
 tokio-test = "0.4"
 

diff --git a/linkerd/proxy/server-policy/Cargo.toml b/linkerd/proxy/server-policy/Cargo.toml
@@ -12,10 +12,11 @@ proto = ["linkerd-http-route/proto", "linkerd2-proxy-api", "prost-types"]
 [dependencies]
 ipnet = "2"
 http = "0.2"
-linkerd-http-route = { path = "../../http-route" }
 prost-types = { version = "0.12", optional = true }
 thiserror = "1"
 
+linkerd-http-route = { path = "../../http/route" }
+
 [dependencies.linkerd2-proxy-api]
 version = "0.13"
 features = ["inbound"]

diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml
@@ -14,14 +14,6 @@ bytes = "1"
 futures = { version = "0.3", default-features = false }
 http = "0.2"
 http-body = "0.4"
-linkerd-addr = { path = "../addr" }
-linkerd-dns-name = { path = "../dns/name" }
-linkerd-error = { path = "../error" }
-linkerd-http-box = { path = "../http-box" }
-linkerd-proxy-api-resolve = { path = "../proxy/api-resolve" }
-linkerd-stack = { path = "../stack" }
-linkerd-tonic-stream = { path = "../tonic-stream" }
-linkerd-tonic-watch = { path = "../tonic-watch" }
 linkerd2-proxy-api = { version = "0.13", features = ["destination"] }
 once_cell = "1.17"
 prost-types = "0.12"
@@ -33,6 +25,15 @@ tower = { version = "0.4.13", features = ["retry", "util"] }
 thiserror = "1"
 tracing = "0.1"
 
+linkerd-addr = { path = "../addr" }
+linkerd-dns-name = { path = "../dns/name" }
+linkerd-error = { path = "../error" }
+linkerd-http-box = { path = "../http/box" }
+linkerd-proxy-api-resolve = { path = "../proxy/api-resolve" }
+linkerd-stack = { path = "../stack" }
+linkerd-tonic-stream = { path = "../tonic-stream" }
+linkerd-tonic-watch = { path = "../tonic-watch" }
+
 [dev-dependencies]
 linkerd2-proxy-api = { version = "0.13", features = ["arbitrary"] }
 quickcheck = { version = "1", default-features = false }