From d0567288ab48aa1b70bbf54c817cb587e2a81fdc Mon Sep 17 00:00:00 2001 From: Rostislav Rumenov Date: Thu, 28 Dec 2023 09:39:08 +0000 Subject: [PATCH] fix: fix multiple advisory warnings and 1 error found by cargo-deny --- Cargo.Bazel.Fuzzing.json.lock | 197 ++------ Cargo.Bazel.Fuzzing.toml.lock | 49 +- Cargo.Bazel.json.lock | 197 ++------ Cargo.Bazel.toml.lock | 49 +- Cargo.lock | 471 +++++++++--------- Cargo.toml | 2 +- bazel/external_crates.bzl | 4 +- deny.toml | 2 +- .../src/serde/duration/duration_tests.rs | 2 +- .../optional_time_of_day_tests.rs | 4 +- .../src/serde/percentage/percentage_tests.rs | 2 +- .../serde/time_of_day/time_of_day_tests.rs | 2 +- .../humanize/src/serde/tokens/tokens_tests.rs | 2 +- rs/replica/Cargo.toml | 2 +- rs/replica_tests/BUILD.bazel | 1 - rs/replica_tests/Cargo.toml | 1 - rs/tests/k8s/Cargo.toml | 6 +- 17 files changed, 330 insertions(+), 663 deletions(-) diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock index 2e15f24c2ba..203b0a11df8 100644 --- a/Cargo.Bazel.Fuzzing.json.lock +++ b/Cargo.Bazel.Fuzzing.json.lock @@ -1,5 +1,5 @@ { - "checksum": "9efa9b29a76e35b73d100a386b0180303f119dc3072042add9373a58bf5e3e3d", + "checksum": "cba4ade67c21c8424180b713cdef2c7067c3e467fa94eaafc4fecc8d4ec5a0e1", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -14599,42 +14599,6 @@ }, "license": "MIT OR Apache-2.0" }, - "difference 2.0.0": { - "name": "difference", - "version": "2.0.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/difference/2.0.0/download", - "sha256": "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - } - }, - "targets": [ - { - "Library": { - "crate_name": "difference", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "difference", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default" - ], - "selects": {} - }, - "edition": "2015", - "version": "2.0.0" - }, - "license": "MIT" - }, "difflib 0.4.0": { "name": "difflib", "version": "0.4.0", @@ -15550,7 +15514,7 @@ "target": "pprof" }, { - "id": "predicates 1.0.8", + "id": "predicates 3.0.4", "target": "predicates" }, { @@ -15762,7 +15726,7 @@ "target": "serde_with" }, { - "id": "serde_yaml 0.8.26", + "id": "serde_yaml 0.9.29", "target": "serde_yaml" }, { @@ -19272,53 +19236,6 @@ }, "license": "MIT OR Apache-2.0" }, - "float-cmp 0.8.0": { - "name": "float-cmp", - "version": "0.8.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/float-cmp/0.8.0/download", - "sha256": "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" - } - }, - "targets": [ - { - "Library": { - "crate_name": "float_cmp", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "float_cmp", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "num-traits", - "ratio" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "num-traits 0.2.17", - "target": "num_traits" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.8.0" - }, - "license": "MIT" - }, "float-cmp 0.9.0": { "name": "float-cmp", "version": "0.9.0", @@ -28732,7 +28649,7 @@ "target": "serde_json" }, { - "id": "serde_yaml 0.9.27", + "id": "serde_yaml 0.9.29", "target": "serde_yaml" }, { @@ -40211,71 +40128,6 @@ }, "license": "MIT" }, - "predicates 1.0.8": { - "name": "predicates", - "version": "1.0.8", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/predicates/1.0.8/download", - "sha256": "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" - } - }, - "targets": [ - { - "Library": { - "crate_name": "predicates", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "predicates", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "difference", - "float-cmp", - "normalize-line-endings", - "regex" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "difference 2.0.0", - "target": "difference" - }, - { - "id": "float-cmp 0.8.0", - "target": "float_cmp" - }, - { - "id": "normalize-line-endings 0.3.0", - "target": "normalize_line_endings" - }, - { - "id": "predicates-core 1.0.6", - "target": "predicates_core" - }, - { - "id": "regex 1.10.2", - "target": "regex" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "1.0.8" - }, - "license": "MIT/Apache-2.0" - }, "predicates 2.1.5": { "name": "predicates", "version": "2.1.5", @@ -40372,7 +40224,12 @@ ], "crate_features": { "common": [ - "diff" + "color", + "default", + "diff", + "float-cmp", + "normalize-line-endings", + "regex" ], "selects": {} }, @@ -40386,13 +40243,25 @@ "id": "difflib 0.4.0", "target": "difflib" }, + { + "id": "float-cmp 0.9.0", + "target": "float_cmp" + }, { "id": "itertools 0.11.0", "target": "itertools" }, + { + "id": "normalize-line-endings 0.3.0", + "target": "normalize_line_endings" + }, { "id": "predicates-core 1.0.6", "target": "predicates_core" + }, + { + "id": "regex 1.10.2", + "target": "regex" } ], "selects": {} @@ -49916,13 +49785,13 @@ }, "license": "MIT OR Apache-2.0" }, - "serde_yaml 0.9.27": { + "serde_yaml 0.9.29": { "name": "serde_yaml", - "version": "0.9.27", + "version": "0.9.29", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/serde_yaml/0.9.27/download", - "sha256": "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" + "url": "https://crates.io/api/v1/crates/serde_yaml/0.9.29/download", + "sha256": "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" } }, "targets": [ @@ -49960,14 +49829,14 @@ "target": "serde" }, { - "id": "unsafe-libyaml 0.2.9", + "id": "unsafe-libyaml 0.2.10", "target": "unsafe_libyaml" } ], "selects": {} }, "edition": "2021", - "version": "0.9.27" + "version": "0.9.29" }, "license": "MIT OR Apache-2.0" }, @@ -58689,13 +58558,13 @@ }, "license": "MIT OR Apache-2.0" }, - "unsafe-libyaml 0.2.9": { + "unsafe-libyaml 0.2.10": { "name": "unsafe-libyaml", - "version": "0.2.9", + "version": "0.2.10", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/unsafe-libyaml/0.2.9/download", - "sha256": "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" + "url": "https://crates.io/api/v1/crates/unsafe-libyaml/0.2.10/download", + "sha256": "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" } }, "targets": [ @@ -58715,7 +58584,7 @@ "**" ], "edition": "2021", - "version": "0.2.9" + "version": "0.2.10" }, "license": "MIT" }, diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock index c023361fce8..d494b529494 100644 --- a/Cargo.Bazel.Fuzzing.toml.lock +++ b/Cargo.Bazel.Fuzzing.toml.lock @@ -2856,12 +2856,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "difflib" version = "0.4.0" @@ -2977,7 +2971,7 @@ dependencies = [ "ff 0.12.1", "fix-hidden-lifetime-bug", "flate2", - "float-cmp 0.9.0", + "float-cmp", "form_urlencoded", "fs_extra", "futures", @@ -3090,7 +3084,7 @@ dependencies = [ "pkcs8", "pkg-config", "pprof", - "predicates 1.0.8", + "predicates 3.0.4", "pretty-bytes", "pretty_assertions", "priority-queue", @@ -3148,7 +3142,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_with", - "serde_yaml 0.8.26", + "serde_yaml 0.9.29", "sev", "sha2 0.10.8", "sha2 0.9.9", @@ -3832,15 +3826,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" -dependencies = [ - "num-traits", -] - [[package]] name = "float-cmp" version = "0.9.0" @@ -5722,7 +5707,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml 0.9.27", + "serde_yaml 0.9.29", "thiserror", "tokio", "tokio-tungstenite", @@ -7837,19 +7822,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "predicates" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" -dependencies = [ - "difference", - "float-cmp 0.8.0", - "normalize-line-endings", - "predicates-core", - "regex", -] - [[package]] name = "predicates" version = "2.1.5" @@ -7857,7 +7829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", - "float-cmp 0.9.0", + "float-cmp", "itertools 0.10.5", "normalize-line-endings", "predicates-core", @@ -7872,8 +7844,11 @@ checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", + "float-cmp", "itertools 0.11.0", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] @@ -9659,9 +9634,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" dependencies = [ "indexmap 2.1.0", "itoa", @@ -11365,9 +11340,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "untrusted" diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock index 5abd3a52c1a..7fcafd142b6 100644 --- a/Cargo.Bazel.json.lock +++ b/Cargo.Bazel.json.lock @@ -1,5 +1,5 @@ { - "checksum": "ffe38353532e167f84847b9e3cd269b820ab3b22b7016bc188c5fd2ead6dcaf3", + "checksum": "4c8aee4ef25b07c3eaa54aef3c0862c3438fdaad1f253eda5bdfc9026a87846d", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -14452,42 +14452,6 @@ }, "license": "MIT OR Apache-2.0" }, - "difference 2.0.0": { - "name": "difference", - "version": "2.0.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/difference/2.0.0/download", - "sha256": "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - } - }, - "targets": [ - { - "Library": { - "crate_name": "difference", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "difference", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default" - ], - "selects": {} - }, - "edition": "2015", - "version": "2.0.0" - }, - "license": "MIT" - }, "difflib 0.4.0": { "name": "difflib", "version": "0.4.0", @@ -15403,7 +15367,7 @@ "target": "pprof" }, { - "id": "predicates 1.0.8", + "id": "predicates 3.0.4", "target": "predicates" }, { @@ -15615,7 +15579,7 @@ "target": "serde_with" }, { - "id": "serde_yaml 0.8.26", + "id": "serde_yaml 0.9.29", "target": "serde_yaml" }, { @@ -19141,53 +19105,6 @@ }, "license": "MIT OR Apache-2.0" }, - "float-cmp 0.8.0": { - "name": "float-cmp", - "version": "0.8.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/float-cmp/0.8.0/download", - "sha256": "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" - } - }, - "targets": [ - { - "Library": { - "crate_name": "float_cmp", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "float_cmp", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "num-traits", - "ratio" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "num-traits 0.2.15", - "target": "num_traits" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.8.0" - }, - "license": "MIT" - }, "float-cmp 0.9.0": { "name": "float-cmp", "version": "0.9.0", @@ -28642,7 +28559,7 @@ "target": "serde_json" }, { - "id": "serde_yaml 0.9.27", + "id": "serde_yaml 0.9.29", "target": "serde_yaml" }, { @@ -39933,71 +39850,6 @@ }, "license": "MIT" }, - "predicates 1.0.8": { - "name": "predicates", - "version": "1.0.8", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/predicates/1.0.8/download", - "sha256": "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" - } - }, - "targets": [ - { - "Library": { - "crate_name": "predicates", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "predicates", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "difference", - "float-cmp", - "normalize-line-endings", - "regex" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "difference 2.0.0", - "target": "difference" - }, - { - "id": "float-cmp 0.8.0", - "target": "float_cmp" - }, - { - "id": "normalize-line-endings 0.3.0", - "target": "normalize_line_endings" - }, - { - "id": "predicates-core 1.0.6", - "target": "predicates_core" - }, - { - "id": "regex 1.9.1", - "target": "regex" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "1.0.8" - }, - "license": "MIT/Apache-2.0" - }, "predicates 2.1.5": { "name": "predicates", "version": "2.1.5", @@ -40094,7 +39946,12 @@ ], "crate_features": { "common": [ - "diff" + "color", + "default", + "diff", + "float-cmp", + "normalize-line-endings", + "regex" ], "selects": {} }, @@ -40108,13 +39965,25 @@ "id": "difflib 0.4.0", "target": "difflib" }, + { + "id": "float-cmp 0.9.0", + "target": "float_cmp" + }, { "id": "itertools 0.11.0", "target": "itertools" }, + { + "id": "normalize-line-endings 0.3.0", + "target": "normalize_line_endings" + }, { "id": "predicates-core 1.0.6", "target": "predicates_core" + }, + { + "id": "regex 1.9.1", + "target": "regex" } ], "selects": {} @@ -49633,13 +49502,13 @@ }, "license": "MIT OR Apache-2.0" }, - "serde_yaml 0.9.27": { + "serde_yaml 0.9.29": { "name": "serde_yaml", - "version": "0.9.27", + "version": "0.9.29", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/serde_yaml/0.9.27/download", - "sha256": "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" + "url": "https://crates.io/api/v1/crates/serde_yaml/0.9.29/download", + "sha256": "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" } }, "targets": [ @@ -49677,14 +49546,14 @@ "target": "serde" }, { - "id": "unsafe-libyaml 0.2.9", + "id": "unsafe-libyaml 0.2.10", "target": "unsafe_libyaml" } ], "selects": {} }, "edition": "2021", - "version": "0.9.27" + "version": "0.9.29" }, "license": "MIT OR Apache-2.0" }, @@ -58429,13 +58298,13 @@ }, "license": "MIT OR Apache-2.0" }, - "unsafe-libyaml 0.2.9": { + "unsafe-libyaml 0.2.10": { "name": "unsafe-libyaml", - "version": "0.2.9", + "version": "0.2.10", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/unsafe-libyaml/0.2.9/download", - "sha256": "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" + "url": "https://crates.io/api/v1/crates/unsafe-libyaml/0.2.10/download", + "sha256": "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" } }, "targets": [ @@ -58455,7 +58324,7 @@ "**" ], "edition": "2021", - "version": "0.2.9" + "version": "0.2.10" }, "license": "MIT" }, diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock index 7457d3f170a..a08ef3d9c72 100644 --- a/Cargo.Bazel.toml.lock +++ b/Cargo.Bazel.toml.lock @@ -2845,12 +2845,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "difflib" version = "0.4.0" @@ -2966,7 +2960,7 @@ dependencies = [ "ff 0.12.1", "fix-hidden-lifetime-bug", "flate2", - "float-cmp 0.9.0", + "float-cmp", "form_urlencoded", "fs_extra", "futures", @@ -3079,7 +3073,7 @@ dependencies = [ "pkcs8", "pkg-config", "pprof", - "predicates 1.0.8", + "predicates 3.0.4", "pretty-bytes", "pretty_assertions", "priority-queue", @@ -3137,7 +3131,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_with", - "serde_yaml 0.8.26", + "serde_yaml 0.9.29", "sev", "sha2 0.10.8", "sha2 0.9.9", @@ -3822,15 +3816,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" -dependencies = [ - "num-traits", -] - [[package]] name = "float-cmp" version = "0.9.0" @@ -5719,7 +5704,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml 0.9.27", + "serde_yaml 0.9.29", "thiserror", "tokio", "tokio-tungstenite", @@ -7816,19 +7801,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "predicates" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" -dependencies = [ - "difference", - "float-cmp 0.8.0", - "normalize-line-endings", - "predicates-core", - "regex", -] - [[package]] name = "predicates" version = "2.1.5" @@ -7836,7 +7808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", - "float-cmp 0.9.0", + "float-cmp", "itertools 0.10.5", "normalize-line-endings", "predicates-core", @@ -7851,8 +7823,11 @@ checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", + "float-cmp", "itertools 0.11.0", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] @@ -9635,9 +9610,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" dependencies = [ "indexmap 2.1.0", "itoa", @@ -11341,9 +11316,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "untrusted" diff --git a/Cargo.lock b/Cargo.lock index 19d797c47ca..c5f6d4a9b56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,8 +60,8 @@ dependencies = [ "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.3", - "base64 0.21.2", + "ahash 0.8.6", + "base64 0.21.5", "bitflags 1.3.2", "brotli", "bytes", @@ -176,7 +176,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.7.6", + "ahash 0.7.7", "bytes", "bytestring", "cfg-if 1.0.0", @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom 0.2.8", "once_cell", @@ -276,14 +276,15 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.8", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -934,9 +935,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64-url" @@ -1609,7 +1610,7 @@ version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7c8c50262271cdf5abc979a5f76515c234e764fa025d1ba4862c0f0bcda0e95" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "hashbrown 0.14.2", "instant", "once_cell", @@ -2889,12 +2890,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", + "darling_core 0.20.3", + "darling_macro 0.20.3", ] [[package]] @@ -2913,16 +2914,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.70", "quote 1.0.31", "strsim", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -2938,13 +2939,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ - "darling_core 0.14.4", + "darling_core 0.20.3", "quote 1.0.31", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -3197,12 +3198,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - [[package]] name = "difflib" version = "0.4.0" @@ -3888,15 +3883,6 @@ dependencies = [ "miniz_oxide 0.7.1", ] -[[package]] -name = "float-cmp" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" -dependencies = [ - "num-traits", -] - [[package]] name = "float-cmp" version = "0.9.0" @@ -3912,15 +3898,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - [[package]] name = "foreign-types" version = "0.5.0" @@ -3928,7 +3905,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared 0.3.1", + "foreign-types-shared", ] [[package]] @@ -3942,12 +3919,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "foreign-types-shared" version = "0.3.1" @@ -4380,7 +4351,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -4389,7 +4360,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", ] [[package]] @@ -4398,7 +4369,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "allocator-api2", ] @@ -4472,9 +4443,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -4542,6 +4513,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -4798,24 +4778,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-openssl" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" -dependencies = [ - "http 0.2.9", - "hyper 0.14.26", - "linked_hash_set", - "once_cell", - "openssl", - "openssl-sys", - "parking_lot 0.12.1", - "tokio", - "tokio-openssl", - "tower-layer", -] - [[package]] name = "hyper-rustls" version = "0.24.2" @@ -8960,7 +8922,7 @@ dependencies = [ "lazy_static", "regex", "serde", - "serde_yaml 0.8.26", + "serde_yaml 0.9.29", ] [[package]] @@ -10333,7 +10295,7 @@ dependencies = [ "nix 0.24.3", "num_cpus", "pprof", - "predicates 1.0.8", + "predicates 3.0.4", "prometheus", "prost", "rand 0.8.5", @@ -10441,7 +10403,6 @@ dependencies = [ "ic-types", "ic-utils 0.9.0", "maplit", - "predicates 1.0.8", "prometheus", "prost", "rand 0.8.5", @@ -10524,7 +10485,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57bd0dc846763f438766ef51fbe0407a320ac8038738040cbae258080cce2626" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", "candid", "flate2", "hex", @@ -10703,13 +10664,13 @@ dependencies = [ "ic-sns-root", "ic-sns-wasm", "icp-ledger", - "json-patch", + "json-patch 0.2.7", "lazy_static", "pretty_assertions", "regex", "serde", "serde_json", - "serde_yaml 0.8.26", + "serde_yaml 0.9.29", "tempfile", "url", ] @@ -10823,7 +10784,7 @@ dependencies = [ "num-traits", "prost", "serde", - "serde_yaml 0.8.26", + "serde_yaml 0.9.29", "tempfile", ] @@ -10888,7 +10849,7 @@ dependencies = [ "rand 0.8.5", "rust_decimal", "rust_decimal_macros", - "serde_yaml 0.8.26", + "serde_yaml 0.9.29", "tokio", "wat", ] @@ -12487,7 +12448,7 @@ version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fb7c1b80a1dfa604bb4a649a5c5aeef3d913f7c520cb42b40e534e8a61bcdfc" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "indexmap 1.9.2", "is-terminal", "itoa", @@ -12536,7 +12497,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b94f62e8dd2b561e7646bd0cc92e4c9d940859fc1c146ad8ab6e5d3e6f7c03" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", "hyper 0.14.26", "hyper-rustls", "ring", @@ -12570,7 +12531,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] @@ -12605,7 +12566,7 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.3", "io-lifetimes", "rustix 0.37.20", "windows-sys 0.48.0", @@ -12712,7 +12673,19 @@ checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" dependencies = [ "serde", "serde_json", - "treediff", + "treediff 3.0.2", +] + +[[package]] +name = "json-patch" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "treediff 4.0.2", ] [[package]] @@ -12727,14 +12700,16 @@ dependencies = [ ] [[package]] -name = "jsonpath_lib" -version = "0.3.0" +name = "jsonpath-rust" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa63191d68230cccb81c5aa23abd53ed64d83337cacbb25a7b8c7979523774f" +checksum = "06cc127b7c3d270be504572364f9569761a180b981919dd0d87693a7f5fb7829" dependencies = [ - "log", - "serde", + "pest", + "pest_derive", + "regex", "serde_json", + "thiserror", ] [[package]] @@ -12795,7 +12770,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "serde_yaml 0.9.27", + "serde_yaml 0.9.29", "tempfile", "tokio", "tokio-util", @@ -12805,19 +12780,16 @@ dependencies = [ [[package]] name = "k8s-openapi" -version = "0.16.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" +checksum = "edc3606fd16aca7989db2f84bb25684d0270c6d6fa1dbcd0025af7b4130523a6" dependencies = [ - "base64 0.13.1", + "base64 0.21.5", "bytes", "chrono", - "http 0.2.9", - "percent-encoding 2.3.0", "serde", "serde-value", "serde_json", - "url", ] [[package]] @@ -12831,9 +12803,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.76.0" +version = "0.87.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf241a3a42bca4a2d1c21f2f34a659655032a7858270c7791ad4433aa8d79cb" +checksum = "3499c8d60c763246c7a213f51caac1e9033f46026904cb89bc8951ae8601f26e" dependencies = [ "k8s-openapi", "kube-client", @@ -12844,51 +12816,52 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.76.0" +version = "0.87.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e442b4e6d55c4b3d0c0c70d79a8865bf17e2c33725f9404bfcb8a29ee002ffe" +checksum = "033450dfa0762130565890dadf2f8835faedf749376ca13345bcd8ecd6b5f29f" dependencies = [ - "base64 0.13.1", + "base64 0.21.5", "bytes", "chrono", - "dirs-next", "either", "futures", + "home", "http 0.2.9", "http-body 0.4.5", "hyper 0.14.26", - "hyper-openssl", + "hyper-rustls", "hyper-timeout", - "jsonpath_lib", + "jsonpath-rust", "k8s-openapi", "kube-core", - "openssl", - "pem 1.1.1", + "pem 3.0.3", "pin-project", "rand 0.8.5", + "rustls", + "rustls-pemfile", "secrecy", "serde", "serde_json", - "serde_yaml 0.8.26", + "serde_yaml 0.9.29", "thiserror", "tokio", - "tokio-tungstenite 0.17.2", + "tokio-tungstenite", "tokio-util", "tower", - "tower-http 0.3.5", + "tower-http 0.4.4", "tracing", ] [[package]] name = "kube-core" -version = "0.76.0" +version = "0.87.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca2e1b1528287ba61602bbd17d0aa717fbb4d0fb257f4fa3a5fa884116ef778" +checksum = "b5bba93d054786eba7994d03ce522f368ef7d48c88a1826faa28478d85fb63ae" dependencies = [ "chrono", "form_urlencoded", "http 0.2.9", - "json-patch", + "json-patch 1.2.0", "k8s-openapi", "once_cell", "schemars", @@ -12899,28 +12872,30 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.76.0" +version = "0.87.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af50996adb7e1251960d278859772fa30df99879dc154d792e36832209637cb" +checksum = "91e98dd5e5767c7b894c1f0e41fd628b145f808e981feb8b08ed66455d47f1a4" dependencies = [ - "darling 0.14.4", + "darling 0.20.3", "proc-macro2 1.0.70", "quote 1.0.31", "serde_json", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "kube-runtime" -version = "0.76.0" +version = "0.87.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9b312c38884a3f41d67e2f7580824b6f45d360b98497325b5630664b3a359d" +checksum = "2d8893eb18fbf6bb6c80ef6ee7dd11ec32b1dc3c034c988ac1b3a84d46a230ae" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", + "async-trait", "backoff", "derivative", "futures", - "json-patch", + "hashbrown 0.14.2", + "json-patch 1.2.0", "k8s-openapi", "kube-client", "parking_lot 0.12.1", @@ -13343,15 +13318,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linked_hash_set" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "linux-raw-sys" version = "0.1.4" @@ -13721,9 +13687,9 @@ checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -14183,7 +14149,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.3", "libc", ] @@ -14325,32 +14291,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "openssl" -version = "0.10.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" -dependencies = [ - "bitflags 2.4.0", - "cfg-if 1.0.0", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2 1.0.70", - "quote 1.0.31", - "syn 2.0.39", -] - [[package]] name = "openssl-probe" version = "0.1.5" @@ -14796,7 +14736,17 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", + "serde", +] + +[[package]] +name = "pem" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +dependencies = [ + "base64 0.21.5", "serde", ] @@ -15210,19 +15160,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "predicates" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" -dependencies = [ - "difference", - "float-cmp 0.8.0", - "normalize-line-endings", - "predicates-core", - "regex", -] - [[package]] name = "predicates" version = "2.1.5" @@ -15230,7 +15167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", - "float-cmp 0.9.0", + "float-cmp", "itertools 0.10.5", "normalize-line-endings", "predicates-core", @@ -15245,8 +15182,11 @@ checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", + "float-cmp", "itertools 0.11.0", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] @@ -16266,7 +16206,7 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -16686,7 +16626,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", ] [[package]] @@ -16814,7 +16754,7 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c95a930e03325234c18c7071fd2b60118307e025d6fff3e12745ffbf63a3d29c" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "cssparser", "ego-tree", "getopts", @@ -17060,7 +17000,6 @@ version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -17181,9 +17120,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" dependencies = [ "indexmap 2.1.0", "itoa", @@ -17303,17 +17242,6 @@ dependencies = [ "x509-cert", ] -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha1" version = "0.10.5" @@ -18554,18 +18482,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "tokio-openssl" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" -dependencies = [ - "futures-util", - "openssl", - "openssl-sys", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.24.0" @@ -18628,18 +18544,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "tokio-tungstenite" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.17.3", -] - [[package]] name = "tokio-tungstenite" version = "0.20.1" @@ -18649,7 +18553,7 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite 0.20.1", + "tungstenite", ] [[package]] @@ -18704,7 +18608,7 @@ dependencies = [ "async-stream", "async-trait", "axum 0.6.20", - "base64 0.21.2", + "base64 0.21.5", "bytes", "h2 0.3.19", "http 0.2.9", @@ -18762,7 +18666,6 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "base64 0.13.1", "bitflags 1.3.2", "bytes", "futures-core", @@ -18783,6 +18686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "async-compression", + "base64 0.21.5", "bitflags 2.4.0", "bytes", "futures-core", @@ -18790,6 +18694,7 @@ dependencies = [ "http 0.2.9", "http-body 0.4.5", "http-range-header", + "mime", "pin-project-lite", "tokio", "tokio-util", @@ -18990,6 +18895,15 @@ dependencies = [ "serde_json", ] +[[package]] +name = "treediff" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +dependencies = [ + "serde_json", +] + [[package]] name = "triomphe" version = "0.1.9" @@ -19047,25 +18961,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" -[[package]] -name = "tungstenite" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http 0.2.9", - "httparse", - "log", - "rand 0.8.5", - "sha-1", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.20.1" @@ -19244,9 +19139,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "untrusted" @@ -19260,7 +19155,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0e0da3c8d6b71dbaf219188cc0e7f9ca3943f3263ca479920338d92d7ea5e07" dependencies = [ - "foreign-types 0.5.0", + "foreign-types", "libc", "unwind-sys", ] @@ -19538,7 +19433,7 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite", "tokio-util", "tower-service", "tracing", @@ -20052,6 +19947,15 @@ dependencies = [ "windows-targets 0.48.0", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -20082,6 +19986,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.0", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -20094,6 +20013,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -20106,6 +20031,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -20118,6 +20049,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -20130,6 +20067,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -20142,6 +20085,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -20154,6 +20103,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -20166,6 +20121,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" version = "0.3.5" @@ -20202,7 +20163,7 @@ checksum = "c6f71803d3a1c80377a06221e0530be02035d5b3e854af56c6ece7ac20ac441d" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.2", + "base64 0.21.5", "deadpool", "futures", "futures-timer", @@ -20356,6 +20317,26 @@ dependencies = [ "time 0.3.22", ] +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2 1.0.70", + "quote 1.0.31", + "syn 2.0.39", +] + [[package]] name = "zeroize" version = "1.7.0" diff --git a/Cargo.toml b/Cargo.toml index 5b047c8d019..f1a8a03242c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -498,7 +498,7 @@ serde_cbor = "0.11.2" serde_derive = "1.0" serde_json = { version = "1.0.107", features = ["std"] } serde_with = "1.14.0" -serde_yaml = "0.8.24" +serde_yaml = "0.9.29" signature = "2.1.0" simple_asn1 = "0.6.2" slog = { version = "2.7.0", features = [ diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl index b99560a1063..7fc28864bc2 100644 --- a/bazel/external_crates.bzl +++ b/bazel/external_crates.bzl @@ -839,7 +839,7 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable default_features = False, ), "predicates": crate.spec( - version = "^1.0.1", + version = "^3.0.4", ), "pretty-bytes": crate.spec( version = "^0.2.2", @@ -1060,7 +1060,7 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable version = "^1.14.0", ), "serde_yaml": crate.spec( - version = "^0.8.24", + version = "^0.9.29", ), "sev": crate.spec( version = "^2.0.2", diff --git a/deny.toml b/deny.toml index c18e0828b19..af567244bfe 100644 --- a/deny.toml +++ b/deny.toml @@ -265,7 +265,7 @@ allow-git = [] [sources.allow-org] # 1 or more github.com organizations to allow git sources for -github = [""] +github = ["dfinity-lab", "dfinity"] # 1 or more gitlab.com organizations to allow git sources for gitlab = [""] # 1 or more bitbucket.org organizations to allow git sources for diff --git a/rs/nervous_system/humanize/src/serde/duration/duration_tests.rs b/rs/nervous_system/humanize/src/serde/duration/duration_tests.rs index 1e9ee6f5478..1c96dcc846f 100644 --- a/rs/nervous_system/humanize/src/serde/duration/duration_tests.rs +++ b/rs/nervous_system/humanize/src/serde/duration/duration_tests.rs @@ -30,7 +30,7 @@ fn test_round_trip() { assert_eq!( serde_yaml::to_string(&t).unwrap(), - format!("---\nduration: {}\n", expected_formatted_str), + format!("duration: {}\n", expected_formatted_str), "original_duration_str = {:?}", original_duration_str, ); diff --git a/rs/nervous_system/humanize/src/serde/optional_time_of_day/optional_time_of_day_tests.rs b/rs/nervous_system/humanize/src/serde/optional_time_of_day/optional_time_of_day_tests.rs index 8899b35812b..f943b8925e1 100644 --- a/rs/nervous_system/humanize/src/serde/optional_time_of_day/optional_time_of_day_tests.rs +++ b/rs/nervous_system/humanize/src/serde/optional_time_of_day/optional_time_of_day_tests.rs @@ -39,7 +39,7 @@ fn test_round_trip() { assert_eq!( serde_yaml::to_string(&t).unwrap(), format!( - "---\nlunchtime: \"{}\"\nmeaning_of_life: 42\n", + "lunchtime: {}\nmeaning_of_life: 42\n", expected_formatted_str ), "original_time_of_day_str = {:?}", @@ -59,7 +59,7 @@ fn test_round_trip() { #[test] fn test_none() { // Case 1: lunchtime is explicitly null. - let yaml = "---\nlunchtime: ~\nmeaning_of_life: 42\n"; + let yaml = "lunchtime: null\nmeaning_of_life: 42\n"; let t: T = serde_yaml::from_str(yaml).unwrap(); assert_eq!( t, diff --git a/rs/nervous_system/humanize/src/serde/percentage/percentage_tests.rs b/rs/nervous_system/humanize/src/serde/percentage/percentage_tests.rs index 59599ea6ed5..608e1ef9a32 100644 --- a/rs/nervous_system/humanize/src/serde/percentage/percentage_tests.rs +++ b/rs/nervous_system/humanize/src/serde/percentage/percentage_tests.rs @@ -30,7 +30,7 @@ fn test_round_trip() { assert_eq!( serde_yaml::to_string(&t).unwrap(), - format!("---\nhomelessness_rate: {}\n", expected_formatted_str), + format!("homelessness_rate: {}\n", expected_formatted_str), "original_percentage_str = {:?}", original_percentage_str, ); diff --git a/rs/nervous_system/humanize/src/serde/time_of_day/time_of_day_tests.rs b/rs/nervous_system/humanize/src/serde/time_of_day/time_of_day_tests.rs index 744d2008124..4e25073b5b7 100644 --- a/rs/nervous_system/humanize/src/serde/time_of_day/time_of_day_tests.rs +++ b/rs/nervous_system/humanize/src/serde/time_of_day/time_of_day_tests.rs @@ -31,7 +31,7 @@ fn test_round_trip() { assert_eq!( serde_yaml::to_string(&t).unwrap(), - format!("---\nlunchtime: \"{}\"\n", expected_formatted_str), + format!("lunchtime: {}\n", expected_formatted_str), "original_time_of_day_str = {:?}", original_time_of_day_str, ); diff --git a/rs/nervous_system/humanize/src/serde/tokens/tokens_tests.rs b/rs/nervous_system/humanize/src/serde/tokens/tokens_tests.rs index d97a6acc364..92fbeb7d2da 100644 --- a/rs/nervous_system/humanize/src/serde/tokens/tokens_tests.rs +++ b/rs/nervous_system/humanize/src/serde/tokens/tokens_tests.rs @@ -31,7 +31,7 @@ fn test_round_trip() { assert_eq!( serde_yaml::to_string(&t).unwrap(), - format!("---\namount: {}\n", expected_formatted_str), + format!("amount: {}\n", expected_formatted_str), "original_amount_str = {:?}", original_amount_str, ); diff --git a/rs/replica/Cargo.toml b/rs/replica/Cargo.toml index a77ece20b99..2aa6587ef04 100644 --- a/rs/replica/Cargo.toml +++ b/rs/replica/Cargo.toml @@ -86,7 +86,7 @@ criterion = "0.5" ic-ic00-types = { path = "../types/ic00_types" } ic-interfaces-registry-mocks = { path = "../interfaces/registry/mocks" } ic-test-utilities = { path = "../test_utilities" } -predicates = "1.0.1" +predicates = "3.0.4" wat = "1.0.52" [[bench]] diff --git a/rs/replica_tests/BUILD.bazel b/rs/replica_tests/BUILD.bazel index 8e638480703..549c5712b8f 100644 --- a/rs/replica_tests/BUILD.bazel +++ b/rs/replica_tests/BUILD.bazel @@ -58,7 +58,6 @@ DEV_DEPENDENCIES = [ "@crate_index//:assert_matches", "@crate_index//:candid", "@crate_index//:maplit", - "@crate_index//:predicates", ] MACRO_DEV_DEPENDENCIES = [] diff --git a/rs/replica_tests/Cargo.toml b/rs/replica_tests/Cargo.toml index 396bb038cf9..b0e06199117 100644 --- a/rs/replica_tests/Cargo.toml +++ b/rs/replica_tests/Cargo.toml @@ -61,4 +61,3 @@ ic-registry-provisional-whitelist = { path = "../registry/provisional_whitelist" ic-sys = { path = "../sys" } ic-test-utilities = { path = "../test_utilities" } maplit = "1.0.2" -predicates = "1.0.1" diff --git a/rs/tests/k8s/Cargo.toml b/rs/tests/k8s/Cargo.toml index ef2275a426f..1363c170ea2 100644 --- a/rs/tests/k8s/Cargo.toml +++ b/rs/tests/k8s/Cargo.toml @@ -20,8 +20,8 @@ cidr = "0.2.2" clap = { version = "4.0", features = ["derive"] } futures = "0.3.17" http = "0.2.9" -k8s-openapi = { version = "0.16.0", features = ["v1_22"] } -kube = { version = "0.76.0", features = ["runtime", "derive", "ws"] } +k8s-openapi = { version = "0.20.0", features = ["v1_22"] } +kube = { version = "0.87.2", features = ["runtime", "derive", "ws"] } once_cell = "1.18.0" rand = "0.8.5" reqwest = { version = "0.11.22", default-features = false, features = [ @@ -31,7 +31,7 @@ reqwest = { version = "0.11.22", default-features = false, features = [ ] } serde = { version = "1.0.130", features = ["derive"] } serde_json = "1.0.68" -serde_yaml = "0.9.19" +serde_yaml = { workspace = true } tempfile = "3.1.0" tokio = { version = "1.32.0", features = ["full"] } tokio-util = "0.7.0"