Merge branch 'main' into srcview-test

Author: Porges

CHANGELOG.md

@@ -7,6 +7,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 8.6.3
+
+### Fixed
+
+* Service: Fixed another duplicate Azure DevOps work item creation case by handling `Microsoft.VSTS.Common.ResolvedReason` field when present [#3383](https://github.com/microsoft/onefuzz/pull/3383)
+
+## 8.6.2
+
+### Fixed
+
+* Agent: Fixed tasks hanging when shutting down by forcefully shutting down the runtime before exiting the main task [#3378](https://github.com/microsoft/onefuzz/pull/3378)
+* Service: Refactored Azure DevOps template rendering to fix duplicate bugs being filed due to title truncation and added several validation tests in this area [#3370](https://github.com/microsoft/onefuzz/pull/3370)
+
 ## 8.6.1
 
 ### Added

CURRENT_VERSION

@@ -1 +1 @@
-8.6.1
+8.6.3

contrib/deploy-onefuzz-via-azure-devops/Pipfile.lock

@@ -166,6 +166,9 @@ private static SeverityLevel GetSeverityLevel(LogLevel logLevel) {
     /// <param name="eventId">Event Id information.</param>
     private void PopulateTelemetry<TState>(ISupportProperties telemetryItem, TState state, EventId eventId) {
         IDictionary<string, string> dict = telemetryItem.Properties;
+
+        PopulateTags(telemetryItem);
+
         dict["CategoryName"] = this.categoryName;
         dict["Logger"] = nameof(OneFuzzLogger);
 
@@ -181,11 +184,15 @@ private void PopulateTelemetry<TState>(ISupportProperties telemetryItem, TState
                 if (string.Equals(item.Key, "{OriginalFormat}")) {
                     dict["OriginalFormat"] = Convert.ToString(item.Value, CultureInfo.InvariantCulture) ?? $"Failed to convert {item.Value}";
                 } else {
+                    //if there is an existing tag that is shadowing the log message tag - rename it
+                    if (dict.ContainsKey(item.Key)) {
+                        dict[$"!@#<--- {item.Key} --->#@!"] = dict[item.Key];
+                    }
                     dict[item.Key] = Convert.ToString(item.Value, CultureInfo.InvariantCulture) ?? $"Failed to convert {item.Value}";
                 }
             }
         }
-        PopulateTags(telemetryItem);
+
     }
 
     /// <param name="telemetryItem"></param>

src/ApiService/ApiService/Log.cs

@@ -528,7 +528,8 @@ private static bool IsADODuplicateWorkItem(WorkItem wi) {
             // OR it could have System.State == Closed && System.Reason == Duplicate
             // I haven't found any other combinations where System.Reason could be duplicate but just to be safe
             // we're explicitly _not_ checking the state of the work item to determine if it's duplicate
-            return wi.Fields.ContainsKey("System.Reason") && string.Equals(wi.Fields["System.Reason"].ToString(), "Duplicate")
+            return wi.Fields.ContainsKey("System.Reason") && string.Equals(wi.Fields["System.Reason"].ToString(), "Duplicate", StringComparison.OrdinalIgnoreCase)
+            || wi.Fields.ContainsKey("Microsoft.VSTS.Common.ResolvedReason") && string.Equals(wi.Fields["Microsoft.VSTS.Common.ResolvedReason"].ToString(), "Duplicate", StringComparison.OrdinalIgnoreCase)
             // Alternatively, the work item can also specify a 'relation' to another work item.
             // This is typically used to create parent/child relationships between work items but can also
             // Be used to mark duplicates so we should check this as well.

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

@@ -40,6 +40,7 @@ fn main() -> Result<()> {
     let rt = tokio::runtime::Runtime::new()?;
     let result = rt.block_on(run(matches));
     atexit::execute();
+    rt.shutdown_background();
     result
 }
 

src/agent/onefuzz-task/src/main.rs

@@ -83,7 +83,7 @@ resource enableWorkItemCreation 'Microsoft.AppConfiguration/configurationStores/
     value: string({
       id: 'EnableWorkItemCreation'
       description: 'Create work items'
-      enabled: false
+      enabled: true
     })
     contentType: 'application/vnd.microsoft.appconfig.ff+json;charset=utf-8'
   }