Merge branch 'main' into event-fixes

microsoft · Jul 24, 2023 · ece11d7 · ece11d7
2 parents 635ee4f + 191dc8a
commit ece11d7
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/Sarif.Converters/HdfConverter.cs b/src/Sarif.Converters/HdfConverter.cs
@@ -121,15 +121,26 @@ private static (ReportingDescriptor, IList<Result>) SarifRuleAndResultFromHdfCon
             var results = new List<Result>(execJsonControl.Results.Count);
             foreach (ControlResult controlResult in execJsonControl.Results)
             {
+                ResultKind kind = controlResult.Status switch
+                {
+                    ControlResultStatus.Passed => ResultKind.Pass,
+                    ControlResultStatus.Failed => ResultKind.Fail,
+                    ControlResultStatus.Error => ResultKind.Review,
+                    ControlResultStatus.Skipped => ResultKind.NotApplicable,
+                    _ => ResultKind.Fail,
+                };
+                FailureLevel level = (kind == ResultKind.Fail) ? SarifLevelFromHdfImpact(execJsonControl.Impact) : FailureLevel.None;
+                double rank = (kind == ResultKind.Fail) ? SarifRankFromHdfImpact(execJsonControl.Impact) : -1.0;
                 var result = new Result
                 {
                     RuleId = execJsonControl.Id,
                     Message = new Message
                     {
                         Text = AppendPeriod(string.IsNullOrWhiteSpace(controlResult.CodeDesc) ? execJsonControl.Desc : controlResult.CodeDesc),
                     },
-                    Level = SarifLevelFromHdfImpact(execJsonControl.Impact),
-                    Rank = SarifRankFromHdfImpact(execJsonControl.Impact),
+                    Kind = kind,
+                    Level = level,
+                    Rank = rank,
                 };
                 results.Add(result);
             }