From 8b9c5ba7fc9716b163c654c6c2e7b49bb78df353 Mon Sep 17 00:00:00 2001 From: SOOS-GSteen Date: Tue, 26 Dec 2023 10:11:29 -0500 Subject: [PATCH 1/3] PA-12431 logging --- package-lock.json | 8 ++++---- package.json | 2 +- src/index.ts | 16 ++++++---------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01715f3..e282b45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.14", "license": "MIT", "dependencies": { - "@soos-io/api-client": "0.2.25", + "@soos-io/api-client": "^0.2.26-pre.2", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2" @@ -47,9 +47,9 @@ } }, "node_modules/@soos-io/api-client": { - "version": "0.2.25", - "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.25.tgz", - "integrity": "sha512-PmCjmeA2AeyYb/vNxPHsIYuKt/M2oSQPoAFzi3qcPhGxCzZ3ar2exyWruOnIjDIqVzNJN6mKXUO0yuv3qdYuSg==", + "version": "0.2.26-pre.2", + "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.26-pre.2.tgz", + "integrity": "sha512-GnfNUQv6wEOiCJzP9tquvg+g1eWzOrXXxzoBRLOjSiui5eWO1qLHHADRMUOtbT37HQ2Iyndpdg1vOHUIekOwDw==", "dependencies": { "argparse": "^2.0.1", "axios": "^1.6.2", diff --git a/package.json b/package.json index caf27c8..fcf9326 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "patch-api-client": "npm version patch --no-git-tag-version && npm run setup:clean && npm install @soos-io/api-client@latest --save-exact && npm install && npm run check" }, "dependencies": { - "@soos-io/api-client": "0.2.25", + "@soos-io/api-client": "^0.2.26-pre.2", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2" diff --git a/src/index.ts b/src/index.ts index eb7e30a..cee8c39 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,7 +7,7 @@ import { isUrlAvailable, convertStringToBase64, obfuscateProperties, - getAnalysisExitCode, + getAnalysisExitCodeWithMessage, } from "@soos-io/api-client/dist/utilities"; import { ScanStatus, @@ -380,13 +380,9 @@ class SOOSDASTAnalysis { }); } - const exitCode = getAnalysisExitCode( - scanStatus, - this.args.integrationName, - this.args.onFailure, - ); - soosLogger.always(`exit ${exitCode}`); - exit(exitCode); + const exitCodeWithMessage = getAnalysisExitCodeWithMessage(scanStatus, this.args.onFailure); + soosLogger.always(`${exitCodeWithMessage.message} - exit ${exitCodeWithMessage.exitCode}`); + exit(exitCodeWithMessage.exitCode); } catch (error) { if (projectHash && branchHash && analysisId) await soosAnalysisService.updateScanStatus({ @@ -400,7 +396,7 @@ class SOOSDASTAnalysis { scanStatusUrl, }); soosLogger.error(error); - soosLogger.always("exit 1"); + soosLogger.always(`${error} - exit 1`); exit(1); } } @@ -448,7 +444,7 @@ class SOOSDASTAnalysis { await soosDASTAnalysis.runAnalysis(); } catch (error) { soosLogger.error(`Error on createAndRun: ${error}`); - soosLogger.always("exit 1"); + soosLogger.always(`Error on createAndRun: ${error} - exit 1`); exit(1); } } From d156ecb7416bca75c582562473f298ccf5aa7903 Mon Sep 17 00:00:00 2001 From: SOOS-GSteen Date: Tue, 26 Dec 2023 12:04:16 -0500 Subject: [PATCH 2/3] c --- package-lock.json | 8 ++++---- package.json | 2 +- src/index.ts | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index e282b45..0b09c8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.14", "license": "MIT", "dependencies": { - "@soos-io/api-client": "^0.2.26-pre.2", + "@soos-io/api-client": "^0.2.26-pre.3", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2" @@ -47,9 +47,9 @@ } }, "node_modules/@soos-io/api-client": { - "version": "0.2.26-pre.2", - "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.26-pre.2.tgz", - "integrity": "sha512-GnfNUQv6wEOiCJzP9tquvg+g1eWzOrXXxzoBRLOjSiui5eWO1qLHHADRMUOtbT37HQ2Iyndpdg1vOHUIekOwDw==", + "version": "0.2.26-pre.3", + "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.26-pre.3.tgz", + "integrity": "sha512-72bDND5fjLYzzcYTwkhL32ql3ibrZNqShRcdiX5yfRv1DeRdazv6x1fDW81MmtNZM8VH41e3cy9/rKWZ3vU8nQ==", "dependencies": { "argparse": "^2.0.1", "axios": "^1.6.2", diff --git a/package.json b/package.json index fcf9326..9a4279b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "patch-api-client": "npm version patch --no-git-tag-version && npm run setup:clean && npm install @soos-io/api-client@latest --save-exact && npm install && npm run check" }, "dependencies": { - "@soos-io/api-client": "^0.2.26-pre.2", + "@soos-io/api-client": "^0.2.26-pre.3", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2" diff --git a/src/index.ts b/src/index.ts index cee8c39..f8fd9db 100644 --- a/src/index.ts +++ b/src/index.ts @@ -380,7 +380,11 @@ class SOOSDASTAnalysis { }); } - const exitCodeWithMessage = getAnalysisExitCodeWithMessage(scanStatus, this.args.onFailure); + const exitCodeWithMessage = getAnalysisExitCodeWithMessage( + scanStatus, + this.args.integrationName, + this.args.onFailure, + ); soosLogger.always(`${exitCodeWithMessage.message} - exit ${exitCodeWithMessage.exitCode}`); exit(exitCodeWithMessage.exitCode); } catch (error) { From dedf9f2d2adcbc634b29fa6b5ce36a704953501a Mon Sep 17 00:00:00 2001 From: SOOS-GSteen Date: Tue, 26 Dec 2023 14:17:27 -0500 Subject: [PATCH 3/3] c --- package-lock.json | 12 ++++++------ package.json | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0b09c8b..045d282 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "soos-dast", - "version": "2.0.14", + "version": "2.0.15", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "soos-dast", - "version": "2.0.14", + "version": "2.0.15", "license": "MIT", "dependencies": { - "@soos-io/api-client": "^0.2.26-pre.3", + "@soos-io/api-client": "0.2.26", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2" @@ -47,9 +47,9 @@ } }, "node_modules/@soos-io/api-client": { - "version": "0.2.26-pre.3", - "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.26-pre.3.tgz", - "integrity": "sha512-72bDND5fjLYzzcYTwkhL32ql3ibrZNqShRcdiX5yfRv1DeRdazv6x1fDW81MmtNZM8VH41e3cy9/rKWZ3vU8nQ==", + "version": "0.2.26", + "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.26.tgz", + "integrity": "sha512-vOKn7Xo2aYi6UCsQkexYUryqEXrJbjkBtJGYUgrHbzQmOr13FHMu6TzLGv1OKKbaoQftakzadluzfC6l/lUl+A==", "dependencies": { "argparse": "^2.0.1", "axios": "^1.6.2", diff --git a/package.json b/package.json index 9a4279b..1668c8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "soos-dast", - "version": "2.0.14", + "version": "2.0.15", "description": "SOOS DAST - The affordable no limit web vulnerability scanner", "main": "index.js", "scripts": { @@ -17,7 +17,7 @@ "patch-api-client": "npm version patch --no-git-tag-version && npm run setup:clean && npm install @soos-io/api-client@latest --save-exact && npm install && npm run check" }, "dependencies": { - "@soos-io/api-client": "^0.2.26-pre.3", + "@soos-io/api-client": "0.2.26", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2"