ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-22 14:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some response-only properties from the Task model (#2335)

Browse Source
This commit is contained in:
George Pollard
2022-09-02 11:33:04 +12:00
committed by GitHub
parent 440f19baeb
commit 52ba57bf0d
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ApiService/ApiService/Functions/Tasks.cs
View File

@ -1,4 +1,5 @@
using System.Net;
using System.Threading.Tasks;
using Microsoft.Azure.Functions.Worker;
using Microsoft.Azure.Functions.Worker.Http;
@ -31,20 +32,36 @@ public class Tasks {
return await _context.RequestHandling.NotOk(req, request.ErrorV, "task get");
}
if (request.OkV.TaskId != null) {
var task = await _context.TaskOperations.GetByTaskId(request.OkV.TaskId.Value);
if (request.OkV.TaskId is Guid taskId) {
var task = await _context.TaskOperations.GetByTaskId(taskId);
if (task == null) {
return await _context.RequestHandling.NotOk(req, new Error(ErrorCode.INVALID_REQUEST, new[] { "unable to find task"
}), "task get");
return await _context.RequestHandling.NotOk(
req,
new Error(
ErrorCode.INVALID_REQUEST,
new[] { "unable to find task" }),
"task get");
}
task.Nodes = await _context.NodeTasksOperations.GetNodeAssignments(request.OkV.TaskId.Value).ToListAsync();
task.Events = await _context.TaskEventOperations.GetSummary(request.OkV.TaskId.Value).ToListAsync();
var response = req.CreateResponse(HttpStatusCode.OK);
await response.WriteAsJsonAsync(task);
return response;
var (nodes, events) = await (
_context.NodeTasksOperations.GetNodeAssignments(taskId).ToListAsync().AsTask(),
_context.TaskEventOperations.GetSummary(taskId).ToListAsync().AsTask());
var result = new TaskSearchResult(
JobId: task.JobId,
TaskId: task.TaskId,
State: task.State,
Os: task.Os,
Config: task.Config,
Error: task.Error,
Auth: task.Auth,
Heartbeat: task.Heartbeat,
EndTime: task.EndTime,
UserInfo: task.UserInfo,
Nodes: nodes,
Events: events);
return await RequestHandling.Ok(req, result);
}
var tasks = await _context.TaskOperations.SearchAll().ToListAsync();

2
src/ApiService/ApiService/OneFuzzTypes/Model.cs
View File

@ -256,8 +256,6 @@ public record Task(
DateTimeOffset? Heartbeat = null,
DateTimeOffset? EndTime = null,
UserInfo? UserInfo = null) : StatefulEntityBase<TaskState>(State) {
public List<TaskEventSummary> Events { get; set; } = new List<TaskEventSummary>();
public List<NodeAssignment> Nodes { get; set; } = new List<NodeAssignment>();
}
public record TaskEvent(

15
src/ApiService/ApiService/OneFuzzTypes/Responses.cs
View File

@ -35,6 +35,21 @@ public record NodeSearchResult(
bool DebugKeepNode
) : BaseResponse();
public record TaskSearchResult(
Guid JobId,
Guid TaskId,
TaskState State,
Os Os,
TaskConfig Config,
Error? Error,
Authentication? Auth,
DateTimeOffset? Heartbeat,
DateTimeOffset? EndTime,
UserInfo? UserInfo,
List<TaskEventSummary> Events,
List<NodeAssignment> Nodes
) : BaseResponse();
public record BoolResult(
bool Result
) : BaseResponse();