Merge pull request #271 from microsoft/main

Fork Sync: Update from parent repository

Author: AdamL-Microsoft

src/agent/Cargo.lock

@@ -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]

src/agent/onefuzz-agent/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",

src/agent/onefuzz-task/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"] }

src/agent/onefuzz-telemetry/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" }

src/agent/onefuzz/Cargo.toml

@@ -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),

src/agent/onefuzz/src/auth.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))
     }
 

src/agent/onefuzz/src/expand.rs

@@ -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"] }

src/agent/storage-queue/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"