fix(SpdxDocumentFile): Add created issues to the PackageReference

Ensure that issues added in `getSpdxPackageForId()` are not dropped, but rather added to the resulting `PackageReference`. Signed-off-by: Marcel Bochtler <[email protected]>
oss-review-toolkit · Jul 9, 2024 · 534bd17 · 534bd17
1 parent 0be5f33
commit 534bd17
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/analyzer/src/main/kotlin/managers/utils/PackageManagerDependencyHandler.kt b/analyzer/src/main/kotlin/managers/utils/PackageManagerDependencyHandler.kt
@@ -49,15 +49,17 @@ class PackageManagerDependencyHandler(
             packageManager: String,
             definitionFile: String,
             scope: String,
-            linkage: PackageLinkage
+            linkage: PackageLinkage,
+            issues: List<Issue> = emptyList()
         ): PackageReference =
             PackageReference(
                 id = Identifier(
                     type = TYPE,
                     namespace = packageManager,
                     name = definitionFile.encodeColon(),
                     version = "$linkage@$scope"
-                )
+                ),
+                issues = issues
             )
 
         private fun getPackageManagerDependency(node: DependencyNode): PackageManagerDependency? =

diff --git a/plugins/package-managers/spdx/src/main/kotlin/SpdxDocumentFile.kt b/plugins/package-managers/spdx/src/main/kotlin/SpdxDocumentFile.kt
@@ -357,7 +357,8 @@ class SpdxDocumentFile(
         }
 
     internal fun getPackageManagerDependency(pkgId: String, doc: SpdxResolvedDocument): PackageReference? {
-        val spdxPackage = doc.getSpdxPackageForId(pkgId, mutableListOf()) ?: return null
+        val issues = mutableListOf<Issue>()
+        val spdxPackage = doc.getSpdxPackageForId(pkgId, issues) ?: return null
         val definitionFile = doc.getDefinitionFile(pkgId) ?: return null
 
         if (spdxPackage.packageFilename.isBlank()) return null
@@ -376,7 +377,8 @@ class SpdxDocumentFile(
                         packageManager = factory.type,
                         definitionFile = VersionControlSystem.getPathInfo(packageFile).path,
                         scope = scope,
-                        linkage = PackageLinkage.PROJECT_STATIC // TODO: Set linkage based on SPDX reference type.
+                        linkage = PackageLinkage.PROJECT_STATIC, // TODO: Set linkage based on SPDX reference type.
+                        issues = issues
                     )
                 }
             }