merge: #3487

3487: Update Rust dependencies since merging `new-engine` into `main` (ENG-2428) r=nickgerace a=nickgerace

## Description

This PR updates every Rust-based dependency by its major, minor or patch version by default. It also moves the `postcard` version declaration from `dal` to the main `Cargo.toml` since the `alloc` feature is a subset of the `use-std` feature.

<img src="https://media1.giphy.com/media/26u4n5NamL40WyB1u/giphy.gif"/>

## Exceptions

Given the large scope of these changes, this PR does not seek to change any Rust code or fixups barring a small change regarding`EnumVariantNames`. Exceptions to the goal of this PR include the following:

- Hold `rustls`, `webpki-roots`, `tokio-vsock` and `yrs` to their minor versions due to API changes
- Hold `nix` and `ring` to their current versions due to needing buck2-specific changes
- Hold all hyper v1 dependencies to their minor versions due to a longer term effort needed to get us to hyper v1
- Hold `serde_yaml` to its current version due to being unmaintained as of [`0.9.34`](https://github.com/dtolnay/serde-yaml/releases/tag/0.9.34)

## Note

As a reminder, the `new-engine` was merged into `main` as of #3113.

Co-authored-by: Nick Gerace <[email protected]>

Cargo.toml

@@ -58,47 +58,47 @@ members = [
 ]
 
 [workspace.dependencies]
-async-nats = { version = "0.33.0", features = ["service"] }
-async-recursion = "1.0.4"
-async-trait = "0.1.68"
-axum = { version = "0.6.18", features = [
+async-nats = { version = "0.34.0", features = ["service"] }
+async-recursion = "1.0.5"
+async-trait = "0.1.79"
+axum = { version = "0.6.20", features = [
     "macros",
     "multipart",
     "ws",
 ] } # todo: upgrade this alongside hyper/http/tokio-tungstenite
-base64 = "0.21.0"
-blake3 = "1.3.3"
-bollard = "0.15.0"
-bytes = "1.4.0"
-chrono = { version = "0.4.24", features = ["serde"] }
-ciborium = "0.2.1"
-clap = { version = "4.2.7", features = ["derive", "color", "env", "wrap_help"] }
-color-eyre = "0.6.2"
-colored = "2.0.4"
-comfy-table = { version = "7.0.1", features = [
+base64 = "0.22.0"
+blake3 = "1.5.1"
+bollard = "0.16.1"
+bytes = "1.6.0"
+chrono = { version = "0.4.37", features = ["serde"] }
+ciborium = "0.2.2"
+clap = { version = "4.5.4", features = ["derive", "color", "env", "wrap_help"] }
+color-eyre = "0.6.3"
+colored = "2.1.0"
+comfy-table = { version = "7.1.0", features = [
     "crossterm",
     "tty",
     "custom_styling",
 ] }
-config = { version = "0.13.4", default-features = false, features = ["toml"] }
-console = "0.15.7"
+config = { version = "0.14.0", default-features = false, features = ["toml"] }
+console = "0.15.8"
 convert_case = "0.6.0"
-criterion = { version = "0.3", features = [ "async_tokio" ] }
-crossbeam-channel = "0.5.8"
+criterion = { version = "0.5.1", features = ["async_tokio"] }
+crossbeam-channel = "0.5.12"
 deadpool = { version = "0.10.0", features = ["rt_tokio_1"] }
 deadpool-postgres = "0.12.1"
-derive_builder = "0.12.0"
+derive_builder = "0.20.0"
 derive_more = "0.99.17"
 diff = "0.1.13"
 directories = "5.0.1"
 docker-api = "0.14.0"
-dyn-clone = "1.0.11"
-flate2 = "1.0.26"
-futures = "0.3.28"
-futures-lite = "2.1.0"
+dyn-clone = "1.0.17"
+flate2 = "1.0.28"
+futures = "0.3.30"
+futures-lite = "2.3.0"
 hex = "0.4.3"
-http = "0.2.9" # todo: upgrade this alongside hyper/axum/tokio-tungstenite/tower-http
-hyper = { version = "0.14.26", features = [
+http = "0.2.12" # todo: upgrade this alongside hyper/axum/tokio-tungstenite/tower-http
+hyper = { version = "0.14.28", features = [
     "client",
     "http1",
     "runtime",
@@ -107,115 +107,115 @@ hyper = { version = "0.14.26", features = [
 hyperlocal = { version = "0.8.0", default-features = false, features = [
     "client",
 ] } # todo: using the very latest of hyper client 1.x, we _may_ be able to phase this crate
-iftree = "1.0.4"
-indicatif = "0.17.5"
-indexmap = "2.2.2"
-indoc = "2.0.1"
-inquire = "0.6.2"
-itertools = "0.12.0"
-jwt-simple = { version = "0.12.6", default-features = false, features = [
+iftree = "1.0.5"
+indicatif = "0.17.8"
+indexmap = "2.2.6"
+indoc = "2.0.5"
+inquire = "0.7.4"
+itertools = "0.12.1"
+jwt-simple = { version = "0.12.9", default-features = false, features = [
     "pure-rust",
 ] }
 lazy_static = "1.4.0"
-moka = { version = "0.12.5", features = [ "future" ] }
+moka = { version = "0.12.5", features = ["future"] }
 names = { version = "0.14.0", default-features = false }
 nix = { version = "0.27.1", features = ["process", "signal"] }
 nkeys = "0.4.0"
-num_cpus = "1.15.0"
-once_cell = "1.17.1"
-open = "5.0.0"
+num_cpus = "1.16.0"
+once_cell = "1.19.0"
+open = "5.1.2"
 opentelemetry = { version = "0.22.0", features = ["trace"] }
 opentelemetry-otlp = "0.15.0"
 opentelemetry-semantic-conventions = "0.14.0"
 opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] }
-ouroboros = "0.18.1"
-paste = "1.0.12"
+ouroboros = "0.18.3"
+paste = "1.0.14"
 pathdiff = "0.2.1"
-petgraph = { version = "0.6.3", features = ["serde-1"] }
-pin-project-lite = "0.2.9"
-podman-api = "0.10"
+petgraph = { version = "0.6.4", features = ["serde-1"] }
+pin-project-lite = "0.2.13"
+podman-api = "0.10.0"
 postcard = { version = "1.0.8", features = ["use-std"] }
-postgres-types = { version = "0.2.5", features = ["derive"] }
-pretty_assertions_sorted = "1.2.1"
-proc-macro2 = "1.0.56"
-quote = "1.0.27"
+postgres-types = { version = "0.2.6", features = ["derive"] }
+pretty_assertions_sorted = "1.2.3"
+proc-macro2 = "1.0.79"
+quote = "1.0.35"
 rand = "0.8.5"
-refinery = { version = "0.8.9", features = ["tokio-postgres"] }
-regex = "1.8.1"
-remain = "0.2.8"
-reqwest = { version = "0.11.17", default-features = false, features = [
+refinery = { version = "0.8.12", features = ["tokio-postgres"] }
+regex = "1.10.4"
+remain = "0.2.13"
+reqwest = { version = "0.12.2", default-features = false, features = [
     "rustls-tls",
     "json",
     "multipart",
 ] }
 ring = "=0.17.5" # Upgrading this is possible, but a pain, so we don't want to pick up every new minor version (see: https://github.com/facebook/buck2/commit/91af40b66960d003067c3d241595fb53d1e636c8)
-rustls = { version = "0.22.2" }
-rustls-pemfile = { version = "2.0.0" }
+rustls = { version = "0.22.3" }
+rustls-pemfile = { version = "2.1.1" }
 rust-s3 = { version = "0.34.0-rc4", default-features = false, features = [
     "tokio-rustls-tls",
 ] }
-sea-orm = { version = "0.12.0", features = [
+sea-orm = { version = "0.12.15", features = [
     "sqlx-postgres",
     "runtime-tokio-rustls",
     "macros",
     "with-chrono",
     "debug-print",
 ] }
 self-replace = "1.3.7"
-serde = { version = "1.0.160", features = ["derive", "rc"] }
-serde-aux = "4.2.0"
-serde_json = { version = "1.0.96", features = ["preserve_order"] }
+serde = { version = "1.0.197", features = ["derive", "rc"] }
+serde-aux = "4.5.0"
+serde_json = { version = "1.0.115", features = ["preserve_order"] }
 serde_url_params = "0.2.1"
-serde_with = "3.0.0"
-serde_yaml = "0.9.21"
+serde_with = "3.7.0"
+serde_yaml = "0.9.33" # NOTE(nick): this has been archived upstream
 sled = "0.34.7"
 sodiumoxide = "0.2.7"
-stream-cancel = "0.8.1"
-strum = { version = "0.25.0", features = ["derive"] }
-syn = { version = "2.0.15", features = ["full", "extra-traits"] }
-tar = "0.4.38"
-tempfile = "3.5.0"
-test-log = { version = "0.2.11", default-features = false, features = [
+stream-cancel = "0.8.2"
+strum = { version = "0.26.2", features = ["derive"] }
+syn = { version = "2.0.55", features = ["full", "extra-traits"] }
+tar = "0.4.40"
+tempfile = "3.10.1"
+test-log = { version = "0.2.15", default-features = false, features = [
     "trace",
 ] }
-thiserror = "1.0.40"
-tokio = { version = "1.28.0", features = ["full"] }
-tokio-postgres = { version = "0.7.8", features = [
+thiserror = "1.0.58"
+tokio = { version = "1.37.0", features = ["full"] }
+tokio-postgres = { version = "0.7.10", features = [
     "runtime",
     "with-chrono-0_4",
     "with-serde_json-1",
 ] }
-tokio-postgres-rustls = { version = "0.11.0" }
-tokio-serde = { version = "0.8.0", features = ["json"] }
-tokio-stream = { version = "0.1.14", features = ["sync"] }
-tokio-test = "0.4.2"
+tokio-postgres-rustls = { version = "0.11.1" }
+tokio-serde = { version = "0.9.0", features = ["json"] }
+tokio-stream = { version = "0.1.15", features = ["sync"] }
+tokio-test = "0.4.4"
 tokio-tungstenite = "0.20.1" # todo: pinning back from 0.21.0, upgrade this alongside hyper/http/axum/tokio-tungstenite,tower-http
-tokio-util = { version = "0.7.8", features = ["codec", "rt"] }
+tokio-util = { version = "0.7.10", features = ["codec", "rt"] }
 tokio-vsock = { version = "0.4.0" }
-toml = { version = "0.8.8" }
+toml = { version = "0.8.12" }
 tower = { version = "0.4.13", features = ["full"] }
-tower-http = { version = "0.4", features = [
+tower-http = { version = "0.4.4", features = [
     "compression-br",
     "compression-deflate",
     "compression-gzip",
     "cors",
     "trace",
 ] } # todo: pinning back to 0.4.4, upgrade this alongside hyper/http/axum/tokio-tungstenite
-tracing = { version = "0.1" }
+tracing = { version = "0.1.40" }
 tracing-opentelemetry = "0.23.0"
 tracing-subscriber = { version = "0.3.18", features = [
     "env-filter",
     "json",
     "std",
 ] }
-ulid = { version = "1.0.0", features = ["serde"] }
-url = { version = "2.3.1", features = ["serde"] }
-uuid = { version = "1.3.2", features = ["serde", "v4"] }
-vfs = "0.10.0"
-vfs-tar = { version = "0.4.0", features = ["mmap"] }
-webpki-roots = { version = "0.25.3" }
+ulid = { version = "1.1.2", features = ["serde"] }
+url = { version = "2.5.0", features = ["serde"] }
+uuid = { version = "1.8.0", features = ["serde", "v4"] }
+vfs = "0.12.0"
+vfs-tar = { version = "0.4.1", features = ["mmap"] }
+webpki-roots = { version = "0.25.4" }
 y-sync = { version = "0.4.0", features = ["net"] }
-yrs = { version = "0.17.2" }
+yrs = { version = "0.17.4" }
 
 [patch.crates-io]
 # pending a potential merge and release of

bin/cyclone/Cargo.toml

@@ -11,7 +11,7 @@ path = "src/main.rs"
 
 [dependencies]
 clap = { workspace = true }
-color-eyre = { version = "0.6.1" }
+color-eyre = { workspace = true }
 cyclone-server = { path = "../../lib/cyclone-server" }
 telemetry-application = { path = "../../lib/telemetry-application-rs" }
 tokio = { workspace = true }

bin/si/src/args.rs

@@ -1,6 +1,6 @@
 use clap::{builder::PossibleValuesParser, Parser, Subcommand};
 use std::str::FromStr;
-use strum::{Display, EnumString, EnumVariantNames};
+use strum::{Display, EnumString, VariantNames};
 
 const NAME: &str = "si";
 
@@ -192,13 +192,13 @@ impl Args {
     }
 }
 
-#[derive(Clone, Copy, Debug, Display, EnumString, EnumVariantNames)]
+#[derive(Clone, Copy, Debug, Display, EnumString, VariantNames)]
 pub enum Mode {
     #[strum(serialize = "local")]
     Local,
 }
 
-#[derive(Clone, Copy, Debug, Display, EnumString, EnumVariantNames, PartialEq)]
+#[derive(Clone, Copy, Debug, Display, EnumString, VariantNames, PartialEq)]
 pub enum Engine {
     #[strum(serialize = "docker")]
     Docker,

lib/config-file/Cargo.toml

@@ -36,11 +36,13 @@ pathdiff = { workspace = true }
 remain = { workspace = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
-serde_toml = { package = "toml", version = "0.8.8", optional = true }
 serde_yaml = { workspace = true, optional = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, optional = true }
 tracing = { workspace = true }
 
+# FIXME(nick): we should move directly onto the "toml" crate and use the workspace's version.
+serde_toml = { package = "toml", version = "0.8.12", optional = true }
+
 [dev-dependencies]
 serde = { workspace = true }

lib/dal/Cargo.toml

@@ -7,14 +7,29 @@ rust-version = "1.64"
 publish = false
 
 [dependencies]
+council-server = { path = "../../lib/council-server" }
+nats-subscriber = { path = "../../lib/nats-subscriber" }
+object-tree = { path = "../../lib/object-tree" }
+si-cbor = { path = "../../lib/si-cbor" }
+si-crypto = { path = "../../lib/si-crypto" }
+si-data-nats = { path = "../../lib/si-data-nats" }
+si-data-pg = { path = "../../lib/si-data-pg" }
+si-events = { path = "../../lib/si-events-rs" }
+si-hash = { path = "../../lib/si-hash" }
+si-layer-cache = { path = "../../lib/si-layer-cache" }
+si-pkg = { path = "../../lib/si-pkg" }
+si-std = { path = "../../lib/si-std" }
+telemetry = { path = "../../lib/telemetry-rs" }
+telemetry-nats = { path = "../../lib/telemetry-nats-rs" }
+veritech-client = { path = "../../lib/veritech-client" }
+
 async-recursion = { workspace = true }
 async-trait = { workspace = true }
 base64 = { workspace = true }
 blake3 = { workspace = true }
 chrono = { workspace = true }
 ciborium = { workspace = true }
 convert_case = { workspace = true }
-council-server = { path = "../../lib/council-server" }
 derive_more = { workspace = true }
 diff = { workspace = true }
 dyn-clone = { workspace = true }
@@ -23,14 +38,11 @@ hex = { workspace = true }
 iftree = { workspace = true }
 itertools = { workspace = true }
 jwt-simple = { workspace = true }
-si-layer-cache = { path = "../../lib/si-layer-cache" }
 lazy_static = { workspace = true }
-nats-subscriber = { path = "../../lib/nats-subscriber" }
-object-tree = { path = "../../lib/object-tree" }
 once_cell = { workspace = true }
 paste = { workspace = true }
 petgraph = { workspace = true }
-postcard = { version = "1.0.8", features = ["alloc"] }
+postcard = { workspace = true }
 postgres-types = { workspace = true }
 rand = { workspace = true }
 refinery = { workspace = true }
@@ -40,32 +52,23 @@ serde = { workspace = true }
 serde-aux = { workspace = true }
 serde_json = { workspace = true }
 serde_with = { workspace = true }
-si-cbor = { path = "../../lib/si-cbor" }
-si-crypto = { path = "../../lib/si-crypto" }
-si-data-nats = { path = "../../lib/si-data-nats" }
-si-data-pg = { path = "../../lib/si-data-pg" }
-si-events = { path = "../../lib/si-events-rs" }
-si-hash = { path = "../../lib/si-hash" }
-si-pkg = { path = "../../lib/si-pkg" }
-si-std = { path = "../../lib/si-std" }
 sled = { workspace = true }
 sodiumoxide = { workspace = true }
 strum = { workspace = true }
-telemetry = { path = "../../lib/telemetry-rs" }
-telemetry-nats = { path = "../../lib/telemetry-nats-rs" }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
 ulid = { workspace = true }
 url = { workspace = true }
-veritech-client = { path = "../../lib/veritech-client" }
 
 [dev-dependencies]
 buck2-resources = { path = "../../lib/buck2-resources" }
 dal-test = { path = "../../lib/dal-test" }
+telemetry = { path = "../../lib/telemetry-rs" }
+telemetry-nats = { path = "../../lib/telemetry-nats-rs" }
+veritech-client = { path = "../../lib/veritech-client" }
+
 itertools = { workspace = true }
 pretty_assertions_sorted = { workspace = true }
-rebaser-core = { path = "../../lib/rebaser-core" }
-rebaser-server = { path = "../../lib/rebaser-server" }
 tempfile = { workspace = true }
 tokio-util = { workspace = true }

lib/dal/src/lib.rs

@@ -13,7 +13,7 @@ use rand::Rng;
 use serde_with::{DeserializeFromStr, SerializeDisplay};
 use si_data_nats::NatsError;
 use si_data_pg::{PgError, PgPool, PgPoolError};
-use strum::{Display, EnumString, EnumVariantNames};
+use strum::{Display, EnumString, VariantNames};
 use telemetry::prelude::*;
 use thiserror::Error;
 use tokio::time;
@@ -242,7 +242,7 @@ pub fn generate_name() -> String {
     DeserializeFromStr,
     Display,
     EnumString,
-    EnumVariantNames,
+    VariantNames,
     Eq,
     PartialEq,
     SerializeDisplay,