Merge branch 'main' into 8.6.3-Hotfix

Author: AdamL-Microsoft

contrib/deploy-onefuzz-via-azure-devops/Pipfile.lock

@@ -135,10 +135,14 @@ private async Task<HttpResponseData> Get(HttpRequestData req) {
 
             static JobTaskInfo TaskToJobTaskInfo(Task t) => new(t.TaskId, t.Config.Task.Type, t.State);
 
-            // TODO: search.WithTasks is not checked in Python code?
-
-            var taskInfo = await _context.TaskOperations.SearchStates(jobId).Select(TaskToJobTaskInfo).ToListAsync();
-            return await RequestHandling.Ok(req, JobResponse.ForJob(job, taskInfo));
+            var tasks = _context.TaskOperations.SearchStates(jobId);
+            if (search.WithTasks ?? false) {
+                var ts = await tasks.ToListAsync();
+                return await RequestHandling.Ok(req, JobResponse.ForJob(job, ts));
+            } else {
+                var taskInfo = await tasks.Select(TaskToJobTaskInfo).ToListAsync();
+                return await RequestHandling.Ok(req, JobResponse.ForJob(job, taskInfo));
+            }
         }
 
         var jobs = await _context.JobOperations.SearchState(states: search.State ?? Enumerable.Empty<JobState>()).ToListAsync();

src/ApiService/ApiService/Functions/Jobs.cs

@@ -282,7 +282,8 @@ public record Task(
     ISecret<Authentication>? Auth = null,
     DateTimeOffset? Heartbeat = null,
     DateTimeOffset? EndTime = null,
-    StoredUserInfo? UserInfo = null) : StatefulEntityBase<TaskState>(State) {
+    StoredUserInfo? UserInfo = null) : StatefulEntityBase<TaskState>(State), IJobTaskInfo {
+    public TaskType Type => Config.Task.Type;
 }
 
 public record TaskEvent(
@@ -909,11 +910,19 @@ public JobConfig Truncate(int maxLength) {
     }
 }
 
+[JsonDerivedType(typeof(Task), typeDiscriminator: "Task")]
+[JsonDerivedType(typeof(JobTaskInfo), typeDiscriminator: "JobTaskInfo")]
+public interface IJobTaskInfo {
+    Guid TaskId { get; }
+    TaskType Type { get; }
+    TaskState State { get; }
+}
+
 public record JobTaskInfo(
     Guid TaskId,
     TaskType Type,
     TaskState State
-);
+) : IJobTaskInfo;
 
 public record Job(
     [PartitionKey][RowKey] Guid JobId,

src/ApiService/ApiService/OneFuzzTypes/Model.cs

@@ -96,13 +96,13 @@ public record JobResponse(
     JobConfig Config,
     string? Error,
     DateTimeOffset? EndTime,
-    List<JobTaskInfo>? TaskInfo,
+    IEnumerable<IJobTaskInfo>? TaskInfo,
     StoredUserInfo? UserInfo,
     [property: JsonPropertyName("Timestamp")] // must retain capital T for backcompat
     DateTimeOffset? Timestamp
 // not including UserInfo from Job model
 ) : BaseResponse() {
-    public static JobResponse ForJob(Job j, List<JobTaskInfo>? taskInfo)
+    public static JobResponse ForJob(Job j, IEnumerable<IJobTaskInfo>? taskInfo)
         => new(
             JobId: j.JobId,
             State: j.State,

src/ApiService/ApiService/OneFuzzTypes/Responses.cs

@@ -175,4 +175,55 @@ public async Async.Task Post_CreatesJob_AndContainer() {
         var metadata = Assert.Single(container.Value);
         Assert.Equal(new KeyValuePair<string, string>("container_type", "logs"), metadata);
     }
+
+
+    [Fact]
+    public async Async.Task Get_CanFindSpecificJobWithTaskInfo() {
+
+        var taskConfig = new TaskConfig(_jobId, new List<Guid>(), new TaskDetails(TaskType.Coverage, 60));
+        var task = new Task(_jobId, Guid.NewGuid(), TaskState.Running, Os.Windows, taskConfig);
+
+        await Context.InsertAll(
+            new Job(_jobId, JobState.Stopped, _config, null), task);
+
+        var func = new Jobs(Context, LoggerProvider.CreateLogger<Jobs>());
+
+        var ctx = new TestFunctionContext();
+        var result = await func.Run(TestHttpRequestData.FromJson("GET", new JobSearch(JobId: _jobId, WithTasks: false)), ctx);
+        Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+
+        var response = BodyAs<JobResponse>(result);
+        Assert.Equal(_jobId, response.JobId);
+        Assert.NotNull(response.TaskInfo);
+        var returnedTasks = response.TaskInfo.OfType<JobTaskInfo>().ToList();
+        Assert.NotEmpty(returnedTasks);
+        Assert.Equal(task.TaskId, returnedTasks[0].TaskId);
+        Assert.Equal(task.State, returnedTasks[0].State);
+        Assert.Equal(task.Config.Task.Type, returnedTasks[0].Type);
+    }
+
+    [Fact]
+    public async Async.Task Get_CanFindSpecificJobWithFullTask() {
+        var taskConfig = new TaskConfig(_jobId, new List<Guid>(), new TaskDetails(TaskType.Coverage, 60));
+        var task = new Task(_jobId, Guid.NewGuid(), TaskState.Running, Os.Windows, taskConfig);
+
+        await Context.InsertAll(
+            new Job(_jobId, JobState.Stopped, _config, null), task);
+
+        var func = new Jobs(Context, LoggerProvider.CreateLogger<Jobs>());
+
+        var ctx = new TestFunctionContext();
+        var result = await func.Run(TestHttpRequestData.FromJson("GET", new JobSearch(JobId: _jobId, WithTasks: true)), ctx);
+        Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+
+        var response = BodyAs<JobResponse>(result);
+        Assert.Equal(_jobId, response.JobId);
+        Assert.NotNull(response.TaskInfo);
+        var returnedTasks = response.TaskInfo.OfType<Task>().ToList();
+        Assert.NotEmpty(returnedTasks);
+        Assert.Equal(task.TaskId, returnedTasks[0].TaskId);
+        Assert.Equal(task.State, returnedTasks[0].State);
+        Assert.Equal(task.Config.Task.Type, returnedTasks[0].Type);
+
+    }
 }

src/ApiService/IntegrationTests/JobsTests.cs

@@ -13,7 +13,6 @@ members = [
     "onefuzz-file-format",
     "onefuzz-telemetry",
     "reqwest-retry",
-    "srcview",
     "storage-queue",
     "win-util",
     "libclusterfuzz",

src/agent/Cargo.lock

@@ -22,6 +22,7 @@ features = [
     "dbghelp",
     "debugapi",
     "handleapi",
+    "impl-default",
     "memoryapi",
     "namedpipeapi",
     "processthreadsapi",

src/agent/Cargo.toml

@@ -278,8 +278,10 @@ impl LibFuzzer {
 
         if !result.status.success() {
             bail!(
-                "libFuzzer failed when parsing an initial seed {:?}: stdout:{:?} stderr:{:?}",
+                "libFuzzer failed when parsing an initial seed {:?}: cmd:{:?} exit_code: {:?} stdout:{:?} stderr:{:?}",
                 input.file_name().unwrap_or_else(|| input.as_ref()),
+                cmd,
+                result.status,
                 String::from_utf8_lossy(&result.stdout),
                 String::from_utf8_lossy(&result.stderr),
             );