[C# Port] Adding new Proxy Update Queue Function. (#1757)

* Adding QueueProxyUpdate.

* Setting to serializer.

* Updates.

* Updating with new ORM model and [model]Operation.

* Fixing return type.

* Working on changes.

* Tested and ready for review.

* Formatting.

* Removing test code.

* Update src/ApiService/Tests/OrmTest.cs

Co-authored-by: Cheick Keita <chkeita@microsoft.com>

* Fixing tests.

* Fixing tests again.

* Asserting null in tests.

* Adding null param.

* Removing whitespace.

* syntax error.

Co-authored-by: Cheick Keita <chkeita@microsoft.com>

Author: 2 people

src/ApiService/ApiService/OneFuzzTypes/Model.cs

@@ -1,10 +1,6 @@
 using Microsoft.OneFuzz.Service.OneFuzzLib.Orm;
 using System;
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-using Container = System.String;
-using Region = System.String;
 using PoolName = System.String;
 using Endpoint = System.String;
 using GroupId = System.Guid;
@@ -21,6 +17,12 @@ namespace Microsoft.OneFuzz.Service;
 /// the "partion key" and "row key" are identified by the [PartitionKey] and [RowKey] attributes
 /// Guids are mapped to string in the db
 
+public record Authentication
+(
+    string Password,
+    string PublicKey,
+    string PrivateKey
+);
 
 public record Authentication
 (
@@ -92,7 +94,7 @@ public enum NodeState
 
 public record ProxyHeartbeat
 (
-    Region Region,
+    string Region,
     Guid ProxyId,
     List<ProxyForward> Forwards,
     DateTimeOffset TimeStamp
@@ -116,7 +118,7 @@ bool DebugKeepNode
 
 public partial record ProxyForward
 (
-    [PartitionKey] Region Region,
+    [PartitionKey] string Region,
     [RowKey] int DstPort,
     int SrcPort,
     string DstIp
@@ -126,7 +128,7 @@ public partial record ProxyConfig
 (
     Uri Url,
     string Notification,
-    Region Region,
+    string Region,
     Guid? ProxyId,
     List<ProxyForward> Forwards,
     string InstanceTelemetryKey,
@@ -136,7 +138,7 @@ string MicrosoftTelemetryKey
 
 public partial record Proxy
 (
-    [PartitionKey] Region Region,
+    [PartitionKey] string Region,
     [RowKey] Guid ProxyId,
     DateTimeOffset? CreatedTimestamp,
     VmState State,

src/ApiService/ApiService/Program.cs

@@ -65,21 +65,16 @@ public static void Main()
         )
         .ConfigureServices((context, services) =>
             services
-            .AddScoped<ILogTracer>(s => new LogTracerFactory(GetLoggers()).CreateLogTracer(Guid.Empty, severityLevel: EnvironmentVariables.LogSeverityLevel()))
-            .AddScoped<INodeOperations, NodeOperations>()
-            .AddScoped<IEvents, Events>()
-            .AddScoped<IWebhookOperations, WebhookOperations>()
-            .AddScoped<IWebhookMessageLogOperations, WebhookMessageLogOperations>()
-            .AddScoped<ITaskOperations, TaskOperations>()
-            .AddScoped<IQueue, Queue>()
-            .AddScoped<ICreds, Creds>()
-            .AddScoped<IStorage, Storage>()
-            .AddScoped<IProxyOperations, ProxyOperations>()
-            .AddScoped<IConfigOperations, ConfigOperations>()
-
-        //TODO: move out expensive resources into separate class, and add those as Singleton
-        // ArmClient, Table Client(s), Queue Client(s), HttpClient, etc.
-
+            .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<IQueue, Queue>()
+            .AddSingleton<ICreds>(_ => new Creds())
+            .AddSingleton<IStorage, Storage>()
+            .AddSingleton<IProxyOperations, ProxyOperations>()
         )
         .Build();
 

src/ApiService/ApiService/QueueProxyHeartbeat.cs

@@ -1,46 +1,42 @@
 using System;
 using Microsoft.Azure.Functions.Worker;
+using Microsoft.Extensions.Logging;
 using System.Text.Json;
+using System.Threading.Tasks;
 using Microsoft.OneFuzz.Service.OneFuzzLib.Orm;
 
 namespace Microsoft.OneFuzz.Service;
 
 public class QueueProxyHearbeat
 {
-    private readonly ILogTracer _log;
+    private readonly ILogger _logger;
 
     private readonly IProxyOperations _proxy;
 
-    public QueueProxyHearbeat(ILogTracer log, IProxyOperations proxy)
+    public QueueProxyHearbeat(ILoggerFactory loggerFactory, IProxyOperations proxy)
     {
-        _log = log;
+        _logger = loggerFactory.CreateLogger<QueueProxyHearbeat>();
         _proxy = proxy;
     }
 
     [Function("QueueProxyHearbeat")]
-    public async Async.Task Run([QueueTrigger("myqueue-items", Connection = "AzureWebJobsStorage")] string msg)
+    public async Task Run([QueueTrigger("myqueue-items", Connection = "AzureWebJobsStorage")] string msg)
     {
-        _log.Info($"heartbeat: {msg}");
+        _logger.LogInformation($"heartbeat: {msg}");
 
         var hb = JsonSerializer.Deserialize<ProxyHeartbeat>(msg, EntityConverter.GetJsonSerializerOptions()).EnsureNotNull($"wrong data {msg}"); ;
         var newHb = hb with { TimeStamp = DateTimeOffset.UtcNow };
 
         var proxy = await _proxy.GetByProxyId(newHb.ProxyId);
 
-        var log = _log.WithTag("ProxyId", newHb.ProxyId.ToString());
-
         if (proxy == null)
         {
-            log.Warning($"invalid proxy id: {newHb.ProxyId}");
+            _logger.LogWarning($"invalid proxy id: {newHb.ProxyId}");
             return;
         }
         var newProxy = proxy with { heartbeat = newHb };
 
-        var r = await _proxy.Replace(newProxy);
-        if (!r.IsOk)
-        {
-            var (status, reason) = r.ErrorV;
-            log.Error($"Failed to replace proxy heartbeat record due to [{status}] {reason}");
-        }
+        await _proxy.Replace(newProxy);
+
     }
 }

src/ApiService/ApiService/onefuzzlib/ProxyOperations.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.OneFuzz.Service;
 
@@ -11,12 +12,12 @@ public interface IProxyOperations : IOrm<Proxy>
 }
 public class ProxyOperations : Orm<Proxy>, IProxyOperations
 {
-    private readonly ILogTracer _log;
+    private readonly ILogger _logger;
 
-    public ProxyOperations(ILogTracer log, IStorage storage)
+    public ProxyOperations(ILoggerFactory loggerFactory, IStorage storage)
         : base(storage)
     {
-        _log = log;
+        _logger = loggerFactory.CreateLogger<QueueProxyHearbeat>();
     }
 
     public async Task<Proxy?> GetByProxyId(Guid proxyId)

src/ApiService/ApiService/onefuzzlib/orm/EntityConverter.cs

@@ -257,6 +257,10 @@ public T ToRecord<T>(TableEntity entity) where T : EntityBase
                     else
                     {
                         var value = entity.GetString(fieldName);
+                        if (value == null)
+                        {
+                            return null;
+                        }
                         return JsonSerializer.Deserialize(value, ef.type, options: _options); ;
                     }
                 }