Migrating QueueTaskHeartbeat

src/ApiService/ApiService/OneFuzzTypes/Enums.cs

@@ -43,4 +43,67 @@ public enum WebhookMessageState
     Retrying,
     Succeeded,
     Failed
+}
+
+public enum TaskState
+{
+    Init,
+    Waiting,
+    Scheduled,
+    Setting_up,
+    Running,
+    Stopping,
+    Stopped,
+    WaitJob
+}
+
+public enum TaskType
+{
+    Coverage,
+    LibfuzzerFuzz,
+    LibfuzzerCoverage,
+    LibfuzzerCrashReport,
+    LibfuzzerMerge,
+    LibfuzzerRegression,
+    GenericAnalysis,
+    GenericSupervisor,
+    GenericMerge,
+    GenericGenerator,
+    GenericCrashReport,
+    GenericRegression
+}
+
+public enum Os
+{
+    Windows,
+    Linux
+}
+
+public enum ContainerType
+{
+    Analysis,
+    Coverage,
+    Crashes,
+    Inputs,
+    NoRepro,
+    ReadonlyInputs,
+    Reports,
+    Setup,
+    Tools,
+    UniqueInputs,
+    UniqueReports,
+    RegressionReports,
+    Logs
+}
+
+
+public enum StatsFormat
+{
+    AFL
+}
+
+public enum TaskDebugFlag
+{
+    KeepNodeOnFailure,
+    KeepNodeOnCompletion,
 }

src/ApiService/ApiService/OneFuzzTypes/Events.cs

@@ -104,11 +104,11 @@ public EventType GetEventType()
     //    ) : BaseEvent();
 
 
-    //record EventTaskHeartbeat(
-    //    JobId: Guid,
-    //    TaskId: Guid,
-    //    Config: TaskConfig
-    //): BaseEvent();
+    record EventTaskHeartbeat(
+       Guid JobId,
+       Guid TaskId,
+       TaskConfig Config
+    ) : BaseEvent();
 
 
     //record EventPing(

src/ApiService/ApiService/OneFuzzTypes/Model.cs

@@ -2,6 +2,8 @@
 using System;
 using System.Collections.Generic;
 using PoolName = System.String;
+using Region = System.String;
+using Container = System.String;
 
 namespace Microsoft.OneFuzz.Service;
 
@@ -29,9 +31,15 @@ public enum HeartbeatType
     TaskAlive,
 }
 
-public record HeartbeatData(HeartbeatType type);
+public record HeartbeatData(HeartbeatType Type);
 
-public record NodeHeartbeatEntry(Guid NodeId, HeartbeatData[] data);
+public record TaskHeartbeatEntry(
+    Guid TaskId,
+    Guid? JobId,
+    Guid MachineId,
+    HeartbeatData[] Data
+    );
+public record NodeHeartbeatEntry(Guid NodeId, HeartbeatData[] Data);
 
 public record NodeCommandStopIfFree();
 
@@ -79,7 +87,7 @@ public enum NodeState
 
 public record ProxyHeartbeat
 (
-    string Region,
+    Region Region,
     Guid ProxyId,
     List<ProxyForward> Forwards,
     DateTimeOffset TimeStamp
@@ -102,35 +110,35 @@ bool DebugKeepNode
 
 
 public partial record ProxyForward
-(
-    [PartitionKey] string Region,
+(
+    [PartitionKey] Region Region,
     [RowKey] int DstPort,
-    int SrcPort,
+    int SrcPort,
     string DstIp
 ) : EntityBase();
 
-public partial record ProxyConfig
-(
-    Uri Url,
-    string Notification,
-    string Region,
-    Guid? ProxyId,
-    List<ProxyForward> Forwards,
-    string InstanceTelemetryKey,
+public partial record ProxyConfig
+(
+    Uri Url,
+    string Notification,
+    Region Region,
+    Guid? ProxyId,
+    List<ProxyForward> Forwards,
+    string InstanceTelemetryKey,
     string MicrosoftTelemetryKey
 
 );
 
 public partial record Proxy
 (
-    [PartitionKey] string Region,
+    [PartitionKey] Region Region,
     [RowKey] Guid ProxyId,
     DateTimeOffset? CreatedTimestamp,
-    VmState State,
-    Authentication Auth,
-    string? Ip,
-    Error? Error,
-    string Version,
+    VmState State,
+    Authentication Auth,
+    string? Ip,
+    Error? Error,
+    string Version,
     ProxyHeartbeat? heartbeat
 ) : EntityBase();
 
@@ -148,23 +156,102 @@ String InstanceName
 ) : EntityBase();
 
 
-//record AnyHttpUrl(AnyUrl):
-//    allowed_schemes = {'http', 'https
-//
-
-
+public record TaskDetails(
+
+    TaskType Type,
+    int Duration,
+    string? TargetExe,
+    Dictionary<string, string>? TargetEnv,
+    List<string>? TargetOptions,
+    int? TargetWorkers,
+    bool? TargetOptionsMerge,
+    bool? CheckAsanLog,
+    bool? CheckDebugger,
+    int? CheckRetryCount,
+    bool? CheckFuzzerHelp,
+    bool? ExpectCrashOnFailure,
+    bool? RenameOutput,
+    string? SupervisorExe,
+    Dictionary<string, string>? SupervisorEnv,
+    List<string>? SupervisorOptions,
+    string? SupervisorInputMarker,
+    string? GeneratorExe,
+    Dictionary<string, string>? GeneratorEnv,
+    List<string>? GeneratorOptions,
+    string? AnalyzerExe,
+    Dictionary<string, string>? AnalyzerEnv,
+    List<string> AnalyzerOptions,
+    ContainerType? WaitForFiles,
+    string? StatsFile,
+    StatsFormat? StatsFormat,
+    bool? RebootAfterSetup,
+    int? TargetTimeout,
+    int? EnsembleSyncDelay,
+    bool? PreserveExistingOutputs,
+    List<string>? ReportList,
+    int? MinimizedStackDepth,
+    string? CoverageFilter
+);
 
+public record TaskVm(
+    Region Region,
+    string Sku,
+    string Image,
+    int Count,
+    bool SpotInstance,
+    bool? RebootAfterSetup
+);
 
+public record TaskPool(
+    int Count,
+    PoolName PoolName
+);
 
-//public record TaskConfig(
-//    Guid jobId,
-//    List<Guid> PrereqTasks,
-//    TaskDetails Task,
-//    TaskVm? vm,
-//    TaskPool pool: Optional[]
-//    containers: List[TaskContainers]
-//    tags: Dict[str, str]
-//    debug: Optional[List[TaskDebugFlag]]
-//    colocate: Optional[bool]
-//    ): EntityBase();
+public record TaskContainers(
+    ContainerType Type,
+    Container Name
+);
+public record TaskConfig(
+   Guid JobId,
+   List<Guid>? PrereqTasks,
+   TaskDetails Task,
+   TaskVm? Vm,
+   TaskPool? Pool,
+   List<TaskContainers>? Containers,
+   Dictionary<string, string>? Tags,
+   List<TaskDebugFlag>? Debug,
+   bool? Colocate
+   );
+
+
+public record TaskEventSummary(
+    DateTimeOffset? Timestamp,
+    string EventData,
+    string EventType
+    );
+
+
+public record NodeAssignment(
+    Guid NodeId,
+    Guid? ScalesetId,
+    NodeTaskState State
+    );
+
+
+public record Task(
+    // Timestamp: Optional[datetime] = Field(alias="Timestamp")
+    [PartitionKey] Guid JobId,
+    [RowKey] Guid TaskId,
+    TaskState State,
+    Os Os,
+    TaskConfig Config,
+    Error? Error,
+    Authentication? Auth,
+    DateTimeOffset? Heartbeat,
+    DateTimeOffset? EndTime,
+    UserInfo? UserInfo) : EntityBase()
+{
+    List<TaskEventSummary> Events { get; set; } = new List<TaskEventSummary>();
+    List<NodeAssignment> Nodes { get; set; } = new List<NodeAssignment>();
 
+}

src/ApiService/ApiService/Program.cs

@@ -1,10 +1,14 @@
+// to avoid collision with Task in model.cs
+global using Async = System.Threading.Tasks;
+
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OneFuzz.Service.OneFuzzLib.Orm;
 using ApiService.OneFuzzLib;
 
+
+
 namespace Microsoft.OneFuzz.Service;
 
 public class Program
@@ -34,11 +38,11 @@ public static void Main()
         .ConfigureServices((context, services) =>
             services
             .AddSingleton<ILogTracerFactory>(_ => new LogTracerFactory(GetLoggers()))
-            .AddSingleton<IStorageProvider>(_ => new StorageProvider(EnvironmentVariables.OneFuzz.FuncStorage ?? throw new InvalidOperationException("Missing account id")))
             .AddSingleton<INodeOperations, NodeOperations>()
             .AddSingleton<IEvents, Events>()
             .AddSingleton<IWebhookOperations, WebhookOperations>()
             .AddSingleton<IWebhookMessageLogOperations, WebhookMessageLogOperations>()
+            .AddSingleton<ITaskOperations, TaskOperations>()
             .AddSingleton<IQueue, Queue>()
             .AddSingleton<ICreds>(_ => new Creds())
             .AddSingleton<IStorage, Storage>()

src/ApiService/ApiService/QueueFileChanges.cs

@@ -2,7 +2,6 @@
 using Microsoft.Azure.Functions.Worker;
 using System.Collections.Generic;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Microsoft.OneFuzz.Service.OneFuzzLib.Orm;
 using System.Linq;
 
@@ -15,19 +14,17 @@ public class QueueFileChanges
     const int MAX_DEQUEUE_COUNT = 5;
 
     private readonly ILogTracerFactory _loggerFactory;
-    private readonly IStorageProvider _storageProvider;
 
     private readonly IStorage _storage;
 
-    public QueueFileChanges(ILogTracerFactory loggerFactory, IStorageProvider storageProvider, IStorage storage)
+    public QueueFileChanges(ILogTracerFactory loggerFactory, IStorage storage)
     {
         _loggerFactory = loggerFactory;
-        _storageProvider = storageProvider;
         _storage = storage;
     }
 
     [Function("QueueFileChanges")]
-    public Task Run(
+    public Async.Task Run(
         [QueueTrigger("file-changes-refactored", Connection = "AzureWebJobsStorage")] string msg,
         int dequeueCount)
     {
@@ -42,18 +39,18 @@ public Task Run(
         if (!fileChangeEvent.ContainsKey(eventType)
             || fileChangeEvent[eventType] != "Microsoft.Storage.BlobCreated")
         {
-            return Task.CompletedTask;
+            return Async.Task.CompletedTask;
         }
 
         const string topic = "topic";
         if (!fileChangeEvent.ContainsKey(topic)
             || !_storage.CorpusAccounts(log).Contains(fileChangeEvent[topic]))
         {
-            return Task.CompletedTask;
+            return Async.Task.CompletedTask;
         }
 
         file_added(log, fileChangeEvent, lastTry);
-        return Task.CompletedTask;
+        return Async.Task.CompletedTask;
     }
 
     private void file_added(ILogTracer log, Dictionary<string, string> fileChangeEvent, bool failTaskOnTransientError)

src/ApiService/ApiService/QueueNodeHearbeat.cs

@@ -1,7 +1,6 @@
 using System;
 using Microsoft.Azure.Functions.Worker;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Microsoft.OneFuzz.Service.OneFuzzLib.Orm;
 
 namespace Microsoft.OneFuzz.Service;
@@ -22,7 +21,7 @@ public QueueNodeHearbeat(ILogTracerFactory loggerFactory, INodeOperations nodes,
     }
 
     [Function("QueueNodeHearbeat")]
-    public async Task Run([QueueTrigger("myqueue-items", Connection = "AzureWebJobsStorage")] string msg)
+    public async Async.Task Run([QueueTrigger("myqueue-items", Connection = "AzureWebJobsStorage")] string msg)
     {
         var log = _loggerFactory.MakeLogTracer(Guid.NewGuid());
         log.Info($"heartbeat: {msg}");