Add ExtensionData to Report record so that it is picked up by Scr…

…iban
microsoft · Sep 6, 2023 · 0c9d589 · 0c9d589
1 parent e007b3d
commit 0c9d589
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/src/ApiService/ApiService/OneFuzzTypes/Model.cs b/src/ApiService/ApiService/OneFuzzTypes/Model.cs
@@ -509,10 +509,10 @@ public record Report(
     string? ToolName,
     string? ToolVersion,
     string? OnefuzzVersion,
-    Uri? ReportUrl
+    Uri? ReportUrl,
+    [property: JsonExtensionData]
+    Dictionary<string, JsonElement>? ExtensionData
 ) : IReport, ITruncatable<Report> {
-
-    [JsonExtensionData] public Dictionary<string, JsonElement>? ExtensionData { get; set; }
     public Report Truncate(int maxLength) {
         return this with {
             Executable = TruncateUtils.TruncateString(Executable, maxLength),

diff --git a/src/ApiService/ApiService/onefuzzlib/notifications/JinjaTemplateAdapter.cs b/src/ApiService/ApiService/onefuzzlib/notifications/JinjaTemplateAdapter.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using System.Text.Json;
+using Microsoft.Extensions.Logging;
 namespace Microsoft.OneFuzz.Service;
 
 public class JinjaTemplateAdapter {
@@ -116,7 +117,8 @@ public static async Async.Task<TemplateValidationResponse> ValidateScribanTempla
                 toolName,
                 toolVersion,
                 onefuzzVersion,
-                reportUrl
+                reportUrl,
+                new Dictionary<string, JsonElement>()
             );
 
         var preReqTasks = new List<Guid> { Guid.NewGuid(), Guid.NewGuid() };

diff --git a/src/ApiService/IntegrationTests/ReproVmssTests.cs b/src/ApiService/IntegrationTests/ReproVmssTests.cs
@@ -165,6 +165,7 @@ public async Async.Task CannotCreateVMForMissingReport() {
                 null,
                 null,
                 null,
+                null,
                 null
                 );
 

diff --git a/src/ApiService/Tests/OrmModelsTest.cs b/src/ApiService/Tests/OrmModelsTest.cs
@@ -204,7 +204,8 @@ from i in Arb.Generate<int>()
                             ToolName: s,
                             ToolVersion: s,
                             OnefuzzVersion: s,
-                            ReportUrl: u));
+                            ReportUrl: u,
+                            ExtensionData: null));
 
         public static Arbitrary<Container> ArbContainer()
             => Arb.From(from len in Gen.Choose(3, 63)

diff --git a/src/ApiService/Tests/TemplateTests.cs b/src/ApiService/Tests/TemplateTests.cs
@@ -214,7 +214,8 @@ private static Report GetReport() {
             null,
             null,
             null,
-            null
+            null,
+            new Dictionary<string, JsonElement>()
         );
     }
 

diff --git a/src/ApiService/Tests/TruncationTests.cs b/src/ApiService/Tests/TruncationTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json;
 using FluentAssertions;
 using Microsoft.OneFuzz.Service;
 using Xunit;
@@ -75,7 +76,8 @@ public static Report GenerateReport() {
             null,
             null,
             null,
-            new Uri("http://example.com")
+            new Uri("http://example.com"),
+            new Dictionary<string, JsonElement>()
         );
     }