Merge pull request #330 from microsoft/main

Fork Sync: Update from parent repository

Author: AdamL-Microsoft

src/agent/Cargo.lock

@@ -31,6 +31,15 @@ onefuzz-telemetry = { path = "../onefuzz-telemetry" }
 backtrace = "0.3"
 ipc-channel = { git = "https://github.com/servo/ipc-channel", rev = "7f432aa" }
 dynamic-library = { path = "../dynamic-library" }
+azure_core = { version = "0.11", default-features = false, features = [
+    "enable_reqwest",
+] }
+azure_storage = { version = "0.11", default-features = false, features = [
+    "enable_reqwest",
+] }
+azure_storage_blobs = { version = "0.11", default-features = false, features = [
+    "enable_reqwest",
+] }
 
 
 [target.'cfg(target_family = "unix")'.dependencies]

src/agent/onefuzz-agent/Cargo.toml

@@ -255,7 +255,8 @@ impl Agent {
             .await?;
         Ok(Self {
             previous_state: previous,
-            scheduler: Some(state.run().await?.into()),
+
+            scheduler: Some(state.run(self.machine_id).await?.into()),
             ..self
         })
     }

src/agent/onefuzz-agent/src/agent.rs

@@ -21,7 +21,7 @@ impl Fixture {
     pub fn agent(&self) -> Agent {
         let coordinator = Box::<CoordinatorDouble>::default();
         let reboot = Box::<RebootDouble>::default();
-        let scheduler = Scheduler::new();
+        let scheduler = Scheduler::new(None);
         let setup_runner = Box::<SetupRunnerDouble>::default();
         let work_queue = Box::<WorkQueueDouble>::default();
         let worker_runner = Box::<WorkerRunnerDouble>::default();
@@ -72,7 +72,7 @@ impl Fixture {
     }
 
     pub fn work_unit(&self) -> WorkUnit {
-        let config = r#"{ "hello": "world" }"#.to_owned().into();
+        let config = r#"{ "hello": "world", "task_id" : "ed1eeec9-2f39-442d-9e70-563454b866c0", "instance_id": "5220ff9b-2ab2-4cf8-b9ad-b948c3b94f08"  }"#.to_owned().into();
 
         WorkUnit {
             job_id: self.job_id(),

src/agent/onefuzz-agent/src/agent/tests.rs

@@ -193,8 +193,9 @@ async fn run_worker(mut work_set: WorkSet) -> Result<Vec<WorkerEvent>> {
     let work_unit = work_set.work_units.pop().unwrap();
     let setup_dir = work_set.setup_dir()?;
     let extra_dir = work_set.extra_dir()?;
+    let work_dir = work_unit.working_dir(setup_runner.machine_id)?;
 
-    let mut worker = Worker::new(&setup_dir, extra_dir, work_unit);
+    let mut worker = Worker::new(work_dir, &setup_dir, extra_dir, work_unit);
     while !worker.is_done() {
         worker = worker
             .update(