Merge branch 'main' into tevoinea/FixExePackaging

Author: tevoinea

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

@@ -180,10 +180,10 @@ public sealed class AdoConnector {
         private readonly ILogger _logTracer;
         public static async Async.Task<AdoConnector> AdoConnectorCreator(IOnefuzzContext context, Container container, string filename, AdoTemplate config, Report report, ILogger logTracer, Renderer? renderer = null) {
             if (!config.AdoFields.TryGetValue("System.Title", out var issueTitle)) {
-                issueTitle = "example title";
+                issueTitle = "{{ report.crash_site }} - {{ report.executable }}";
             }
-            renderer ??= await Renderer.ConstructRenderer(context, container, filename, issueTitle, report, logTracer);
             var instanceUrl = context.Creds.GetInstanceUrl();
+            renderer ??= await Renderer.ConstructRenderer(context, container, filename, issueTitle, report, instanceUrl, logTracer);
             var project = renderer.Render(config.Project, instanceUrl);
 
             var authToken = await context.SecretsOperations.GetSecretValue(config.AuthToken.Secret);
@@ -398,7 +398,8 @@ private async Async.Task<WorkItem> CreateNew() {
                 });
             }
 
-            if (_config.AdoFields.TryGetValue("System.Title", out var systemTitle) && systemTitle.Length > MAX_SYSTEM_TITLE_LENGTH) {
+            var systemTitle = _renderer.IssueTitle;
+            if (systemTitle.Length > MAX_SYSTEM_TITLE_LENGTH) {
                 var systemTitleHashString = Convert.ToHexString(
                     System.Security.Cryptography.SHA256.HashData(Encoding.UTF8.GetBytes(systemTitle))
                 );

src/ApiService/ApiService/onefuzzlib/notifications/GithubIssues.cs

@@ -22,7 +22,7 @@ public async Async.Task GithubIssue(GithubIssuesTemplate config, Container conta
         var report = (Report)reportable;
 
         try {
-            await Process(config, container, filename, config.Title, report);
+            await Process(config, container, filename, config.Title, report, _context.Creds.GetInstanceUrl());
         } catch (ApiException e) {
             await LogFailedNotification(report, e, notificationId);
         }
@@ -63,8 +63,8 @@ private static GitHubClient GetGitHubClient(string user, string pat) {
         };
     }
 
-    private async Async.Task Process(GithubIssuesTemplate config, Container container, string filename, string issueTitle, Report report) {
-        var renderer = await Renderer.ConstructRenderer(_context, container, filename, issueTitle, report, _logTracer);
+    private async Async.Task Process(GithubIssuesTemplate config, Container container, string filename, string issueTitle, Report report, Uri instanceUrl) {
+        var renderer = await Renderer.ConstructRenderer(_context, container, filename, issueTitle, report, instanceUrl, _logTracer);
         var handler = await GithubConnnector.GithubConnnectorCreator(config, renderer, _context.Creds.GetInstanceUrl(), _context, _logTracer);
         await handler.Process();
     }

src/ApiService/ApiService/onefuzzlib/notifications/JinjaTemplateAdapter.cs

@@ -35,7 +35,7 @@ public static async Async.Task<bool> IsValidScribanNotificationTemplate(IOnefuzz
     public static async Async.Task<TemplateValidationResponse> ValidateScribanTemplate(IOnefuzzContext context, ILogger log, TemplateRenderContext? renderContext, string template) {
         var instanceUrl = context.ServiceConfiguration.OneFuzzInstance;
 
-        var (renderer, templateRenderContext) = await GenerateTemplateRenderContext(context, log, renderContext);
+        var (renderer, templateRenderContext) = await GenerateTemplateRenderContext(context, instanceUrl, log, renderContext);
 
         var renderedTemplate = renderer.Render(template, instanceUrl, strictRendering: true);
 
@@ -45,7 +45,7 @@ public static async Async.Task<TemplateValidationResponse> ValidateScribanTempla
         );
     }
 
-    private static async Async.Task<(NotificationsBase.Renderer, TemplateRenderContext)> GenerateTemplateRenderContext(IOnefuzzContext context, ILogger log, TemplateRenderContext? templateRenderContext) {
+    private static async Async.Task<(NotificationsBase.Renderer, TemplateRenderContext)> GenerateTemplateRenderContext(IOnefuzzContext context, Uri instanceUrl, ILogger log, TemplateRenderContext? templateRenderContext) {
         if (templateRenderContext != null) {
             log.LogInformation("Using custom TemplateRenderContext");
         } else {
@@ -220,6 +220,7 @@ public static async Async.Task<TemplateValidationResponse> ValidateScribanTempla
             reportFileName,
             issueTitle,
             report,
+            instanceUrl,
             log,
             task,
             job,

src/ApiService/ApiService/onefuzzlib/notifications/NotificationsBase.cs

@@ -37,6 +37,7 @@ public class Renderer {
         private readonly Report _report;
         private readonly Container _container;
         private readonly string _filename;
+        public string IssueTitle => _issueTitle;
         private readonly string _issueTitle;
         private readonly TaskConfig _taskConfig;
         private readonly JobConfig _jobConfig;
@@ -51,6 +52,7 @@ public static async Async.Task<Renderer> ConstructRenderer(
             string filename,
             string issueTitle,
             Report report,
+            Uri instanceUrl,
             ILogger log,
             Task? task = null,
             Job? job = null,
@@ -84,10 +86,23 @@ public static async Async.Task<Renderer> ConstructRenderer(
 
             var scribanOnly = scribanOnlyOverride ?? scribanOnlyFeatureFlag;
 
+            var renderedIssueTitle = new Renderer(
+                container,
+                filename,
+                string.Empty,
+                report,
+                checkedTask,
+                checkedJob,
+                targetUrl,
+                inputUrl!, // TODO: incorrect
+                reportUrl,
+                scribanOnly)
+                .Render(issueTitle, instanceUrl);
+
             return new Renderer(
                 container,
                 filename,
-                issueTitle,
+                renderedIssueTitle,
                 report,
                 checkedTask,
                 checkedJob,