Coverage task works

Author: tevoinea

src/agent/onefuzz-task/src/local/libfuzzer_basic.yml

@@ -7,6 +7,7 @@
 #     * ./etc/scaleset_name -> Where I wrote the value `local`         / ----- These 2 allow us to omit setting ONEFUZZ_ROOT env var
 #     * ./inputs/
 #     * ./crashes/
+#     * ./coverage/
 #     Ideally (in my opinion), this folder/file setup should be automated but remain configurable if desired
 # 3. Install llvm and export LLVM_SYMBOLIZER_PATH like we do in setup.sh
 
@@ -35,10 +36,10 @@ tasks:
   #   minimized_stack_depth: ""
   #   check_queue: ""
 
-  # - type: "Coverage"
-  #   <<: *target_args
-  #   input_queue:
-  #     path: "./coverage"
-  #   readonly_inputs: []
-  #   module_allowlist: ""
-  #   source_allowlist: ""
+  - type: "Coverage"
+    <<: *target_args
+    target_options:
+      - "{input}"
+    input_queue: "./inputs"
+    readonly_inputs: []
+    coverage: "./coverage"

src/agent/onefuzz-task/src/local/schema.json

@@ -106,16 +106,7 @@
       }
     },
     "FolderWatch": {
-      "type": "object",
-      "required": [
-        "path"
-      ],
-      "properties": {
-        "path": {
-          "description": "The path to watch",
-          "type": "string"
-        }
-      }
+      "type": "string"
     },
     "TaskConfig": {
       "oneOf": [
@@ -286,8 +277,7 @@
           ],
           "properties": {
             "coverage": {
-              "type": "string",
-              "default": "./onefuzz_coverage.json"
+              "type": "string"
             },
             "input_queue": {
               "anyOf": [

src/agent/onefuzz-task/src/local/template.rs

@@ -131,7 +131,7 @@ struct Coverage {
     target_timeout: Option<u64>,
     module_allowlist: Option<String>,
     source_allowlist: Option<String>,
-    input_queue: Option<FolderWatch>,
+    input_queue: FolderWatch,
     readonly_inputs: Vec<PathBuf>,
     coverage: PathBuf,
 }
@@ -194,22 +194,17 @@ impl TaskConfig {
                     })
                     .collect();
 
-                let input_q_fut: OptionFuture<_> = config
-                    .input_queue
-                    .iter()
-                    .map(|w| context.monitor_dir(w))
-                    .next()
-                    .into();
+                let input_q_fut = context.monitor_dir(&config.input_queue);
 
-                let input_q = input_q_fut.await.transpose()?;
+                let input_q = input_q_fut.await?;
 
                 let coverage_config = crate::tasks::coverage::generic::Config {
                     target_exe: config.target_exe.clone(),
                     target_env: config.target_env.clone(),
                     target_options: config.target_options.clone(),
                     target_timeout: None,
                     readonly_inputs: ri?,
-                    input_queue: input_q,
+                    input_queue: Some(input_q),
                     common: CommonConfig {
                         task_id: uuid::Uuid::new_v4(),
                         ..context.common.clone()