refactor(evaluated-model): Add advisor provider issues

Add the provider issues that aren't part of the advisor results to the
`EvaluatedModel` issues.

Signed-off-by: Johanna Lamppu <johanna.lamppu@doubleopen.org>

Author: lamppu

plugins/reporters/evaluated-model/src/funTest/resources/evaluated-model-reporter-test-deduplicate-expected-output.yml

@@ -304,6 +304,13 @@ issues:
   pkg: 2
   how_to_fix: "Some how to fix text."
 - _id: 21
+  timestamp: "2026-02-26T08:54:38.920436615Z"
+  type: "ADVISOR"
+  source: "Advisor"
+  message: "Example provider issue."
+  severity: "ERROR"
+  how_to_fix: "Some how to fix text."
+- _id: 22
   timestamp: "2024-04-25T07:44:20.725613974Z"
   type: "ANALYZER"
   source: "Gradle"
@@ -312,7 +319,7 @@ issues:
   pkg: 2
   path: 0
   how_to_fix: "Some how to fix text."
-- _id: 22
+- _id: 23
   timestamp: "2024-04-25T07:44:20.725613974Z"
   type: "ANALYZER"
   source: "Gradle"
@@ -1052,7 +1059,7 @@ dependency_trees:
       linkage: "DYNAMIC"
       pkg: 2
       issues:
-      - 21
+      - 22
       children:
       - key: 4
         linkage: "DYNAMIC"
@@ -1077,7 +1084,7 @@ dependency_trees:
       linkage: "DYNAMIC"
       pkg: 3
       issues:
-      - 22
+      - 23
       children:
       - key: 10
         linkage: "DYNAMIC"
@@ -1161,10 +1168,10 @@ statistics:
     rule_violation_resolutions: 1
     vulnerability_resolutions: 0
   open_issues:
-    errors: 6
+    errors: 7
     warnings: 4
     hints: 3
-    severe: 10
+    severe: 11
   open_rule_violations:
     errors: 1
     warnings: 1

plugins/reporters/evaluated-model/src/funTest/resources/evaluated-model-reporter-test-expected-output.json

@@ -352,6 +352,14 @@
     "how_to_fix" : "Some how to fix text."
   }, {
     "_id" : 21,
+    "timestamp" : "2026-02-26T08:54:38.920436615Z",
+    "type" : "ADVISOR",
+    "source" : "Advisor",
+    "message" : "Example provider issue.",
+    "severity" : "ERROR",
+    "how_to_fix" : "Some how to fix text."
+  }, {
+    "_id" : 22,
     "timestamp" : "2024-04-25T07:44:20.725613974Z",
     "type" : "ANALYZER",
     "source" : "Gradle",
@@ -361,7 +369,7 @@
     "path" : 0,
     "how_to_fix" : "Some how to fix text."
   }, {
-    "_id" : 22,
+    "_id" : 23,
     "timestamp" : "2024-04-25T07:44:20.725613974Z",
     "type" : "ANALYZER",
     "source" : "Gradle",
@@ -1128,7 +1136,7 @@
         "key" : 3,
         "linkage" : "DYNAMIC",
         "pkg" : 2,
-        "issues" : [ 21 ],
+        "issues" : [ 22 ],
         "children" : [ {
           "key" : 4,
           "linkage" : "DYNAMIC",
@@ -1157,7 +1165,7 @@
         "key" : 9,
         "linkage" : "DYNAMIC",
         "pkg" : 3,
-        "issues" : [ 22 ],
+        "issues" : [ 23 ],
         "children" : [ {
           "key" : 10,
           "linkage" : "DYNAMIC",
@@ -1250,10 +1258,10 @@
       "vulnerability_resolutions" : 0
     },
     "open_issues" : {
-      "errors" : 6,
+      "errors" : 7,
       "warnings" : 4,
       "hints" : 3,
-      "severe" : 10
+      "severe" : 11
     },
     "open_rule_violations" : {
       "errors" : 1,

plugins/reporters/evaluated-model/src/funTest/resources/evaluated-model-reporter-test-expected-output.yml

@@ -304,6 +304,13 @@ issues:
   pkg: 2
   how_to_fix: "Some how to fix text."
 - _id: 21
+  timestamp: "2026-02-26T08:54:38.920436615Z"
+  type: "ADVISOR"
+  source: "Advisor"
+  message: "Example provider issue."
+  severity: "ERROR"
+  how_to_fix: "Some how to fix text."
+- _id: 22
   timestamp: "2024-04-25T07:44:20.725613974Z"
   type: "ANALYZER"
   source: "Gradle"
@@ -312,7 +319,7 @@ issues:
   pkg: 2
   path: 0
   how_to_fix: "Some how to fix text."
-- _id: 22
+- _id: 23
   timestamp: "2024-04-25T07:44:20.725613974Z"
   type: "ANALYZER"
   source: "Gradle"
@@ -1052,7 +1059,7 @@ dependency_trees:
       linkage: "DYNAMIC"
       pkg: 2
       issues:
-      - 21
+      - 22
       children:
       - key: 4
         linkage: "DYNAMIC"
@@ -1077,7 +1084,7 @@ dependency_trees:
       linkage: "DYNAMIC"
       pkg: 3
       issues:
-      - 22
+      - 23
       children:
       - key: 10
         linkage: "DYNAMIC"
@@ -1161,10 +1168,10 @@ statistics:
     rule_violation_resolutions: 1
     vulnerability_resolutions: 0
   open_issues:
-    errors: 6
+    errors: 7
     warnings: 4
     hints: 3
-    severe: 10
+    severe: 11
   open_rule_violations:
     errors: 1
     warnings: 1

plugins/reporters/evaluated-model/src/funTest/resources/reporter-test-input.yml

@@ -779,6 +779,11 @@ advisor:
       Vulnerable_code:
         options:
           server_url: "http://localhost:8000"
+  provider_issues:
+    - timestamp: "2026-02-26T08:54:38.920436615Z"
+      source: "Advisor"
+      message: "Example provider issue."
+      severity: "ERROR"
   results:
     Maven:org.apache.commons:commons-text:1.1:
     - advisor:

plugins/reporters/evaluated-model/src/main/kotlin/EvaluatedModelMapper.kt

@@ -148,6 +148,14 @@ internal class EvaluatedModelMapper(private val input: ReporterInput) {
             }
         }
 
+        addIssues(
+            issues = input.ortResult.getAdvisorProviderIssues(),
+            type = EvaluatedIssueType.ADVISOR,
+            pkg = null,
+            scanResult = null,
+            path = null
+        )
+
         resultProjects.forEach { project ->
             val pkg = packages.getValue(project.id)
             addDependencyTree(project, pkg, deduplicateDependencyTree)
@@ -649,7 +657,7 @@ internal class EvaluatedModelMapper(private val input: ReporterInput) {
     private fun addIssues(
         issues: Collection<Issue>,
         type: EvaluatedIssueType,
-        pkg: EvaluatedPackage,
+        pkg: EvaluatedPackage?,
         scanResult: EvaluatedScanResult?,
         path: EvaluatedPackagePath?
     ): List<EvaluatedIssue> {
@@ -663,7 +671,7 @@ internal class EvaluatedModelMapper(private val input: ReporterInput) {
                 message = issue.message,
                 severity = issue.severity,
                 resolutions = resolutions,
-                isExcluded = input.ortResult.isExcluded(issue, pkg.id),
+                isExcluded = pkg?.id?.let { input.ortResult.isExcluded(issue, it) } ?: false,
                 pkg = pkg,
                 scanResult = scanResult,
                 path = path,