Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(cargo.toml): define more workspace dependencies #3473

Merged
merged 5 commits into from
Dec 19, 2024
Merged

chore(cargo.toml): define more workspace dependencies #3473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b513352
chore(deps): define prost, prost-types as workspace dependencies (#3473)
cratelyn Dec 1, 2024
49804e7
chore(deps): define tonic, tonic-build as workspace dependencies (#3473)
cratelyn Dec 1, 2024
6dcd816
chore(deps): define bytes as a workspace dependency (#3473)
cratelyn Dec 1, 2024
f4c6125
chore(deps): define h2 as a workspace dependency (#3473)
cratelyn Dec 1, 2024
ce7a3a7
refactor(deps): define `linkerd2-proxy-api` using table (#3473)
cratelyn Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,21 @@ debug = 1
lto = true

[workspace.dependencies]
bytes = { version = "1" }
h2 = { version = "0.3" }
http = { version = "0.2" }
http-body = { version = "0.4" }
hyper = { version = "0.14", default-features = false }
linkerd2-proxy-api = "0.15.0"
prost = { version = "0.12" }
prost-types = { version = "0.12" }
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] }
# linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api.git", branch = "main" }
tonic = { version = "0.10", default-features = false }
tonic-build = { version = "0.10", default-features = false }

[workspace.dependencies.linkerd2-proxy-api]
version = "0.15.0"
# git = "https://github.com/linkerd/linkerd2-proxy-api.git"
# branch = "main"

# NB: hyperium/hyper#3796 backports the server connection builder's
# `max_pending_accept_reset_streams()` method. once released, we can depend on
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ regex = "1"
thiserror = "2"
tokio = { version = "1", features = ["rt"] }
tokio-stream = { version = "0.1", features = ["time", "sync"] }
tonic = { version = "0.10", default-features = false, features = ["prost"] }
tonic = { workspace = true, default-features = false, features = ["prost"] }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not for this change, but we should consider moving the default-features/features up to the workspace level in the future, IIRC it helps with feature unification and can speed up incremental builds.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a very good call. i would be on board with that!

tower = "0.4"
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/app/admin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pprof = ["deflate", "dep:pprof"]
log-streaming = ["linkerd-tracing/stream"]

[dependencies]
bytes = "1"
bytes = { workspace = true }
deflate = { version = "1", optional = true, features = ["gzip"] }
http = { workspace = true }
http-body = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ independently of the inbound and outbound proxy logic.
"""

[dependencies]
bytes = "1"
bytes = { workspace = true }
drain = { version = "0.1", features = ["retain"] }
http = { workspace = true }
http-body = { workspace = true }
Expand All @@ -26,7 +26,7 @@ serde_json = "1"
thiserror = "2"
tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
tokio-stream = { version = "0.1", features = ["time"] }
tonic = { version = "0.10", default-features = false, features = ["prost"] }
tonic = { workspace = true, default-features = false, features = ["prost"] }
tracing = "0.1"
parking_lot = "0.12"
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/gateway/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ linkerd-proxy-client-policy = { path = "../../proxy/client-policy" }
once_cell = "1"
thiserror = "2"
tokio = { version = "1", features = ["sync"] }
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true, default-features = false }
tower = { version = "0.4", default-features = false }
tracing = "0.1"

Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/inbound/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test-util = [
]

[dependencies]
bytes = "1"
bytes = { workspace = true }
http = { workspace = true }
futures = { version = "0.3", default-features = false }
linkerd-app-core = { path = "../core" }
Expand All @@ -36,7 +36,7 @@ parking_lot = "0.12"
rangemap = "1"
thiserror = "2"
tokio = { version = "1", features = ["sync"] }
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true, default-features = false }
tower = { version = "0.4", features = ["util"] }
tracing = "0.1"

Expand Down
6 changes: 3 additions & 3 deletions linkerd/app/integration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ default = []
flakey = []

[dependencies]
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false, features = ["executor"] }
h2 = "0.3"
h2 = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = [
Expand Down Expand Up @@ -50,7 +50,7 @@ tokio-stream = { version = "0.1", features = ["sync"] }
tokio-rustls = { workspace = true }
rustls-pemfile = "2.2"
tower = { version = "0.4", default-features = false }
tonic = { version = "0.10", features = ["transport"], default-features = false }
tonic = { workspace = true, features = ["transport"], default-features = false }
tracing = "0.1"
tracing-subscriber = { version = "0.3", default-features = false, features = [
"fmt",
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/outbound/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ prometheus-client-rust-242 = [] # TODO

[dependencies]
ahash = "0.8"
bytes = "1"
bytes = { workspace = true }
http = { workspace = true }
futures = { version = "0.3", default-features = false }
linkerd2-proxy-api = { workspace = true, features = ["outbound"] }
Expand All @@ -29,7 +29,7 @@ pin-project = "1"
prometheus-client = "0.22"
thiserror = "2"
tokio = { version = "1", features = ["sync"] }
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true, default-features = false }
tower = { version = "0.4", features = ["util"] }
tracing = "0.1"

Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ client-policy = ["linkerd-proxy-client-policy", "tonic", "linkerd-http-route"]

[dependencies]
futures = { version = "0.3", default-features = false }
h2 = "0.3"
h2 = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
Expand All @@ -29,7 +29,7 @@ regex = "1"
tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
tokio-test = "0.4"
tokio-stream = { version = "0.1", features = ["sync"] }
tonic = { version = "0.10", default-features = false, optional = true }
tonic = { workspace = true, default-features = false, optional = true }
tower = { version = "0.4", default-features = false }
tracing = "0.1"
thiserror = "2"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/detect/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
async-trait = "0.1"
bytes = "1"
bytes = { workspace = true }
linkerd-error = { path = "../error" }
linkerd-io = { path = "../io" }
linkerd-stack = { path = "../stack" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/duplex/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
publish = false

[dependencies]
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
tokio = { version = "1", features = ["io-util"] }
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/box/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
publish = false

[dependencies]
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/metrics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
test-util = []

[dependencies]
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/prom/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Tower middleware for Prometheus metrics.
test-util = []

[dependencies]
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/retry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
publish = false

[dependencies]
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
http-body = { workspace = true }
http = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/upgrade/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Facilities for HTTP/1 upgrades.
"""

[dependencies]
bytes = "1"
bytes = { workspace = true }
drain = "0.1"
futures = { version = "0.3", default-features = false }
http = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/io/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ default = []
[dependencies]
async-trait = "0.1"
futures = { version = "0.3", default-features = false }
bytes = "1"
bytes = { workspace = true }
linkerd-errno = { path = "../errno" }
tokio = { version = "1", features = ["io-util", "net"] }
tokio-test = { version = "0.4", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/opencensus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ linkerd-error = { path = "../error" }
linkerd-metrics = { path = "../metrics" }
linkerd-trace-context = { path = "../trace-context" }
opencensus-proto = { path = "../../opencensus-proto" }
tonic = { version = "0.10", default-features = false, features = [
tonic = { workspace = true, default-features = false, features = [
"prost",
"codegen",
] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/opentelemetry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ linkerd-trace-context = { path = "../trace-context" }
opentelemetry = { version = "0.27", default-features = false, features = ["trace"] }
opentelemetry_sdk = { version = "0.27", default-features = false, features = ["trace"] }
opentelemetry-proto = { path = "../../opentelemetry-proto" }
tonic = { version = "0.10", default-features = false, features = [
tonic = { workspace = true, default-features = false, features = [
"prost",
"codegen",
] }
Expand Down
4 changes: 2 additions & 2 deletions linkerd/proxy/api-resolve/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ linkerd-identity = { path = "../../identity" }
http = { workspace = true }
http-body = { workspace = true }
pin-project = "1"
prost = "0.12"
tonic = { version = "0.10", default-features = false }
prost = { workspace = true }
tonic = { workspace = true, default-features = false }
tower = { version = "0.4", default-features = false }
tracing = "0.1"
4 changes: 2 additions & 2 deletions linkerd/proxy/client-policy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ ahash = "0.8"
ipnet = "2"
http = { workspace = true }
once_cell = { version = "1" }
prost-types = { version = "0.12", optional = true }
tonic = { version = "0.10", default-features = false }
prost-types = { workspace = true, optional = true }
tonic = { workspace = true, default-features = false }
thiserror = { version = "2", optional = true }

linkerd-error = { path = "../../error" }
Expand Down
4 changes: 2 additions & 2 deletions linkerd/proxy/http/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ This should probably be decomposed into smaller, decoupled crates.

[dependencies]
async-trait = "0.1"
bytes = "1"
bytes = { workspace = true }
drain = "0.1"
futures = { version = "0.3", default-features = false }
h2 = "0.3"
h2 = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
httparse = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/identity-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ parking_lot = "0.12"
pin-project = "1"
thiserror = "2"
tokio = { version = "1", features = ["time", "sync"] }
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true, default-features = false }
tracing = "0.1"
http-body = { workspace = true }
2 changes: 1 addition & 1 deletion linkerd/proxy/server-policy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test-util = []
governor = { version = "0.8", default-features = false, features = ["std"] }
ipnet = "2"
http = { workspace = true }
prost-types = { version = "0.12", optional = true }
prost-types = { workspace = true, optional = true }
thiserror = "2"

linkerd-http-route = { path = "../../http/route" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/spire-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
linkerd-exp-backoff = { path = "../../exp-backoff" }
linkerd-stack = { path = "../../stack" }
tokio = { version = "1", features = ["time", "sync"] }
tonic = "0.10"
tonic = { workspace = true }
tower = "0.4"
tracing = "0.1"
x509-parser = "0.16.0"
Expand Down
6 changes: 3 additions & 3 deletions linkerd/proxy/tap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
publish = false

[dependencies]
bytes = "1"
bytes = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
Expand All @@ -22,12 +22,12 @@ linkerd-proxy-http = { path = "../http" }
linkerd-stack = { path = "../../stack" }
linkerd-tls = { path = "../../tls" }
parking_lot = "0.12"
prost-types = "0.12"
prost-types = { workspace = true }
rand = { version = "0.8" }
thiserror = "2"
tokio = { version = "1", features = ["time"] }
tower = { version = "0.4", default-features = false }
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true, default-features = false }
tracing = "0.1"
pin-project = "1"

Expand Down
6 changes: 3 additions & 3 deletions linkerd/service-profiles/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ Implements client layers for Linkerd ServiceProfiles.
"""

[dependencies]
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
linkerd2-proxy-api = { workspace = true, features = ["destination"] }
once_cell = "1.20"
prost-types = "0.12"
prost-types = { workspace = true }
regex = "1"
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
tokio-stream = { version = "0.1", features = ["sync"] }
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true, default-features = false }
tower = { version = "0.4.13", features = ["retry", "util"] }
thiserror = "2"
tracing = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/tls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
async-trait = "0.1"
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
linkerd-conditional = { path = "../conditional" }
linkerd-dns-name = { path = "../dns/name" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/tonic-stream/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
futures = { version = "0.3", default-features = false }
linkerd-stack = { path = "../stack" }
pin-project = "1"
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true, default-features = false }
tokio = { version = "1", features = ["time"] }
tracing = "0.1"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/tonic-watch/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Provides a utility for creating robust watches from a service that returns a str
futures = { version = "0.3", default-features = false }
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true, default-features = false }
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
tracing = "0.1"

Expand Down
2 changes: 1 addition & 1 deletion linkerd/trace-context/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
base64 = "0.13"
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
hex = "0.4"
http = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions linkerd/transport-header/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ publish = false

[dependencies]
async-trait = "0.1"
bytes = "1"
bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
linkerd-dns-name = { path = "../dns/name" }
linkerd-error = { path = "../error" }
linkerd-io = { path = "../io" }
linkerd-stack = { path = "../stack" }
prost = "0.12"
prost = { workspace = true }
tokio = { version = "1", features = ["time"] }
tracing = "0.1"

Expand Down
Loading
Loading