wip

scripts/template-helper-functions.jq

@@ -17,21 +17,17 @@ def sbom:
 			{
 				name: .name,
 				versionInfo: .version,
-				supplier: (if .supplier then .supplier else "NOASSERTION" end),
 				SPDXID: ("SPDXRef-Package--" + .name),
 				externalRefs: [
 					{
 						referenceCategory: "PACKAGE-MANAGER",
 						referenceType: "purl",
 						referenceLocator: ("pkg:generic/" + .name + "@" + .version + "?" + (.params | [to_entries[] | .key + "=" + .value] | join("\u0026")))
 					}
-				],
-				licenseDeclared: (if .licenses | length > 0 then
-					(.licenses | join(" AND "))
-				else
-					"NOASSERTION"
-				end)
+				]
 			}
+			+ if .licenses then { licenseDeclared: (.licenses | join(" AND ")) } else {} end
+			+ if .supplier then { supplier: .supplier } else {} end
 		]
 	}
 ;