From df9bc61a997482b0ff92a5646f9be969c14322fb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 00:23:13 +0000 Subject: [PATCH 1/2] chore(deps): update rust docker tag to v1.80 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a730ce8..b004c2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ #################################################################################################### ## Builder #################################################################################################### -FROM --platform=$BUILDPLATFORM rust:1.79 AS builder +FROM --platform=$BUILDPLATFORM rust:1.80 AS builder ARG TARGETPLATFORM WORKDIR /dtrd @@ -70,7 +70,7 @@ RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \ #################################################################################################### ## Final image #################################################################################################### -FROM rust:1.79 +FROM rust:1.80 # Import from builder. COPY --from=builder /etc/passwd /etc/passwd From 9d45cad61ff5b264806c04537ab8cfbc60aaeef8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 15:28:48 +0000 Subject: [PATCH 2/2] fix(deps): update rust crate console-subscriber to 0.4.0 --- Cargo.lock | 226 +++++++----------------------------------- Dockerfile | 4 +- dtrd/Cargo.toml | 2 +- replistore/Cargo.toml | 2 +- 4 files changed, 41 insertions(+), 193 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e5cbe3..d143833 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ dependencies = [ "actix-macros", "actix-rt", "actix_derive", - "bitflags 2.6.0", + "bitflags", "bytes", "crossbeam-channel", "futures-core", @@ -286,34 +286,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core 0.3.4", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper 0.1.2", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.7.5" @@ -321,7 +293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", - "axum-core 0.4.3", + "axum-core", "bytes", "futures-util", "http 1.1.0", @@ -341,23 +313,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.4.3" @@ -427,7 +382,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cexpr", "clang-sys", "itertools 0.12.1", @@ -441,12 +396,6 @@ dependencies = [ "syn", ] -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.6.0" @@ -467,7 +416,7 @@ name = "bp7" version = "0.1.0" dependencies = [ "binascii", - "bitflags 2.6.0", + "bitflags", "chrono", "num_enum", "serde", @@ -611,22 +560,22 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "console-api" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" +checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" dependencies = [ "futures-core", - "prost 0.12.6", - "prost-types 0.12.6", - "tonic 0.11.0", + "prost", + "prost-types", + "tonic", "tracing-core", ] [[package]] name = "console-subscriber" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" +checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" dependencies = [ "console-api", "crossbeam-channel", @@ -634,14 +583,15 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", - "prost 0.12.6", - "prost-types 0.12.6", + "hyper-util", + "prost", + "prost-types", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic 0.11.0", + "tonic", "tracing", "tracing-core", "tracing-subscriber", @@ -760,12 +710,12 @@ dependencies = [ "futures-util", "log", "openssl", - "prost 0.13.1", + "prost", "tcpcl", "tokio", "tokio-stream", "tokio-util", - "tonic 0.12.1", + "tonic", "tonic-build", "url", "uuid", @@ -790,8 +740,8 @@ dependencies = [ "futures-util", "log", "maybe-async", - "prost 0.13.1", - "tonic 0.12.1", + "prost", + "tonic", "tonic-build", ] @@ -1014,25 +964,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.5" @@ -1208,14 +1139,12 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", "tokio", "tower-service", "tracing", @@ -1231,7 +1160,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -1243,18 +1172,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper 0.14.30", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyper-timeout" version = "0.5.1" @@ -1670,7 +1587,7 @@ version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.6.0", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -1738,10 +1655,10 @@ dependencies = [ "opentelemetry", "opentelemetry-proto", "opentelemetry_sdk", - "prost 0.13.1", + "prost", "thiserror", "tokio", - "tonic 0.12.1", + "tonic", ] [[package]] @@ -1752,8 +1669,8 @@ checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" dependencies = [ "opentelemetry", "opentelemetry_sdk", - "prost 0.13.1", - "tonic 0.12.1", + "prost", + "tonic", ] [[package]] @@ -1906,16 +1823,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive 0.12.6", -] - [[package]] name = "prost" version = "0.13.1" @@ -1923,7 +1830,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", - "prost-derive 0.13.1", + "prost-derive", ] [[package]] @@ -1940,26 +1847,13 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-types", "regex", "syn", "tempfile", ] -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools 0.12.1", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "prost-derive" version = "0.13.1" @@ -1973,22 +1867,13 @@ dependencies = [ "syn", ] -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost 0.12.6", -] - [[package]] name = "prost-types" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ - "prost 0.13.1", + "prost", ] [[package]] @@ -2046,7 +1931,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.6.0", + "bitflags", ] [[package]] @@ -2114,7 +1999,7 @@ dependencies = [ "opentelemetry", "opentelemetry-otlp", "opentelemetry_sdk", - "prost 0.13.1", + "prost", "rocksdb", "s3s", "sha2", @@ -2163,7 +2048,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -2428,7 +2313,7 @@ dependencies = [ name = "tcpcl" version = "0.1.0" dependencies = [ - "bitflags 2.6.0", + "bitflags", "bytes", "futures-util", "log", @@ -2548,16 +2433,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -2626,33 +2501,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tonic" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" -dependencies = [ - "async-stream", - "async-trait", - "axum 0.6.20", - "base64 0.21.7", - "bytes", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-timeout 0.4.1", - "percent-encoding", - "pin-project", - "prost 0.12.6", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.12.1" @@ -2661,19 +2509,19 @@ checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" dependencies = [ "async-stream", "async-trait", - "axum 0.7.5", + "axum", "base64 0.22.1", "bytes", - "h2 0.4.5", + "h2", "http 1.1.0", "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-timeout 0.5.1", + "hyper-timeout", "hyper-util", "percent-encoding", "pin-project", - "prost 0.13.1", + "prost", "socket2", "tokio", "tokio-stream", diff --git a/Dockerfile b/Dockerfile index b004c2a..a730ce8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ #################################################################################################### ## Builder #################################################################################################### -FROM --platform=$BUILDPLATFORM rust:1.80 AS builder +FROM --platform=$BUILDPLATFORM rust:1.79 AS builder ARG TARGETPLATFORM WORKDIR /dtrd @@ -70,7 +70,7 @@ RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \ #################################################################################################### ## Final image #################################################################################################### -FROM rust:1.80 +FROM rust:1.79 # Import from builder. COPY --from=builder /etc/passwd /etc/passwd diff --git a/dtrd/Cargo.toml b/dtrd/Cargo.toml index 90ca87e..dbb49ec 100644 --- a/dtrd/Cargo.toml +++ b/dtrd/Cargo.toml @@ -35,7 +35,7 @@ futures-util = "0.3.30" env_logger = "0.11.3" openssl = {version = "0.10.64", features = ["vendored"]} uuid = {version = "1.8.0", features = ["v4"]} -console-subscriber = "0.3.0" +console-subscriber = "0.4.0" actix = "0.13.3" actix-rt = "2.9.0" async-stream = "0.3.5" diff --git a/replistore/Cargo.toml b/replistore/Cargo.toml index db243a5..6772f0f 100644 --- a/replistore/Cargo.toml +++ b/replistore/Cargo.toml @@ -40,7 +40,7 @@ hex = "0.4.3" sha2 = "0.10.8" actix = "0.13.1" actix-rt = "2.9.0" -console-subscriber = "0.3.0" +console-subscriber = "0.4.0" tracing = "0.1.40" tracing-opentelemetry = "0.25.0" tracing-subscriber = "0.3.18"