Skip to content

Commit

Permalink
test: adjust expected component sbom to be aligned with mocked npm ls…
Browse files Browse the repository at this point in the history 
… versions

Signed-off-by: Zvi Grinberg <zgrinber@redhat.com>
  • Loading branch information
@zvigrinberg
zvigrinberg committed Nov 1, 2023
1 parent 576772e commit 702c77e
Show file tree
Hide file tree
Showing 3 changed files with 276 additions and 281 deletions.
5 changes: 0 additions & 5 deletions src/test/java/com/redhat/exhort/providers/Javascript_Npm_Provider_Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@
import java.util.stream.Stream;

import com.redhat.exhort.tools.Operations;
import net.bytebuddy.asm.Advice;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
Expand Down
276 changes: 138 additions & 138 deletions src/test/resources/tst_manifests/npm/deps_with_ignore/expected_component_sbom.json
View file
Original file line number Diff line number Diff line change
@@ -1,140 +1,140 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.4",
"version": 1,
"metadata": {
,
"component": {
"name": "backend",
"version": "1.0.0",
"purl": "pkg:npm/backend@1.0.0",
"type": "application",
"bom-ref": "pkg:npm/backend@1.0.0"
}
},
"components": [
{
"name": "backend",
"version": "1.0.0",
"purl": "pkg:npm/backend@1.0.0",
"type": "application",
"bom-ref": "pkg:npm/backend@1.0.0"
},
{
"group": "@hapi",
"name": "joi",
"version": "17.1.1",
"purl": "pkg:npm/%40hapi/joi@17.1.1",
"type": "library",
"bom-ref": "pkg:npm/%40hapi/joi@17.1.1"
},
{
"name": "axios",
"version": "0.19.2",
"purl": "pkg:npm/axios@0.19.2",
"type": "library",
"bom-ref": "pkg:npm/axios@0.19.2"
},
{
"name": "backend",
"version": "0.0.0",
"purl": "pkg:npm/backend@0.0.0",
"type": "library",
"bom-ref": "pkg:npm/backend@0.0.0"
},
{
"name": "bcryptjs",
"version": "2.4.3",
"purl": "pkg:npm/bcryptjs@2.4.3",
"type": "library",
"bom-ref": "pkg:npm/bcryptjs@2.4.3"
},
{
"name": "dotenv",
"version": "8.6.0",
"purl": "pkg:npm/dotenv@8.6.0",
"type": "library",
"bom-ref": "pkg:npm/dotenv@8.6.0"
},
{
"name": "express",
"version": "4.18.2",
"purl": "pkg:npm/express@4.18.2",
"type": "library",
"bom-ref": "pkg:npm/express@4.18.2"
},
{
"name": "jsdom",
"version": "19.0.0",
"purl": "pkg:npm/jsdom@19.0.0",
"type": "library",
"bom-ref": "pkg:npm/jsdom@19.0.0"
},
{
"name": "mongoose",
"version": "5.13.21",
"purl": "pkg:npm/mongoose@5.13.21",
"type": "library",
"bom-ref": "pkg:npm/mongoose@5.13.21"
},
{
"name": "nodemon",
"version": "2.0.22",
"purl": "pkg:npm/nodemon@2.0.22",
"type": "library",
"bom-ref": "pkg:npm/nodemon@2.0.22"
}
],
"dependencies": [
{
"ref": "pkg:npm/backend@1.0.0",
"dependsOn": [
"pkg:npm/%40hapi/joi@17.1.1",
"pkg:npm/axios@0.19.2",
"pkg:npm/backend@0.0.0",
"pkg:npm/bcryptjs@2.4.3",
"pkg:npm/dotenv@8.6.0",
"pkg:npm/express@4.18.2",
"pkg:npm/jsdom@19.0.0",
"pkg:npm/mongoose@5.13.21",
"pkg:npm/nodemon@2.0.22"
]
},
{
"ref": "pkg:npm/%40hapi/joi@17.1.1",
"dependsOn": []
},
{
"ref": "pkg:npm/axios@0.19.2",
"dependsOn": []
},
{
"ref": "pkg:npm/backend@0.0.0",
"dependsOn": []
},
{
"ref": "pkg:npm/bcryptjs@2.4.3",
"dependsOn": []
},
{
"ref": "pkg:npm/dotenv@8.6.0",
"dependsOn": []
},
{
"ref": "pkg:npm/express@4.18.2",
"dependsOn": []
},
{
"ref": "pkg:npm/jsdom@19.0.0",
"dependsOn": []
},
{
"ref": "pkg:npm/mongoose@5.13.21",
"dependsOn": []
},
{
"ref": "pkg:npm/nodemon@2.0.22",
"dependsOn": []
}
]
"bomFormat" : "CycloneDX",
"specVersion" : "1.4",
"version" : 1,
"metadata" : {
"timestamp" : "2023-11-01T11:28:37Z",
"component" : {
"name" : "backend",
"version" : "1.0.0",
"purl" : "pkg:npm/backend@1.0.0",
"type" : "application",
"bom-ref" : "pkg:npm/backend@1.0.0"
}
},
"components" : [
{
"name" : "backend",
"version" : "1.0.0",
"purl" : "pkg:npm/backend@1.0.0",
"type" : "application",
"bom-ref" : "pkg:npm/backend@1.0.0"
},
{
"group" : "@hapi",
"name" : "joi",
"version" : "17.1.1",
"purl" : "pkg:npm/%40hapi/joi@17.1.1",
"type" : "library",
"bom-ref" : "pkg:npm/%40hapi/joi@17.1.1"
},
{
"name" : "axios",
"version" : "0.19.2",
"purl" : "pkg:npm/axios@0.19.2",
"type" : "library",
"bom-ref" : "pkg:npm/axios@0.19.2"
},
{
"name" : "backend",
"version" : "0.0.0",
"purl" : "pkg:npm/backend@0.0.0",
"type" : "library",
"bom-ref" : "pkg:npm/backend@0.0.0"
},
{
"name" : "bcryptjs",
"version" : "2.4.3",
"purl" : "pkg:npm/bcryptjs@2.4.3",
"type" : "library",
"bom-ref" : "pkg:npm/bcryptjs@2.4.3"
},
{
"name" : "dotenv",
"version" : "8.6.0",
"purl" : "pkg:npm/dotenv@8.6.0",
"type" : "library",
"bom-ref" : "pkg:npm/dotenv@8.6.0"
},
{
"name" : "express",
"version" : "4.18.2",
"purl" : "pkg:npm/express@4.18.2",
"type" : "library",
"bom-ref" : "pkg:npm/express@4.18.2"
},
{
"name" : "jsdom",
"version" : "19.0.0",
"purl" : "pkg:npm/jsdom@19.0.0",
"type" : "library",
"bom-ref" : "pkg:npm/jsdom@19.0.0"
},
{
"name" : "mongoose",
"version" : "5.13.20",
"purl" : "pkg:npm/mongoose@5.13.20",
"type" : "library",
"bom-ref" : "pkg:npm/mongoose@5.13.20"
},
{
"name" : "nodemon",
"version" : "2.0.22",
"purl" : "pkg:npm/nodemon@2.0.22",
"type" : "library",
"bom-ref" : "pkg:npm/nodemon@2.0.22"
}
],
"dependencies" : [
{
"ref" : "pkg:npm/backend@1.0.0",
"dependsOn" : [
"pkg:npm/%40hapi/joi@17.1.1",
"pkg:npm/axios@0.19.2",
"pkg:npm/backend@0.0.0",
"pkg:npm/bcryptjs@2.4.3",
"pkg:npm/dotenv@8.6.0",
"pkg:npm/express@4.18.2",
"pkg:npm/jsdom@19.0.0",
"pkg:npm/mongoose@5.13.20",
"pkg:npm/nodemon@2.0.22"
]
},
{
"ref" : "pkg:npm/%40hapi/joi@17.1.1",
"dependsOn" : [ ]
},
{
"ref" : "pkg:npm/axios@0.19.2",
"dependsOn" : [ ]
},
{
"ref" : "pkg:npm/backend@0.0.0",
"dependsOn" : [ ]
},
{
"ref" : "pkg:npm/bcryptjs@2.4.3",
"dependsOn" : [ ]
},
{
"ref" : "pkg:npm/dotenv@8.6.0",
"dependsOn" : [ ]
},
{
"ref" : "pkg:npm/express@4.18.2",
"dependsOn" : [ ]
},
{
"ref" : "pkg:npm/jsdom@19.0.0",
"dependsOn" : [ ]
},
{
"ref" : "pkg:npm/mongoose@5.13.20",
"dependsOn" : [ ]
},
{
"ref" : "pkg:npm/nodemon@2.0.22",
"dependsOn" : [ ]
}
]
}
Loading

0 comments on commit 702c77e

Please sign in to comment.