@soos-io/soos-sbom 1.0.4-pre.1 → 1.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/index.js +3 -2
- package/package.json +2 -2
package/bin/index.js
CHANGED
|
@@ -48,6 +48,7 @@ class SOOSSBOMAnalysis {
|
|
|
48
48
|
let branchHash;
|
|
49
49
|
let analysisId;
|
|
50
50
|
let scanStatusUrl;
|
|
51
|
+
let scanStatus;
|
|
51
52
|
let sbomFilePaths = await this.findSbomFilePaths();
|
|
52
53
|
const hasMoreThanMaximumManifests = sbomFilePaths.length > constants_1.SOOS_SBOM_CONSTANTS.MaxSbomsPerScan;
|
|
53
54
|
if (hasMoreThanMaximumManifests) {
|
|
@@ -115,7 +116,7 @@ class SOOSSBOMAnalysis {
|
|
|
115
116
|
scanType,
|
|
116
117
|
scanUrl: result.scanUrl,
|
|
117
118
|
});
|
|
118
|
-
|
|
119
|
+
scanStatus = await soosAnalysisService.waitForScanToFinish({
|
|
119
120
|
scanStatusUrl: result.scanStatusUrl,
|
|
120
121
|
scanUrl: result.scanUrl,
|
|
121
122
|
scanType,
|
|
@@ -125,7 +126,7 @@ class SOOSSBOMAnalysis {
|
|
|
125
126
|
(0, process_1.exit)(exitCodeWithMessage.exitCode);
|
|
126
127
|
}
|
|
127
128
|
catch (error) {
|
|
128
|
-
if (projectHash && branchHash && analysisId) {
|
|
129
|
+
if (projectHash && branchHash && analysisId && (!scanStatus || !(0, utilities_1.isScanDone)(scanStatus))) {
|
|
129
130
|
await soosAnalysisService.updateScanStatus({
|
|
130
131
|
clientId: this.args.clientId,
|
|
131
132
|
projectHash,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@soos-io/soos-sbom",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.5",
|
|
4
4
|
"description": "SOOS wrapper script to upload SBOMs.",
|
|
5
5
|
"main": "bin/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
},
|
|
40
40
|
"homepage": "https://github.com/soos-io/soos-sbom#readme",
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@soos-io/api-client": "1.0.
|
|
42
|
+
"@soos-io/api-client": "1.0.9",
|
|
43
43
|
"argparse": "^2.0.1",
|
|
44
44
|
"glob": "^11.0.0",
|
|
45
45
|
"tslib": "^2.6.3"
|