From 8ff7a40de715da18e24cb047b0064ea437eac390 Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Wed, 27 Apr 2022 11:09:15 -0700 Subject: [PATCH] chore: disable grpcio openssl (#1288) (#1215 follow up) we shouldn't need it enabled since moving to reqwest+rustls and upgrade the easier dependencies Issue #1215 --- .cargo/audit.toml | 1 - Cargo.lock | 79 ++++++++++++++++++++++++++--------------------- Dockerfile | 4 +-- 3 files changed, 45 insertions(+), 39 deletions(-) diff --git a/.cargo/audit.toml b/.cargo/audit.toml index c58a3314d5..5d299077c3 100644 --- a/.cargo/audit.toml +++ b/.cargo/audit.toml @@ -6,5 +6,4 @@ ignore = [ "RUSTSEC-2020-0159", "RUSTSEC-2020-0071", "RUSTSEC-2021-0124", - "RUSTSEC-2021-0131", ] diff --git a/Cargo.lock b/Cargo.lock index b48c6b56a6..60ec085d78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -357,9 +357,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", @@ -409,15 +409,15 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.63" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" +checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.5.1", "object", "rustc-demangle", ] @@ -620,9 +620,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.48" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" dependencies = [ "cc", ] @@ -946,9 +946,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" +checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" [[package]] name = "either" @@ -1039,7 +1039,7 @@ dependencies = [ "cfg-if 1.0.0", "crc32fast", "libc", - "miniz_oxide", + "miniz_oxide 0.4.4", ] [[package]] @@ -1772,6 +1772,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "miniz_oxide" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.6.23" @@ -1826,7 +1835,7 @@ dependencies = [ "httparse", "lazy_static", "log", - "rand 0.8.4", + "rand 0.8.5", "regex", "serde_json", "serde_urlencoded", @@ -1931,9 +1940,9 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "memchr", ] @@ -2244,19 +2253,18 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", - "rand_hc 0.3.1", ] [[package]] @@ -2306,15 +2314,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_xoshiro" version = "0.4.0" @@ -2869,9 +2868,9 @@ dependencies = [ [[package]] name = "slog-stdlog" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8228ab7302adbf4fcb37e66f3cda78003feb521e7fd9e3847ec117a7784d0f5a" +checksum = "6706b2ace5bbae7291d3f8d2473e2bfab073ccd7d03670946197aec98471fa3e" dependencies = [ "log", "slog", @@ -2880,15 +2879,15 @@ dependencies = [ [[package]] name = "slog-term" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95c1e7e5aab61ced6006149ea772770b84a0d16ce0f7885def313e4829946d76" +checksum = "87d29185c55b7b258b4f120eab00f48557d4d9bc814f41713f449d35b0f8977c" dependencies = [ "atty", - "chrono", "slog", "term", "thread_local", + "time 0.3.9", ] [[package]] @@ -3051,7 +3050,7 @@ dependencies = [ "num_cpus", "protobuf", "pyo3", - "rand 0.8.4", + "rand 0.8.5", "regex", "reqwest", "scheduled-thread-pool", @@ -3069,7 +3068,7 @@ dependencies = [ "slog-stdlog", "slog-term", "thiserror", - "time 0.3.6", + "time 0.3.9", "tokio", "url 2.2.2", "urlencoding", @@ -3189,19 +3188,21 @@ dependencies = [ "libc", "standback", "stdweb", - "time-macros", + "time-macros 0.1.1", "version_check", "winapi 0.3.9", ] [[package]] name = "time" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d54b9298e05179c335de2b9645d061255bcd5155f843b3e328d2cfe0a5b413" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" dependencies = [ + "itoa 1.0.1", "libc", "num_threads", + "time-macros 0.2.4", ] [[package]] @@ -3214,6 +3215,12 @@ dependencies = [ "time-macros-impl", ] +[[package]] +name = "time-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" + [[package]] name = "time-macros-impl" version = "0.1.2" diff --git a/Dockerfile b/Dockerfile index 38713a49e0..991a2ecdc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,8 @@ RUN apt-get -q update && \ RUN \ cargo --version && \ rustc --version && \ - cargo install --path . --locked --root /app --features grpcio/openssl && \ - cargo install --path . --locked --root /app --features grpcio/openssl --bin purge_ttl + cargo install --path . --locked --root /app && \ + cargo install --path . --locked --root /app --bin purge_ttl FROM debian:buster-slim WORKDIR /app