diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 2bf6882c3..fdee0ea95 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -61,7 +61,7 @@ dependencies = [ "serde_json", "sm", "tokio", - "uuid 1.2.1", + "uuid", ] [[package]] @@ -143,7 +143,7 @@ dependencies = [ "serde_json", "time", "url", - "uuid 1.2.1", + "uuid", ] [[package]] @@ -166,7 +166,7 @@ dependencies = [ "sha2", "time", "url", - "uuid 1.2.1", + "uuid", ] [[package]] @@ -187,7 +187,7 @@ dependencies = [ "serde_json", "time", "url", - "uuid 1.2.1", + "uuid", ] [[package]] @@ -674,7 +674,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "uuid 1.2.1", + "uuid", ] [[package]] @@ -1445,7 +1445,7 @@ dependencies = [ "rand 0.7.3", "serde", "tempfile", - "uuid 1.2.1", + "uuid", "winapi 0.3.9", ] @@ -1967,7 +1967,7 @@ dependencies = [ "url", "url-escape", "urlparse", - "uuid 0.8.2", + "uuid", "winapi 0.3.9", "winreg 0.10.1", ] @@ -1997,7 +1997,7 @@ dependencies = [ "tokio", "url", "users", - "uuid 0.8.2", + "uuid", "winapi 0.3.9", ] @@ -2060,7 +2060,7 @@ dependencies = [ "tokio-util 0.7.2", "tui", "url", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -2074,7 +2074,7 @@ dependencies = [ "log", "serde", "tokio", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -2243,7 +2243,7 @@ checksum = "82040a392923abe6279c00ab4aff62d5250d1c8555dc780e4b02783a7aa74863" dependencies = [ "fallible-iterator", "scroll", - "uuid 1.2.1", + "uuid", ] [[package]] @@ -3054,7 +3054,7 @@ dependencies = [ "serde_derive", "serde_json", "tokio", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -3123,7 +3123,7 @@ dependencies = [ "debugid", "memmap2", "stable_deref_trait", - "uuid 1.2.1", + "uuid", ] [[package]] @@ -3180,7 +3180,7 @@ dependencies = [ "indexmap", "symbolic-common", "thiserror", - "uuid 1.2.1", + "uuid", "watto", ] @@ -3548,23 +3548,14 @@ dependencies = [ [[package]] name = "uuid" -version = "0.8.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "getrandom 0.2.3", "serde", ] -[[package]] -name = "uuid" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" -dependencies = [ - "getrandom 0.2.3", -] - [[package]] name = "vcpkg" version = "0.2.15" diff --git a/src/agent/onefuzz-agent/Cargo.toml b/src/agent/onefuzz-agent/Cargo.toml index 943ade7fa..824601d6a 100644 --- a/src/agent/onefuzz-agent/Cargo.toml +++ b/src/agent/onefuzz-agent/Cargo.toml @@ -24,13 +24,13 @@ serde_json = "1.0" storage-queue = { path = "../storage-queue" } tokio = { version = "1.24", features = ["full"] } url = { version = "2.3", features = ["serde"] } -uuid = { version = "0.8", features = ["serde", "v4"] } +uuid = { version = "1.3", features = ["serde", "v4"] } clap = { version = "4", features = ["derive", "cargo"] } reqwest-retry = { path = "../reqwest-retry" } onefuzz-telemetry = { path = "../onefuzz-telemetry" } backtrace = "0.3" ipc-channel = { git = "https://github.com/servo/ipc-channel", rev = "7f432aa" } -dynamic-library = {path = "../dynamic-library" } +dynamic-library = { path = "../dynamic-library" } [target.'cfg(target_family = "unix")'.dependencies] diff --git a/src/agent/onefuzz-task/Cargo.toml b/src/agent/onefuzz-task/Cargo.toml index e17fc7248..1240c0bfd 100644 --- a/src/agent/onefuzz-task/Cargo.toml +++ b/src/agent/onefuzz-task/Cargo.toml @@ -50,7 +50,7 @@ tokio-util = { version = "0.7", features = ["full"] } tokio-stream = "0.1" tui = { version = "0.19", default-features = false, features = ['crossterm'] } url = { version = "2.3", features = ["serde"] } -uuid = { version = "0.8", features = ["serde", "v4"] } +uuid = { version = "1.3", features = ["serde", "v4"] } chrono = { version = "0.4", default-features = false, features = [ "clock", "std", diff --git a/src/agent/onefuzz-telemetry/Cargo.toml b/src/agent/onefuzz-telemetry/Cargo.toml index ca75f20f8..f73ef031b 100644 --- a/src/agent/onefuzz-telemetry/Cargo.toml +++ b/src/agent/onefuzz-telemetry/Cargo.toml @@ -8,9 +8,12 @@ license = "MIT" [dependencies] anyhow = "1.0" appinsights = { version = "0.2.3" } -chrono = { version = "0.4", default-features = false, features = ["clock", "std"] } +chrono = { version = "0.4", default-features = false, features = [ + "clock", + "std", +] } lazy_static = "1.4" log = "0.4" serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.24", features = ["full"] } -uuid = { version = "0.8", features = ["serde", "v4"] } +uuid = { version = "1.3", features = ["serde", "v4"] } diff --git a/src/agent/onefuzz/Cargo.toml b/src/agent/onefuzz/Cargo.toml index bc5ef795d..abcd4ed0b 100644 --- a/src/agent/onefuzz/Cargo.toml +++ b/src/agent/onefuzz/Cargo.toml @@ -34,7 +34,7 @@ serde_derive = "1.0" tokio = { version = "1.24", features = ["full"] } tokio-stream = { version = "0.1", features = ["fs", "time", "tokio-util"] } tokio-util = { version = "0.7", features = ["full"] } -uuid = { version = "0.8", features = ["serde", "v4"] } +uuid = { version = "1.3", features = ["serde", "v4"] } urlparse = "0.7" url-escape = "0.1.0" storage-queue = { path = "../storage-queue" } diff --git a/src/agent/onefuzz/src/auth.rs b/src/agent/onefuzz/src/auth.rs index 4e3c865d7..687277cb6 100644 --- a/src/agent/onefuzz/src/auth.rs +++ b/src/agent/onefuzz/src/auth.rs @@ -137,7 +137,7 @@ impl ClientCredentials { let response = reqwest::Client::new() .post(url) .form(&[ - ("client_id", self.client_id.to_hyphenated().to_string()), + ("client_id", self.client_id.hyphenated().to_string()), ("client_secret", self.client_secret.expose_ref().to_string()), ("grant_type", "client_credentials".into()), ("tenant", authority), diff --git a/src/agent/onefuzz/src/expand.rs b/src/agent/onefuzz/src/expand.rs index d06927946..5973de024 100644 --- a/src/agent/onefuzz/src/expand.rs +++ b/src/agent/onefuzz/src/expand.rs @@ -331,12 +331,12 @@ impl<'a> Expand<'a> { } pub fn task_id(self, arg: &Uuid) -> Self { - let value = arg.to_hyphenated().to_string(); + let value = arg.hyphenated().to_string(); self.set_value(PlaceHolder::TaskId, ExpandedValue::Scalar(value)) } pub fn job_id(self, arg: &Uuid) -> Self { - let value = arg.to_hyphenated().to_string(); + let value = arg.hyphenated().to_string(); self.set_value(PlaceHolder::JobId, ExpandedValue::Scalar(value)) } diff --git a/src/agent/storage-queue/Cargo.toml b/src/agent/storage-queue/Cargo.toml index ead5db3fe..5a6745f9f 100644 --- a/src/agent/storage-queue/Cargo.toml +++ b/src/agent/storage-queue/Cargo.toml @@ -28,4 +28,4 @@ serde_json = "1.0" bincode = "1.3" tokio = { version = "1.24", features = ["full"] } queue-file = "1.4" -uuid = { version = "0.8", features = ["serde", "v4"] } +uuid = { version = "1.3", features = ["serde", "v4"] } diff --git a/src/proxy-manager/Cargo.lock b/src/proxy-manager/Cargo.lock index 529a8155e..4549c982f 100644 --- a/src/proxy-manager/Cargo.lock +++ b/src/proxy-manager/Cargo.lock @@ -37,7 +37,7 @@ dependencies = [ "serde_json", "sm", "tokio", - "uuid 1.2.1", + "uuid", ] [[package]] @@ -100,9 +100,9 @@ checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" dependencies = [ "serde", ] @@ -784,7 +784,7 @@ dependencies = [ "thiserror", "tokio", "url", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -798,7 +798,7 @@ dependencies = [ "log", "serde", "tokio", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -1342,7 +1342,7 @@ dependencies = [ "serde_derive", "serde_json", "tokio", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -1600,23 +1600,14 @@ dependencies = [ [[package]] name = "uuid" -version = "0.8.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "getrandom", "serde", ] -[[package]] -name = "uuid" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" -dependencies = [ - "getrandom", -] - [[package]] name = "vcpkg" version = "0.2.15" diff --git a/src/proxy-manager/Cargo.toml b/src/proxy-manager/Cargo.toml index 484e6a3a6..216f08772 100644 --- a/src/proxy-manager/Cargo.toml +++ b/src/proxy-manager/Cargo.toml @@ -29,6 +29,6 @@ tokio = { version = "1.27", features = [ url = { version = "2.3", features = ["serde"] } reqwest-retry = { path = "../agent/reqwest-retry" } onefuzz-telemetry = { path = "../agent/onefuzz-telemetry" } -uuid = "0.8" +uuid = { version = "1.3", features = ["serde"] } log = "0.4" tempfile = "3.4.0"