Raise AnalysisLevel to 6.0-Recommended, fix warnings (#2086)

Raise the .NET Code Analysis Level to `6.0-Minimum` and then `6.0-Recommended`.

Author: Porges

src/ApiService/.editorconfig

@@ -139,3 +139,26 @@ csharp_preserve_single_line_blocks = true
 
 [*.{cs}]
 dotnet_diagnostic.IDE0005.severity = warning
+
+# allow use of FirstOrDefault/LastOrDefault: https://github.com/dotnet/roslyn-analyzers/issues/1817 & https://github.com/dotnet/roslyn-analyzers/pull/4211#issuecomment-1003578755
+dotnet_code_quality.CA1826.exclude_ordefault_methods = true
+
+# permit underscores in identifier names (e.g. tests, constants)
+dotnet_diagnostic.CA1707.severity = none
+
+# don't care about names that conflict with keywords in other languages
+dotnet_diagnostic.CA1716.severity = none
+
+# don't care about names that contain built-in identifiers
+dotnet_diagnostic.CA1711.severity = none
+dotnet_diagnostic.CA1720.severity = none
+
+# allow static fields on generic types
+dotnet_diagnostic.CA1000.severity = none
+
+# don't worry about performance of ILogger invocations (yet?)
+dotnet_diagnostic.CA1848.severity = none
+
+# allow throwing base "Exception" class, since it's done a lot
+# TODO: improve this
+dotnet_diagnostic.CA2201.severity = suggestion

src/ApiService/ApiService/Log.cs

@@ -59,22 +59,22 @@ public void Flush() {
 //TODO: Should we write errors and Exception to std err ? 
 class Console : ILog {
 
-    private string DictToString<T>(IReadOnlyDictionary<string, T>? d) {
+    private static string DictToString<T>(IReadOnlyDictionary<string, T>? d) {
         if (d is null) {
             return string.Empty;
         } else {
             return string.Join("", d);
         }
     }
 
-    private void LogTags(Guid correlationId, IReadOnlyDictionary<string, string> tags) {
+    private static void LogTags(Guid correlationId, IReadOnlyDictionary<string, string> tags) {
         var ts = DictToString(tags);
         if (!string.IsNullOrEmpty(ts)) {
             System.Console.WriteLine($"[{correlationId}] Tags:{ts}");
         }
     }
 
-    private void LogMetrics(Guid correlationId, IReadOnlyDictionary<string, double>? metrics) {
+    private static void LogMetrics(Guid correlationId, IReadOnlyDictionary<string, double>? metrics) {
         var ms = DictToString(metrics);
         if (!string.IsNullOrEmpty(ms)) {
             System.Console.Out.WriteLine($"[{correlationId}] Metrics:{DictToString(metrics)}");
@@ -126,7 +126,7 @@ internal interface ILogTracerInternal : ILogTracer {
 
 
 public class LogTracer : ILogTracerInternal {
-    private string? GetCaller() {
+    private static string? GetCaller() {
         return new StackTrace()?.GetFrame(2)?.GetMethod()?.DeclaringType?.FullName;
     }
 

src/ApiService/ApiService/OneFuzzTypes/Enums.cs

@@ -8,7 +8,7 @@ public enum ErrorCode {
     INVALID_PERMISSION = 451,
     MISSING_EULA_AGREEMENT = 452,
     INVALID_JOB = 453,
-    INVALID_TASK = 453,
+    INVALID_TASK = INVALID_JOB,
     UNABLE_TO_ADD_TASK_TO_JOB = 454,
     INVALID_CONTAINER = 455,
     UNABLE_TO_RESIZE = 456,

src/ApiService/ApiService/OneFuzzTypes/Model.cs

@@ -333,7 +333,7 @@ public InstanceConfig(string instanceName) : this(
         "Standard_B2s") { }
     public InstanceConfig() : this(String.Empty) { }
 
-    public List<Guid>? CheckAdmins(List<Guid>? value) {
+    public static List<Guid>? CheckAdmins(List<Guid>? value) {
         if (value is not null && value.Count == 0) {
             throw new ArgumentException("admins must be null or contain at least one UUID");
         } else {

src/ApiService/ApiService/QueueTaskHeartbeat.cs

@@ -20,14 +20,14 @@ public QueueTaskHearbeat(ILoggerFactory loggerFactory, ITaskOperations tasks, IE
 
     [Function("QueueTaskHeartbeat")]
     public async Async.Task Run([QueueTrigger("task-heartbeat", Connection = "AzureWebJobsStorage")] string msg) {
-        _logger.LogInformation($"heartbeat: {msg}");
+        _logger.LogInformation("heartbeat: {Message}", msg);
 
         var hb = JsonSerializer.Deserialize<TaskHeartbeatEntry>(msg, EntityConverter.GetJsonSerializerOptions()).EnsureNotNull($"wrong data {msg}");
 
         var task = await _tasks.GetByTaskId(hb.TaskId);
 
         if (task == null) {
-            _logger.LogWarning($"invalid task id: {hb.TaskId}");
+            _logger.LogWarning("invalid task id: {TaskId}", hb.TaskId);
             return;
         }
 

src/ApiService/ApiService/TimerDaily.cs

@@ -21,15 +21,15 @@ public TimerDaily(ILoggerFactory loggerFactory, IScalesetOperations scalesets, I
     public async Async.Task Run([TimerTrigger("1.00:00:00")] TimerInfo myTimer) {
         var scalesets = _scalesets.Search();
         await foreach (var scaleset in scalesets) {
-            _logger.LogInformation($"updating scaleset configs: {scaleset.ScalesetId}");
+            _logger.LogInformation("updating scaleset configs: {ScaleSetId}", scaleset.ScalesetId);
             // todo: do it in batches
             await _scalesets.Replace(scaleset with { NeedsConfigUpdate = true });
         }
 
 
         var expiredWebhookLogs = _webhookMessageLogs.SearchExpired();
         await foreach (var logEntry in expiredWebhookLogs) {
-            _logger.LogInformation($"stopping expired webhook message log: {logEntry.WebhookId}:{logEntry.EventId}");
+            _logger.LogInformation("stopping expired webhook message log: {WebhookId}:{EventId}", logEntry.WebhookId, logEntry.EventId);
             await _webhookMessageLogs.Delete(logEntry);
         }
     }

src/ApiService/ApiService/onefuzzlib/Config.cs

@@ -21,7 +21,7 @@ public Config(IContainers containers, IServiceConfig serviceConfig, IQueue queue
         _queue = queue;
     }
 
-    private BlobContainerSasPermissions ConvertPermissions(ContainerPermission permission) {
+    private static BlobContainerSasPermissions ConvertPermissions(ContainerPermission permission) {
         BlobContainerSasPermissions blobPermissions = 0;
         if (permission.HasFlag(ContainerPermission.Read)) {
             blobPermissions |= BlobContainerSasPermissions.Read;

src/ApiService/ApiService/onefuzzlib/Containers.cs

@@ -14,7 +14,7 @@ public interface IContainers {
     public Async.Task<BlobContainerClient?> FindContainer(Container container, StorageType storageType);
 
     public Async.Task<Uri> GetFileSasUrl(Container container, string name, StorageType storageType, BlobSasPermissions permissions, TimeSpan? duration = null);
-    public Async.Task SaveBlob(Container container, string v1, string v2, StorageType config);
+    public Async.Task SaveBlob(Container container, string name, string data, StorageType storageType);
     public Async.Task<Guid> GetInstanceId();
 
     public Async.Task<Uri?> GetFileUrl(Container container, string name, StorageType storageType);
@@ -125,7 +125,7 @@ public async Async.Task<Uri> GetFileSasUrl(Container container, string name, Sto
         return sasUrl;
     }
 
-    public (DateTimeOffset, DateTimeOffset) SasTimeWindow(TimeSpan timeSpan) {
+    public static (DateTimeOffset, DateTimeOffset) SasTimeWindow(TimeSpan timeSpan) {
         // SAS URLs are valid 6 hours earlier, primarily to work around dev
         // workstations having out-of-sync time.  Additionally, SAS URLs are stopped
         // 15 minutes later than requested based on "Be careful with SAS start time"
@@ -149,7 +149,7 @@ public async Async.Task SaveBlob(Container container, string name, string data,
     public Async.Task<Guid> GetInstanceId() => _getInstanceId.Value;
     private readonly Lazy<Async.Task<Guid>> _getInstanceId;
 
-    public Uri? GetContainerSasUrlService(
+    public static Uri? GetContainerSasUrlService(
         BlobContainerClient client,
         BlobSasPermissions permissions,
         bool tag = false,

src/ApiService/ApiService/onefuzzlib/Defs.cs

@@ -2,7 +2,7 @@
 
 public static class Defs {
 
-    public static Dictionary<TaskType, TaskDefinition> TASK_DEFINITIONS = new Dictionary<TaskType, TaskDefinition>() {
+    public static readonly IReadOnlyDictionary<TaskType, TaskDefinition> TASK_DEFINITIONS = new Dictionary<TaskType, TaskDefinition>() {
         { TaskType.Coverage ,
             new TaskDefinition(
                 Features: new[] {

src/ApiService/ApiService/onefuzzlib/Events.cs

@@ -35,9 +35,9 @@ public Events(IQueue queue, IWebhookOperations webhook, ILogTracer log, IContain
             _creds = creds;
         }
 
-        public async Async.Task QueueSignalrEvent(EventMessage eventMessage) {
-            var message = new SignalREvent("events", new List<EventMessage>() { eventMessage });
-            await _queue.SendMessage("signalr-events", JsonSerializer.Serialize(message), StorageType.Config);
+        public async Async.Task QueueSignalrEvent(EventMessage message) {
+            var ev = new SignalREvent("events", new List<EventMessage>() { message });
+            await _queue.SendMessage("signalr-events", JsonSerializer.Serialize(ev), StorageType.Config);
         }
 
         public async Async.Task SendEvent(BaseEvent anEvent) {