Merge pull request #278 from microsoft/main

Fork Sync: Update from parent repository

Author: AdamL-Microsoft

.github/codeql/codeql-config.yml

@@ -1,5 +1,7 @@
 paths:
-  - src/cli
+  - src/ApiService
   - src/agent
-  - src/pytypes
+  - src/cli
   - src/deployment
+  - src/proxy-manager
+  - src/pytypes

.github/workflows/ci.yml

@@ -46,6 +46,8 @@ jobs:
         with:
           toolchain: 1.68
           components: clippy, rustfmt, llvm-tools-preview
+      - name: Setup Rust problem-matchers
+        uses: r7kamura/rust-problem-matchers@d58b70c4a13c4866d96436315da451d8106f8f08 # pinned to 1.3.0
       - name: Get Rust version & build version
         shell: bash
         run: |

.github/workflows/codeql-analysis.yml

@@ -34,7 +34,7 @@ jobs:
       # Compiling is required for csharp
       - name: Setup .NET Core SDK
         if: ${{ matrix.language == 'csharp' }}
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: "7.0.x"
           dotnet-quality: "ga"

src/ApiService/ApiService/ApiService.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <OutputType>Exe</OutputType>
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.AppConfiguration.Functions.Worker" Version="6.0.0" />
     <PackageReference Include="Microsoft.FeatureManagement" Version="2.5.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="5.0.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.EventGrid" Version="2.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.1.0" />
@@ -43,7 +43,7 @@
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.SignalRService" Version="1.7.0" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageReference Include="TaskTupleAwaiter" Version="2.0.0" />
+    <PackageReference Include="TaskTupleAwaiter" Version="2.0.3" />
     <PackageReference Include="Scriban" Version="5.5.0" />
     <PackageReference Include="Octokit" Version="2.0.1" />
     <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.219.0-preview" />

src/ApiService/ApiService/Functions/Notifications.cs

@@ -67,6 +67,14 @@ private async Async.Task<HttpResponseData> Delete(HttpRequestData req) {
         if (entries.Count > 1) {
             return await _context.RequestHandling.NotOk(req, new Error(ErrorCode.INVALID_REQUEST, new[] { "error identifying Notification" }), context: "notification delete");
         }
+
+        var result = await _context.NotificationOperations.Delete(entries[0]);
+
+        if (!result.IsOk) {
+            var (status, error) = result.ErrorV;
+            return await _context.RequestHandling.NotOk(req, new Error(ErrorCode.UNABLE_TO_UPDATE, new[] { error }), "notification delete");
+        }
+
         var response = req.CreateResponse(HttpStatusCode.OK);
         await response.WriteAsJsonAsync(entries[0]);
         return response;

src/ApiService/ApiService/OneFuzzTypes/Events.cs

@@ -143,7 +143,13 @@ public record EventJobStopped(
     JobConfig Config,
     UserInfo? UserInfo,
     List<JobTaskStopped> TaskInfo
-) : BaseEvent();
+) : BaseEvent(), ITruncatable<BaseEvent> {
+    public BaseEvent Truncate(int maxLength) {
+        return this with {
+            Config = Config.Truncate(maxLength)
+        };
+    }
+}
 
 
 [EventType(EventType.TaskCreated)]

src/ApiService/ApiService/OneFuzzTypes/Model.cs

@@ -819,7 +819,17 @@ public record JobConfig(
     string Build,
     long Duration,
     string? Logs
-);
+) : ITruncatable<JobConfig> {
+    public JobConfig Truncate(int maxLength) {
+        return new JobConfig(
+            Project,
+            Name,
+            Build,
+            Duration,
+            Logs?[..maxLength]
+        );
+    }
+}
 
 public record JobTaskInfo(
     Guid TaskId,
@@ -962,7 +972,8 @@ public record TaskUnitConfig(
     TaskType TaskType,
     string? InstanceTelemetryKey,
     string? MicrosoftTelemetryKey,
-    Uri HeartbeatQueue
+    Uri HeartbeatQueue,
+    Dictionary<string, string> Tags
     ) {
     public Uri? inputQueue { get; set; }
     public String? SupervisorExe { get; set; }

src/ApiService/ApiService/onefuzzlib/Config.cs

@@ -70,7 +70,8 @@ private static BlobContainerSasPermissions ConvertPermissions(ContainerPermissio
             TaskType: task.Config.Task.Type,
             InstanceTelemetryKey: _serviceConfig.ApplicationInsightsInstrumentationKey,
             MicrosoftTelemetryKey: _serviceConfig.OneFuzzTelemetry,
-            HeartbeatQueue: await _queue.GetQueueSas("task-heartbeat", StorageType.Config, QueueSasPermissions.Add) ?? throw new Exception("unable to get heartbeat queue sas")
+            HeartbeatQueue: await _queue.GetQueueSas("task-heartbeat", StorageType.Config, QueueSasPermissions.Add) ?? throw new Exception("unable to get heartbeat queue sas"),
+            Tags: task.Config.Tags ?? new Dictionary<string, string>()
         );
 
         if (definition.MonitorQueue != null) {

src/ApiService/ApiService/onefuzzlib/Defs.cs

@@ -416,7 +416,7 @@ public static class Defs {
             Permissions: ContainerPermission.Read | ContainerPermission.List
         ),
         new ContainerDefinition(
-            Type:ContainerType.UniqueReports,
+            Type:ContainerType.UniqueInputs,
             Compare: Compare.Equal,
             Value:1,
             Permissions:

src/ApiService/ApiService/onefuzzlib/notifications/Ado.cs

@@ -146,15 +146,19 @@ public async Async.Task<string> Render(string template) {
             }
         }
 
-        public async IAsyncEnumerable<WorkItem> ExistingWorkItems() {
+        public async IAsyncEnumerable<WorkItem> ExistingWorkItems((string, string)[] notificationInfo) {
             var filters = new Dictionary<string, string>();
             foreach (var key in _config.UniqueFields) {
                 var filter = string.Empty;
                 if (string.Equals("System.TeamProject", key)) {
                     filter = await Render(_config.Project);
+                } else if (_config.AdoFields.TryGetValue(key, out var field)) {
+                    filter = await Render(field);
                 } else {
-                    filter = await Render(_config.AdoFields[key]);
+                    _logTracer.WithTags(notificationInfo).Error($"Failed to check for existing work items using the UniqueField Key: {key}. Value is not present in config field AdoFields.");
+                    continue;
                 }
+
                 filters.Add(key.ToLowerInvariant(), filter);
             }
 
@@ -327,7 +331,7 @@ private async Async.Task<WorkItem> CreateNew() {
         }
 
         public async Async.Task Process((string, string)[] notificationInfo) {
-            var matchingWorkItems = await ExistingWorkItems().ToListAsync();
+            var matchingWorkItems = await ExistingWorkItems(notificationInfo).ToListAsync();
 
             var nonDuplicateWorkItems = matchingWorkItems
                 .Where(wi => !IsADODuplicateWorkItem(wi))