Chore: Dependency Updates (#2847)

Update dependencies --------- Signed-off-by: Ryan Levick <[email protected]>
fermyon · Sep 19, 2024 · 02918e2 · 02918e2
1 parent 8752dff
commit 02918e2
Show file tree

Hide file tree

Showing 72 changed files with 929 additions and 1,029 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,33 +16,44 @@ rust-version = "1.79"
 
 [dependencies]
 anyhow = { workspace = true }
-async-trait = "0.1"
-bytes = "1.1"
+async-trait = { workspace = true }
+bytes = { workspace = true }
 chrono = "0.4"
 clap = { version = "3.2.24", features = ["derive", "env"] }
-clearscreen = "2.0.1"
-comfy-table = "5.0"
-command-group = "2.1"
-ctrlc = { version = "3.2", features = ["termination"] }
+clearscreen = "3"
+comfy-table = "7"
+command-group = "2"
+ctrlc = { version = "3.4", features = ["termination"] }
 dialoguer = "0.10"
-dirs = "4.0"
-futures = "0.3"
-glob = "0.3.1"
-indicatif = "0.17.3"
+dirs = { workspace = true }
+futures = { workspace = true }
+glob = { workspace = true }
+indicatif = "0.17"
 is-terminal = "0.4"
-itertools = "0.11.0"
+itertools = { workspace = true }
 lazy_static = "1.4.0"
 levenshtein = "1.0.5"
-nix = { version = "0.24", features = ["signal"] }
+nix = { version = "0.29", features = ["signal"] }
 path-absolutize = "3.0.11"
-rand = "0.8"
-regex = "1.5.5"
+rand = { workspace = true }
+regex = { workspace = true }
 reqwest = { workspace = true }
 rpassword = "7.0"
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.82"
-sha2 = "0.10.2"
+serde_json = { workspace = true }
+sha2 = { workspace = true }
+subprocess = "0.2"
+tempfile = { workspace = true }
+tokio = { version = "1", features = ["full"] }
+toml = { workspace = true }
+tracing = { workspace = true }
+url = { workspace = true }
+uuid = { version = "1.0", features = ["v4"] }
+wasmtime = { workspace = true }
+watchexec = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" }
+watchexec-filterer-globset = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" }
+
 spin-app = { path = "crates/app" }
 spin-build = { path = "crates/build" }
 spin-common = { path = "crates/common" }
@@ -64,17 +75,6 @@ spin-trigger-http = { path = "crates/trigger-http" }
 spin-trigger-redis = { path = "crates/trigger-redis" }
 terminal = { path = "crates/terminal" }
 
-subprocess = "0.2.9"
-tempfile = "3.8.0"
-tokio = { version = "1.23", features = ["full"] }
-toml = "0.8"
-tracing = { workspace = true }
-url = "2.2.2"
-uuid = { version = "^1.0", features = ["v4"] }
-wasmtime = { workspace = true }
-watchexec = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" }
-watchexec-filterer-globset = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" }
-
 [target.'cfg(target_os = "linux")'.dependencies]
 # This needs to be an explicit dependency to enable
 # '--features openssl/vendored', which is used for Linux releases.
@@ -84,18 +84,16 @@ openssl = { version = "0.10" }
 anyhow = { workspace = true, features = ["backtrace"] }
 conformance = { path = "tests/conformance-tests" }
 conformance-tests = { workspace = true }
-hex = "0.4.3"
+hex = "0.4"
 http-body-util = { workspace = true }
 hyper = { workspace = true }
-hyper-util = { version = "0.1.2", features = ["tokio"] }
-redis = "0.24"
+hyper-util = { version = "0.1", features = ["tokio"] }
+redis = "0.27"
 runtime-tests = { path = "tests/runtime-tests" }
-sha2 = "0.10.1"
 test-codegen-macro = { path = "crates/test-codegen-macro" }
 test-components = { path = "tests/test-components" }
 test-environment = { workspace = true }
 testing-framework = { path = "tests/testing-framework" }
-which = "4.2.5"
 
 [build-dependencies]
 cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" }
@@ -123,19 +121,35 @@ members = [
 ]
 
 [workspace.dependencies]
-anyhow = "1.0.75"
+anyhow = "1"
+async-trait = "0.1"
+bytes = "1"
 conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
-http-body-util = "0.1.0"
-hyper = { version = "1.0.0", features = ["full"] }
-opentelemetry = { version = "0.24.0", features = ["metrics", "trace", "logs"] }
-opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio", "logs_level_enabled", "metrics"] }
+dirs = "5.0"
+futures = "0.3"
+glob = "0.3"
+http = "1"
+http-body-util = "0.1"
+hyper = { version = "1", features = ["full"] }
+itertools = "0.13"
+opentelemetry = { version = "0.25", features = ["metrics", "trace", "logs"] }
+opentelemetry_sdk = { version = "0.25", features = ["rt-tokio", "logs_level_enabled", "metrics"] }
+rand = "0.8"
+regex = "1"
 reqwest = { version = "0.12", features = ["stream", "blocking"] }
 # In `rustls` turn off the `aws_lc_rs` default feature and turn on `ring`.
 # If both `aws_lc_rs` and `ring` are enabled, a panic at runtime will occur.
 rustls = { version = "0.23", default-features = false, features = ["ring", "std", "logging", "tls12"] }
+serde = { version = "1", features = ["derive", "rc"] }
+serde_json = "1.0"
+sha2 = "0.10"
+tempfile = "3"
 test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
+thiserror = "1"
+toml = "0.8"
 tracing = { version = "0.1", features = ["log"] }
-tracing-opentelemetry = { version = "0.25.0", default-features = false, features = ["metrics"] }
+tracing-opentelemetry = { version = "0.26", default-features = false, features = ["metrics"] }
+url = "2"
 
 wasi-common-preview1 = { version = "22.0.0", package = "wasi-common", features = [
   "tokio",

diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml
@@ -5,9 +5,9 @@ authors = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-anyhow = "1.0"
-async-trait = "0.1"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+anyhow = { workspace = true }
+async-trait = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 spin-locked-app = { path = "../locked-app" }
-thiserror = "1.0"
+thiserror = { workspace = true }
diff --git a/crates/build/Cargo.toml b/crates/build/Cargo.toml
@@ -5,13 +5,13 @@ authors = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-anyhow = "1.0.57"
-futures = "0.3.21"
-serde = { version = "1.0", features = ["derive"] }
+anyhow = { workspace = true }
+futures = { workspace = true }
+serde = { workspace = true }
 spin-common = { path = "../common" }
 spin-manifest = { path = "../manifest" }
-subprocess = "0.2.8"
+subprocess = "0.2"
 terminal = { path = "../terminal" }
-tokio = { version = "1.23", features = ["full"] }
-toml = "0.5"
+tokio = { version = "1", features = ["full"] }
+toml = { workspace = true }
 tracing = { workspace = true }
diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
@@ -5,9 +5,9 @@ authors = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-anyhow = "1.0"
-dirs = "5.0.1"
-sha2 = "0.10"
-tempfile = "3.5"
+anyhow = { workspace = true }
+dirs = { workspace = true }
+sha2 = { workspace = true }
+tempfile = { workspace = true }
 tokio = { version = "1", features = ["rt", "time"] }
-url = "2"
+url = { workspace = true }
diff --git a/crates/componentize/Cargo.toml b/crates/componentize/Cargo.toml
@@ -10,24 +10,24 @@ rust-version.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
-tracing = "0.1"
+tracing = { workspace = true }
 wasm-encoder = "0.200.0"
 wasm-metadata = "0.200.0"
 wasmparser = "0.200.0"
 wit-component = "0.200.0"
 wit-parser = "0.200.0"
 
 [dev-dependencies]
-async-trait = "0.1.77"
-cap-std = "2.0.1"
-rand = "0.8.5"
-rand_chacha = "0.3.1"
-rand_core = "0.6.4"
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0"
-tempfile = "3.10.0"
-tokio = { version = "1.36.0", features = ["macros", "rt", "fs"] }
-toml = "0.8.10"
+async-trait = { workspace = true }
+cap-std = "2.0"
+rand = { workspace = true }
+rand_chacha = "0.3"
+rand_core = "0.6"
+serde = { workspace = true }
+serde_json = { workspace = true }
+tempfile = { workspace = true }
+tokio = { version = "1", features = ["macros", "rt", "fs"] }
+toml = { workspace = true }
 wasmtime = { workspace = true }
 wasmtime-wasi = { workspace = true }
-wat = "1.200.0"
+wat = "1"
diff --git a/crates/componentize/tests/case-helper/Cargo.toml b/crates/componentize/tests/case-helper/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.80"
+anyhow = "1"
 clap = { version = "~4.4", features = ["derive", "env"] }
 getrandom = "0.2.12"
 

diff --git a/crates/componentize/tests/rust-case-0.2/Cargo.toml b/crates/componentize/tests/rust-case-0.2/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.80"
+anyhow = "1"
 wit-bindgen-rust = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "cb871cfa1ee460b51eb1d144b175b9aab9c50aba" }
 case-helper = { path = "../case-helper" }
 

diff --git a/crates/componentize/tests/rust-case-0.8/Cargo.toml b/crates/componentize/tests/rust-case-0.8/Cargo.toml
@@ -8,7 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 case-helper = { path = "../case-helper" }
-anyhow = "1.0.80"
+anyhow = "1"
 wit-bindgen = "0.8"
 
 [workspace]
diff --git a/crates/compose/Cargo.toml b/crates/compose/Cargo.toml
@@ -10,15 +10,14 @@ rust-version.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
-async-trait = "0.1"
-indexmap = "2.2.6"
+async-trait = { workspace = true }
+indexmap = "2"
 semver = "1"
 spin-app = { path = "../app" }
 spin-componentize = { workspace = true }
 spin-serde = { path = "../serde" }
-thiserror = "1"
-tokio = { version = "1.23", features = ["fs"] }
-wac-graph = "0.5.0"
+thiserror = { workspace = true }
+wac-graph = "0.6"
 
 [lints]
 workspace = true
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -5,8 +5,8 @@ authors = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-anyhow = "1.0"
-async-trait = "0.1"
+anyhow = { workspace = true }
+async-trait = { workspace = true }
 tracing = { workspace = true }
 wasmtime = { workspace = true }
 

diff --git a/crates/doctor/Cargo.toml b/crates/doctor/Cargo.toml
@@ -5,23 +5,23 @@ authors = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-anyhow = "1"
-async-trait = "0.1"
-reqwest = { version = "0.11", features = ["stream"] }
-serde = { version = "1", features = ["derive"] }
+anyhow = { workspace = true }
+async-trait = { workspace = true }
+reqwest = { version = "0.12", features = ["stream"] }
+serde = { workspace = true }
 similar = "2"
 spin-common = { path = "../common" }
 spin-manifest = { path = "../manifest" }
-tempfile = "3.3.0"
+tempfile = { workspace = true }
 terminal = { path = "../terminal" }
 tokio = { version = "1", features = ["process"] }
-toml = "0.8.2"
-toml_edit = { version = "0.20.2", features = ["serde"] }
+toml = { workspace = true }
+toml_edit = { version = "0.22", features = ["serde"] }
 tracing = { workspace = true }
 
 [dev-dependencies]
-glob = "0.3.1"
-tempfile = "3"
+glob = { workspace = true }
+tempfile = { workspace = true }
 tokio = { version = "1", features = ["macros", "rt"] }
 ui-testing = { path = "../ui-testing" }
 

diff --git a/crates/doctor/src/lib.rs b/crates/doctor/src/lib.rs
@@ -6,7 +6,7 @@ use std::{collections::VecDeque, fmt::Debug, fs, path::PathBuf};
 use anyhow::{ensure, Context, Result};
 use async_trait::async_trait;
 use spin_common::ui::quoted_path;
-use toml_edit::Document;
+use toml_edit::DocumentMut;
 
 /// Diagnoses for app manifest format problems.
 pub mod manifest;
@@ -81,7 +81,7 @@ pub struct PatientApp {
     /// Path to an app manifest file.
     pub manifest_path: PathBuf,
     /// Parsed app manifest TOML document.
-    pub manifest_doc: Document,
+    pub manifest_doc: DocumentMut,
 }
 
 impl PatientApp {
@@ -100,7 +100,7 @@ impl PatientApp {
             )
         })?;
 
-        let manifest_doc: Document = contents.parse().with_context(|| {
+        let manifest_doc: DocumentMut = contents.parse().with_context(|| {
             format!(
                 "Couldn't parse manifest file at {} as valid TOML",
                 quoted_path(&path)

diff --git a/crates/doctor/src/manifest.rs b/crates/doctor/src/manifest.rs
@@ -3,7 +3,7 @@ use std::fs;
 use anyhow::{Context, Result};
 use async_trait::async_trait;
 use spin_common::ui::quoted_path;
-use toml_edit::Document;
+use toml_edit::DocumentMut;
 
 use crate::Treatment;
 
@@ -22,7 +22,7 @@ pub trait ManifestTreatment {
     fn summary(&self) -> String;
 
     /// Attempt to fix this problem. See [`Treatment::treat`].
-    async fn treat_manifest(&self, doc: &mut Document) -> Result<()>;
+    async fn treat_manifest(&self, doc: &mut DocumentMut) -> Result<()>;
 }
 
 #[async_trait]

diff --git a/crates/doctor/src/manifest/trigger.rs b/crates/doctor/src/manifest/trigger.rs
@@ -1,7 +1,7 @@
 use anyhow::{bail, ensure, Context, Result};
 use async_trait::async_trait;
 use toml::Value;
-use toml_edit::{Document, InlineTable, Item, Table};
+use toml_edit::{DocumentMut, InlineTable, Item, Table};
 
 use crate::{Diagnosis, Diagnostic, PatientApp, Treatment};
 
@@ -149,7 +149,7 @@ impl ManifestTreatment for TriggerDiagnosis {
         }
     }
 
-    async fn treat_manifest(&self, doc: &mut Document) -> anyhow::Result<()> {
+    async fn treat_manifest(&self, doc: &mut DocumentMut) -> anyhow::Result<()> {
         match self {
             Self::MissingAppTrigger => {
                 // Get or insert missing trigger config