Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 42 additions & 0 deletions .github/workflows/check-all.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Check all crates.
#
# This workflow checks that `Cargo.lock` is configured sufficiently so that each
# crate can be compiled on its
# own.
name: check-all

permissions:
contents: read

on:
pull_request:
paths:
- Cargo.lock
- .github/workflows/check-all.yml

env:
CARGO_ACTION_FMT_VERSION: v0.1.3
CARGO_INCREMENTAL: 0
CARGO_NET_RETRY: 10
RUST_BACKTRACE: short
RUSTUP_MAX_RETRIES: 10

jobs:
check-all:
timeout-minutes: 20
runs-on: ubuntu-latest
container:
image: docker://rust:1.56.1-buster
steps:
- run: |
curl --proto =https --tlsv1.3 -vsSfLo /usr/local/bin/cargo-action-fmt "https://github.com/olix0r/cargo-action-fmt/releases/download/release%2F${CARGO_ACTION_FMT_VERSION}/cargo-action-fmt-x86_64-unknown-linux-gnu"
chmod 755 /usr/local/bin/cargo-action-fmt
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
- run: cargo fetch
- run: |
cargo check --frozen \
--workspace \
--all-targets \
--exclude=linkerd-meshtls-boring \
--message-format=json | cargo-action-fmt

2 changes: 1 addition & 1 deletion .github/workflows/check-each.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
outputs:
crates: ${{ steps.list-changed.outputs.crates }}

check:
check-each:
needs: list-changed-crates
timeout-minutes: 20
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion linkerd/addr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ publish = false
[dependencies]
http = "0.2"
linkerd-dns-name = { path = "../dns/name" }
thiserror = "1.0"
thiserror = "1"
2 changes: 1 addition & 1 deletion linkerd/addr/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cargo-fuzz = true
libfuzzer-sys = "0.4"
linkerd-addr = { path = ".." }
linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
tracing = "0.1.29"
tracing = "0.1"

# Prevent this from interfering with workspaces
[workspace]
Expand Down
8 changes: 4 additions & 4 deletions linkerd/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ linkerd-app-inbound = { path = "./inbound" }
linkerd-app-outbound = { path = "./outbound" }
linkerd-error = { path = "../error" }
linkerd-opencensus = { path = "../opencensus" }
regex = "1.5.4"
thiserror = "1.0"
regex = "1"
thiserror = "1"
tokio = { version = "1", features = ["rt"] }
tokio-stream = { version = "0.1.8", features = ["time", "sync"] }
tokio-stream = { version = "0.1", features = ["time", "sync"] }
tonic = { version = "0.6", default-features = false, features = ["prost"] }
tower = "0.4"
tracing = "0.1.30"
tracing = "0.1"
12 changes: 6 additions & 6 deletions linkerd/app/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ independently of the inbound and outbound proxy logic.

[dependencies]
bytes = "1"
drain = { version = "0.1.0", features = ["retain"] }
drain = { version = "0.1", features = ["retain"] }
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14.17", features = ["http1", "http2"] }
hyper = { version = "0.14", features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2.3"
linkerd-addr = { path = "../../addr" }
Expand Down Expand Up @@ -57,13 +57,13 @@ linkerd-transport-header = { path = "../../transport-header" }
linkerd-transport-metrics = { path = "../../transport-metrics" }
linkerd-tls = { path = "../../tls" }
linkerd-trace-context = { path = "../../trace-context" }
regex = "1.5.4"
regex = "1"
serde_json = "1"
thiserror = "1.0"
thiserror = "1"
tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
tokio-stream = { version = "0.1.8", features = ["time"] }
tokio-stream = { version = "0.1", features = ["time"] }
tonic = { version = "0.6", default-features = false, features = ["prost"] }
tracing = "0.1.30"
tracing = "0.1"
parking_lot = "0.12"
pin-project = "1"

Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ futures = { version = "0.3", default-features = false }
linkerd-app-core = { path = "../core" }
linkerd-app-inbound = { path = "../inbound" }
linkerd-app-outbound = { path = "../outbound" }
thiserror = "1.0"
thiserror = "1"
tokio = { version = "1", features = ["sync"] }
tower = { version = "0.4", default-features = false }
tracing = "0.1.30"
tracing = "0.1"

[dev-dependencies]
tokio = { version = "1", features = ["rt", "macros"] }
Expand Down
10 changes: 5 additions & 5 deletions linkerd/app/inbound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ linkerd-server-policy = { path = "../../server-policy" }
linkerd-tonic-watch = { path = "../../tonic-watch" }
linkerd2-proxy-api = { version = "0.3", features = ["client", "inbound"] }
parking_lot = "0.12"
thiserror = "1.0"
thiserror = "1"
tokio = { version = "1", features = ["sync"] }
tonic = { version = "0.6", default-features = false }
tower = { version = "0.4", features = ["util"] }
tracing = "0.1.30"
tracing = "0.1"

[target.'cfg(fuzzing)'.dependencies]
hyper = { version = "0.14.17", features = ["http1", "http2"] }
hyper = { version = "0.14", features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" }
arbitrary = { version = "1", features = ["derive"] }
libfuzzer-sys = { version = "0.4.2", features = ["arbitrary-derive"] }
libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }

[dev-dependencies]
hyper = { version = "0.14.17", features = ["http1", "http2"] }
hyper = { version = "0.14", features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" }
linkerd-io = { path = "../../io", features = ["tokio-test"] }
linkerd-meshtls = { path = "../../meshtls", features = ["rustls"] }
Expand Down
8 changes: 4 additions & 4 deletions linkerd/app/inbound/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ edition = "2021"
cargo-fuzz = true

[target.'cfg(fuzzing)'.dependencies]
arbitrary = { version = "1", features = ["derive"] }
hyper = { version = "0.14.9", features = ["http1", "http2"] }
arbitrary = { version = "1", features = ["derive"] }
hyper = { version = "0.14", features = ["http1", "http2"] }
http = "0.2"
libfuzzer-sys = { version = "0.4.2", features = ["arbitrary-derive"] }
libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
linkerd-app-core = { path = "../../core" }
linkerd-app-inbound = { path = ".." }
linkerd-app-test = { path = "../../test" }
Expand All @@ -35,4 +35,4 @@ test = true
doc = false

[patch.crates-io]
webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.22"}
webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.22" }
12 changes: 6 additions & 6 deletions linkerd/app/integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ futures = { version = "0.3", default-features = false, features = ["executor"] }
h2 = "0.3"
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14.17", features = ["http1", "http2", "stream", "client", "server"] }
hyper = { version = "0.14", features = ["http1", "http2", "stream", "client", "server"] }
linkerd-app = { path = "..", features = ["allow-loopback"] }
linkerd-app-core = { path = "../core" }
linkerd-metrics = { path = "../../metrics", features = ["test_util"] }
Expand All @@ -35,16 +35,16 @@ parking_lot = "0.12"
regex = "1"
socket2 = "0.4"
tokio = { version = "1", features = ["io-util", "net", "rt", "macros"] }
tokio-stream = { version = "0.1.8", features = ["sync"] }
tokio-rustls = "0.23.2"
rustls-pemfile = "0.3.0"
tokio-stream = { version = "0.1", features = ["sync"] }
tokio-rustls = "0.23"
rustls-pemfile = "0.3"
tower = { version = "0.4", default-features = false }
tonic = { version = "0.6", default-features = false }
tracing = "0.1.30"
tracing = "0.1"
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }

[dev-dependencies]
flate2 = { version = "1.0.22", default-features = false, features = ["rust_backend"] }
flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
# No code from this crate is actually used; only necessary to enable the Rustls
# implementation.
linkerd-meshtls = { path = "../../meshtls", features = ["rustls"] }
Expand Down
6 changes: 3 additions & 3 deletions linkerd/app/outbound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ linkerd-http-retry = { path = "../../http-retry" }
linkerd-identity = { path = "../../identity" }
linkerd-retry = { path = "../../retry" }
parking_lot = "0.12"
thiserror = "1.0"
thiserror = "1"
tokio = { version = "1", features = ["sync"] }
tower = { version = "0.4", features = ["util"] }
tracing = "0.1.30"
tracing = "0.1"
pin-project = "1"

[dev-dependencies]
hyper = { version = "0.14.17", features = ["http1", "http2"] }
hyper = { version = "0.14", features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" }
linkerd-io = { path = "../../io", features = ["tokio-test"] }
linkerd-meshtls = { path = "../../meshtls", features = ["rustls"] }
Expand Down
6 changes: 3 additions & 3 deletions linkerd/app/test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ futures = { version = "0.3", default-features = false }
h2 = "0.3"
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14.17", features = ["http1", "http2"] }
hyper = { version = "0.14", features = ["http1", "http2"] }
linkerd-app-core = { path = "../core" }
linkerd-identity = { path = "../../identity" }
linkerd-io = { path = "../../io", features = ["tokio-test"] }
parking_lot = "0.12"
regex = "1"
tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
tokio-test = "0.4"
tokio-stream = { version = "0.1.8", features = ["sync"] }
tokio-stream = { version = "0.1", features = ["sync"] }
tower = { version = "0.4", default-features = false }
tracing = "0.1.30"
tracing = "0.1"
thiserror = "1"

[dependencies.tracing-subscriber]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ linkerd-stack = { path = "../stack" }
parking_lot = "0.12"
tokio = { version = "1", default-features = false, features = ["macros", "rt", "sync", "time"] }
tower = { version = "0.4", default-features = false, features = ["util"] }
tracing = "0.1.30"
tracing = "0.1"

[dev-dependencies]
tokio = { version = "1", default-features = false, features = ["test-util", "time"] }
Expand Down
4 changes: 2 additions & 2 deletions linkerd/detect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ linkerd-error = { path = "../error" }
linkerd-io = { path = "../io" }
linkerd-stack = { path = "../stack" }
tokio = { version = "1", features = ["time"] }
thiserror = "1.0"
thiserror = "1"
tower = "0.4"
tracing = "0.1.30"
tracing = "0.1"
4 changes: 2 additions & 2 deletions linkerd/dns/Cargo.toml
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-dns-name = { path = "./name" }
linkerd-error = { path = "../error" }
thiserror = "1.0"
tracing = "0.1.30"
thiserror = "1"
tracing = "0.1"
trust-dns-resolver = "0.21.0-alpha.5"
tokio = { version = "1", features = ["rt", "sync", "time"] }
2 changes: 1 addition & 1 deletion linkerd/dns/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cargo-fuzz = true
libfuzzer-sys = "0.4"
linkerd-dns = { path = ".." }
tokio = { version = "1", features = ["rt", "time", "io-util"] }
tracing = "0.1.29"
tracing = "0.1"
linkerd-tracing = { path = "../../tracing", features = ["ansi"] }

# Prevent this from interfering with workspaces
Expand Down
2 changes: 1 addition & 1 deletion linkerd/dns/name/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
publish = false

[dependencies]
thiserror = "1.0"
thiserror = "1"
untrusted = "0.7"
2 changes: 1 addition & 1 deletion linkerd/duplex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ bytes = "1"
futures = { version = "0.3", default-features = false }
tokio = { version = "1", features = ["io-util"] }
pin-project = "1"
tracing = "0.1.30"
tracing = "0.1"
linkerd-io = { path = "../io" }
4 changes: 2 additions & 2 deletions linkerd/exp-backoff/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ publish = false
[dependencies]
futures = { version = "0.3", default-features = false }
rand = { version = "0.8", features = ["small_rng"] }
thiserror = "1.0"
tokio = { version = "1", features = ["time"]}
thiserror = "1"
tokio = { version = "1", features = ["time"] }
pin-project = "1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http-access-log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ linkerd-tls = { path = "../tls" }
linkerd-proxy-transport = { path = "../proxy/transport" }
linkerd-tracing = { path = "../tracing" }
tokio = { version = "1", features = ["time"] }
tracing = "0.1.30"
tracing = "0.1"
4 changes: 2 additions & 2 deletions linkerd/http-metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bytes = "1"
futures = { version = "0.3", default-features = false }
http = "0.2"
http-body = "0.4"
hyper = { version = "0.14.17", features = ["http1", "http2"] }
hyper = { version = "0.14", features = ["http1", "http2"] }
linkerd-error = { path = "../error" }
linkerd-http-classify = { path = "../http-classify" }
linkerd-metrics = { path = "../metrics", features = ["linkerd-stack"] }
Expand All @@ -20,4 +20,4 @@ parking_lot = "0.12"
pin-project = "1"
tokio = { version = "1", features = ["time"] }
tower = "0.4"
tracing = "0.1.30"
tracing = "0.1"
5 changes: 2 additions & 3 deletions linkerd/http-retry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ http-body = "0.4"
http = "0.2"
linkerd-error = { path = "../error" }
parking_lot = "0.12"
tracing = "0.1.30"
tracing = "0.1"
thiserror = "1"

[dev-dependencies]
hyper = "0.14"
linkerd-tracing = { path = "../tracing", features = ["ansi"] }
tokio = { version = "1", features = ["macros", "rt"]}

tokio = { version = "1", features = ["macros", "rt"] }
4 changes: 2 additions & 2 deletions linkerd/meshtls/rustls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ linkerd-identity = { path = "../../identity" }
linkerd-stack = { path = "../../stack" }
linkerd-tls = { path = "../../tls" }
linkerd-tls-test-util = { path = "../../tls/test-util", optional = true }
ring = { version = "0.16.19", features = ["std"] }
ring = { version = "0.16", features = ["std"] }
rustls-pemfile = "0.3"
thiserror = "1"
tokio = { version = "1", features = ["macros", "rt", "sync"] }
tokio-rustls = { version = "0.23.2", features = ["dangerous_configuration"] }
tokio-rustls = { version = "0.23", features = ["dangerous_configuration"] }
tracing = "0.1"
webpki = "0.22"

Expand Down
6 changes: 3 additions & 3 deletions linkerd/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ summary = ["hdrhistogram"]
test_util = []

[dependencies]
deflate = { version = "1.0.0", features = ["gzip"] }
deflate = { version = "1", features = ["gzip"] }
hdrhistogram = { version = "7.5", default-features = false, optional = true }
http = "0.2"
hyper = { version = "0.14.17", features = ["http1", "http2"] }
hyper = { version = "0.14", features = ["http1", "http2"] }
linkerd-stack = { path = "../stack", optional = true }
parking_lot = "0.12"
tokio = { version = "1", features = ["time"] }
tracing = "0.1.30"
tracing = "0.1"

[dev-dependencies]
quickcheck = { version = "1", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions linkerd/opencensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ linkerd-metrics = { path = "../metrics" }
opencensus-proto = { path = "../../opencensus-proto" }
tonic = { version = "0.6", default-features = false, features = ["prost", "codegen"] }
tokio = { version = "1", features = ["macros", "sync", "time"] }
tokio-stream = { version = "0.1.8", features = ["sync"] }
tracing = "0.1.30"
tokio-stream = { version = "0.1", features = ["sync"] }
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/proxy/api-resolve/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ pin-project = "1"
prost = "0.9"
tonic = { version = "0.6", default-features = false }
tower = { version = "0.4", default-features = false }
tracing = "0.1.30"
tracing = "0.1"
4 changes: 2 additions & 2 deletions linkerd/proxy/discover/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ linkerd-stack = { path = "../../stack" }
tokio = { version = "1", features = ["rt", "sync", "time"] }
tokio-util = "0.7"
tower = { version = "0.4", features = ["discover"] }
tracing = "0.1.30"
tracing = "0.1"
pin-project = "1"

[dev-dependencies]
async-stream = "0.3"
tokio = { version = "1", features = ["macros"] }
tower = { version = "0.4", default-features = false, features = ["discover", "util"]}
tower = { version = "0.4", default-features = false, features = ["discover", "util"] }
Loading