C# Refactor For Webhook Queue

src/ApiService/ApiService/ApiService.csproj

@@ -44,4 +44,4 @@
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </None>
   </ItemGroup>
-</Project>
+</Project>

src/ApiService/ApiService/HttpClient.cs

@@ -47,18 +47,18 @@ public async Task<HttpResponseMessage> Delete(Uri url) {
     public async Task<HttpResponseMessage> Post(Uri url, String json, IDictionary<string, string>? headers = null) {
         using var b = new StringContent(json);
         b.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
-        return await Send(method: HttpMethod.Post, url: url, headers: headers);
+        return await Send(method: HttpMethod.Post, content: b, url: url, headers: headers);
     }
 
     public async Task<HttpResponseMessage> Put(Uri url, String json, IDictionary<string, string>? headers = null) {
         using var b = new StringContent(json);
         b.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
-        return await Send(method: HttpMethod.Put, url: url, headers: headers);
+        return await Send(method: HttpMethod.Put, content: b, url: url, headers: headers);
     }
 
     public async Task<HttpResponseMessage> Patch(Uri url, String json, IDictionary<string, string>? headers = null) {
         using var b = new StringContent(json);
         b.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
-        return await Send(method: HttpMethod.Patch, url: url, headers: headers);
+        return await Send(method: HttpMethod.Patch, content: b, url: url, headers: headers);
     }
 }

src/ApiService/ApiService/Log.cs

@@ -105,7 +105,7 @@ public interface ILogTracer {
     void Critical(string message);
     void Error(string message);
     void Event(string evt, IReadOnlyDictionary<string, double>? metrics);
-    void Exception(Exception ex, IReadOnlyDictionary<string, double>? metrics);
+    void Exception(Exception ex, IReadOnlyDictionary<string, double>? metrics = null);
     void ForceFlush();
     void Info(string message);
     void Warning(string message);

src/ApiService/ApiService/OneFuzzTypes/Events.cs

@@ -45,6 +45,7 @@ public EventType GetEventType() {
             this switch {
                 EventNodeHeartbeat _ => EventType.NodeHeartbeat,
                 EventTaskHeartbeat _ => EventType.TaskHeartbeat,
+                EventPing _ => EventType.Ping,
                 EventInstanceConfigUpdated _ => EventType.InstanceConfigUpdated,
                 EventProxyCreated _ => EventType.ProxyCreated,
                 EventProxyDeleted _ => EventType.ProxyDeleted,
@@ -66,6 +67,7 @@ public static Type GetTypeInfo(EventType eventType) {
             EventType.NodeHeartbeat => typeof(EventNodeHeartbeat),
             EventType.InstanceConfigUpdated => typeof(EventInstanceConfigUpdated),
             EventType.TaskHeartbeat => typeof(EventTaskHeartbeat),
+            EventType.Ping => typeof(EventPing),
             EventType.ProxyCreated => typeof(EventProxyCreated),
             EventType.ProxyDeleted => typeof(EventProxyDeleted),
             EventType.ProxyFailed => typeof(EventProxyFailed),
@@ -151,11 +153,9 @@ public record EventTaskHeartbeat(
    TaskConfig Config
 ) : BaseEvent();
 
-
-//record EventPing(
-//    PingId: Guid
-//): BaseEvent();
-
+public record EventPing(
+    Guid PingId
+) : BaseEvent();
 
 //record EventScalesetCreated(
 //    Guid ScalesetId,
@@ -295,7 +295,7 @@ public record EventMessage(
     BaseEvent Event,
     Guid InstanceId,
     String InstanceName
-) : EntityBase();
+);
 
 public class BaseEventConverter : JsonConverter<BaseEvent> {
     public override BaseEvent? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {

src/ApiService/ApiService/OneFuzzTypes/Model.cs

@@ -245,7 +245,6 @@ NodeTaskState State
 
 
 public record Task(
-    // Timestamp: Optional[datetime] = Field(alias="Timestamp")
     [PartitionKey] Guid JobId,
     [RowKey] Guid TaskId,
     TaskState State,
@@ -307,13 +306,13 @@ public record ApiAccessRule(
     Guid[] AllowedGroups
 );
 
+//# initial set of admins can only be set during deployment.
+//# if admins are set, only admins can update instance configs.
+//# if set, only admins can manage pools or scalesets
 public record InstanceConfig
 (
     [PartitionKey, RowKey] string InstanceName,
-    //# initial set of admins can only be set during deployment.
-    //# if admins are set, only admins can update instance configs.
     Guid[]? Admins,
-    //# if set, only admins can manage pools or scalesets
     bool? AllowPoolManagement,
     string[] AllowedAadTenants,
     NetworkConfig NetworkConfig,
@@ -490,20 +489,20 @@ public record Repro(
     UserInfo? UserInfo
 ) : StatefulEntityBase<VmState>(State);
 
+// TODO: Make this >1 and < 7*24 (more than one hour, less than seven days)
 public record ReproConfig(
     Container Container,
     string Path,
-    // TODO: Make this >1 and < 7*24 (more than one hour, less than seven days)
     int Duration
 );
 
+// Skipping AutoScaleConfig because it's not used anymore
 public record Pool(
     DateTimeOffset Timestamp,
     PoolName Name,
     Guid PoolId,
     Os Os,
     bool Managed,
-    // Skipping AutoScaleConfig because it's not used anymore
     Architecture Architecture,
     PoolState State,
     Guid? ClientId,

src/ApiService/ApiService/OneFuzzTypes/Webhooks.cs

@@ -9,6 +9,11 @@ public enum WebhookMessageFormat {
     EventGrid
 }
 
+public record WebhookMessageQueueObj(
+        Guid WebhookId,
+        Guid EventId
+        );
+
 public record WebhookMessage(Guid EventId,
     EventType EventType,
     BaseEvent Event,
@@ -27,24 +32,18 @@ public record WebhookMessageEventGrid(
     [property: JsonConverter(typeof(BaseEventConverter))]
     BaseEvent Data);
 
-
-// TODO: This should inherit from Entity Base ? no, since there is
-// a table WebhookMessaageLog
 public record WebhookMessageLog(
     [RowKey] Guid EventId,
     EventType EventType,
+    [property: TypeDiscrimnatorAttribute("EventType", typeof(EventTypeProvider))]
+    [property: JsonConverter(typeof(BaseEventConverter))]
     BaseEvent Event,
     Guid InstanceId,
     String InstanceName,
     [PartitionKey] Guid WebhookId,
-    WebhookMessageState State = WebhookMessageState.Queued,
-    int TryCount = 0
-    ) : WebhookMessage(EventId,
-            EventType,
-            Event,
-            InstanceId,
-            InstanceName,
-            WebhookId);
+    long TryCount,
+    WebhookMessageState State = WebhookMessageState.Queued
+    ) : EntityBase();
 
 public record Webhook(
     [PartitionKey] Guid WebhookId,

src/ApiService/ApiService/Program.cs

@@ -45,7 +45,8 @@ public static List<ILog> GetLoggers(IServiceConfig config) {
         return loggers;
     }
 
-
+    //Move out expensive resources into separate class, and add those as Singleton
+    // ArmClient, Table Client(s), Queue Client(s), HttpClient, etc.
     public static void Main() {
         var host = new HostBuilder()
         .ConfigureFunctionsWorkerDefaults(
@@ -78,9 +79,6 @@ public static void Main() {
             .AddScoped<IVmOperations, VmOperations>()
             .AddScoped<ISecretsOperations, SecretsOperations>()
             .AddScoped<IJobOperations, JobOperations>()
-
-            //Move out expensive resources into separate class, and add those as Singleton
-            // ArmClient, Table Client(s), Queue Client(s), HttpClient, etc.
             .AddSingleton<ICreds, Creds>()
             .AddSingleton<IServiceConfig, ServiceConfiguration>()
             .AddHttpClient()

src/ApiService/ApiService/QueueWebhooks.cs

@@ -0,0 +1,24 @@
+using System.Text.Json;
+using Microsoft.Azure.Functions.Worker;
+using Microsoft.OneFuzz.Service.OneFuzzLib.Orm;
+
+namespace Microsoft.OneFuzz.Service;
+
+public class QueueWebhooks {
+    private readonly ILogTracer _log;
+    private readonly IWebhookMessageLogOperations _webhookMessageLog;
+    public QueueWebhooks(ILogTracer log, IWebhookMessageLogOperations webhookMessageLog) {
+        _log = log;
+        _webhookMessageLog = webhookMessageLog;
+    }
+
+    [Function("QueueWebhooks")]
+    public async Async.Task Run([QueueTrigger("myqueue-items", Connection = "AzureWebJobsStorage")] string msg) {
+
+        _log.Info($"Webhook Message Queued: {msg}");
+
+        var obj = JsonSerializer.Deserialize<WebhookMessageQueueObj>(msg, EntityConverter.GetJsonSerializerOptions()).EnsureNotNull($"wrong data {msg}");
+
+        await _webhookMessageLog.ProcessFromQueue(obj);
+    }
+}