added scvs tests

Signed-off-by: Vivek Kumar Sahu <[email protected]>
interlynk-io · Oct 1, 2024 · 3dc9184 · 3dc9184
1 parent 49d8c40
commit 3dc9184
Show file tree

Hide file tree

Showing 5 changed files with 390 additions and 12 deletions.
diff --git a/pkg/sbom/cdx.go b/pkg/sbom/cdx.go
@@ -215,7 +215,7 @@ func (c *CdxDoc) parseSpec() {
 
 func (c *CdxDoc) parseSignature() {
 	if c.doc.Declarations == nil {
-		fmt.Println("Declaratic.doc.Declarationsons field is nil ")
+		fmt.Println("c.doc.Declarations field is nil ")
 		return
 	}
 
@@ -295,6 +295,7 @@ func copyC(cdxc *cydx.Component, c *CdxDoc) *Component {
 	nc.Name = cdxc.Name
 	nc.purpose = string(cdxc.Type)
 	nc.isReqFieldsPresent = c.pkgRequiredFields(cdxc)
+	nc.CopyRight = cdxc.Copyright
 
 	ncpe := cpe.NewCPE(cdxc.CPE)
 	if ncpe.Valid() {

diff --git a/pkg/scvs/features.go b/pkg/scvs/features.go
@@ -59,7 +59,7 @@ func scvsSBOMAutomationCreationCheck(d sbom.Document, c *scvsCheck) scvsScore {
 func scvsSBOMUniqIDCheck(d sbom.Document, c *scvsCheck) scvsScore {
 	s := newScoreFromScvsCheck(c)
 
-	if IsSBOMHasUniqID(d, s) {
+	if IsSBOMHasGlobalUniqID(d, s) {
 		s.setL3Score(green + bold + "✓" + reset)
 		s.setL2Score(green + bold + "✓" + reset)
 		s.setL1Score(green + bold + "✓" + reset)
@@ -115,7 +115,7 @@ func scvsSBOMSigVerified(d sbom.Document, c *scvsCheck) scvsScore {
 func scvsSBOMTimestampCheck(d sbom.Document, c *scvsCheck) scvsScore {
 	s := newScoreFromScvsCheck(c)
 
-	if IsSBOMTimestamped(d, s) {
+	if DoesSBOMHasTimestamp(d, s) {
 		s.setL3Score(green + bold + "✓" + reset)
 		s.setL2Score(green + bold + "✓" + reset)
 		s.setL1Score(green + bold + "✓" + reset)