From bbece41484d75b7cde1d19aea74e7022d56e9983 Mon Sep 17 00:00:00 2001 From: SOOS-JAlvarez Date: Tue, 23 Jan 2024 14:37:40 -0300 Subject: [PATCH 1/4] PA-12554 Package Update --- package-lock.json | 26 +++++++++++++------------- package.json | 4 ++-- src/index.ts | 7 ++++--- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index e6a210c..e9fe244 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "@soos-io/soos-sast", - "version": "0.1.21", + "version": "0.1.22", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@soos-io/soos-sast", - "version": "0.1.21", + "version": "0.1.22", "license": "MIT", "dependencies": { - "@soos-io/api-client": "0.2.28", + "@soos-io/api-client": "0.2.35-pre.1", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2" @@ -50,12 +50,12 @@ } }, "node_modules/@soos-io/api-client": { - "version": "0.2.28", - "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.28.tgz", - "integrity": "sha512-faO8FRyLZkWsrOfAoX2RX1Kmcxf6mtBSfpo99qlGobl2V2oiVhEx09RwAyjn+wfpe3r+QIJRlEKh1G5hdv3XPQ==", + "version": "0.2.35-pre.1", + "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.35-pre.1.tgz", + "integrity": "sha512-ZyS3rCToCiDm7JxBToyIzO0RAVP7EZNOW/ne+Z6yS8BR8e8VKwBzaxV5RN5AsnIOSgZjpTWieWVFN9RwCvTAjA==", "dependencies": { "argparse": "^2.0.1", - "axios": "^1.6.4", + "axios": "^1.6.5", "form-data": "^4.0.0", "glob": "^10.3.10", "tslib": "^2.6.2" @@ -109,9 +109,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.4.tgz", - "integrity": "sha512-heJnIs6N4aa1eSthhN9M5ioILu8Wi8vmQW9iHQ9NUvfkJb0lEEDUiIdQNAuBtfUt3FxReaKdpQA5DbmMOqzF/A==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", + "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", "dependencies": { "follow-redirects": "^1.15.4", "form-data": "^4.0.0", @@ -190,9 +190,9 @@ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "funding": [ { "type": "individual", diff --git a/package.json b/package.json index e4d1a7c..c2d3c26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soos-io/soos-sast", - "version": "0.1.21", + "version": "0.1.22", "description": "SOOS Static Application Security Testing (SAST) scanning support.", "main": "bin/index.js", "scripts": { @@ -27,7 +27,7 @@ }, "homepage": "https://github.com/soos-io/soos-sast#readme", "dependencies": { - "@soos-io/api-client": "0.2.28", + "@soos-io/api-client": "0.2.35-pre.1", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2" diff --git a/src/index.ts b/src/index.ts index 8b157a2..a8816f7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -28,14 +28,15 @@ class SOOSSASTAnalysis { constructor(private args: SOOSSASTAnalysisArgs) {} static parseArgs(): SOOSSASTAnalysisArgs { - const analysisArgumentParser = AnalysisArgumentParser.create(ScanType.SAST); - - analysisArgumentParser.addBaseScanArguments( + const analysisArgumentParser = AnalysisArgumentParser.create( IntegrationName.SoosSast, IntegrationType.Script, + ScanType.SAST, version, ); + analysisArgumentParser.addBaseScanArguments(); + analysisArgumentParser.argumentParser.add_argument("--directoriesToExclude", { help: "Listing of directories or patterns to exclude from the search for manifest files. eg: **bin/start/**, **/start/**", type: (value: string) => { From c65f20d76974b04133ee37213b418c713738ee0d Mon Sep 17 00:00:00 2001 From: SOOS-JAlvarez Date: Tue, 23 Jan 2024 14:43:47 -0300 Subject: [PATCH 2/4] lock after merge --- package-lock.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9af2b27..cba3fea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,7 @@ "version": "0.1.22", "license": "MIT", "dependencies": { -<<<<<<< HEAD "@soos-io/api-client": "0.2.35-pre.1", -======= - "@soos-io/api-client": "0.2.29", ->>>>>>> e7edf438b67bd65d7d235c4fdcbc46cd3c16a65c "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2" @@ -54,15 +50,9 @@ } }, "node_modules/@soos-io/api-client": { -<<<<<<< HEAD "version": "0.2.35-pre.1", "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.35-pre.1.tgz", "integrity": "sha512-ZyS3rCToCiDm7JxBToyIzO0RAVP7EZNOW/ne+Z6yS8BR8e8VKwBzaxV5RN5AsnIOSgZjpTWieWVFN9RwCvTAjA==", -======= - "version": "0.2.29", - "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.29.tgz", - "integrity": "sha512-wU+jkYRJ1WBZ1DFdh1p/wBGus7ddLBpJs3GInBqsEQ1atmVKkTCgqXHBVFRiX1lk9X1HUKVwjUHMUTj5iC0XnA==", ->>>>>>> e7edf438b67bd65d7d235c4fdcbc46cd3c16a65c "dependencies": { "argparse": "^2.0.1", "axios": "^1.6.5", From d9c18c18703d53275778d87bc7bb34f7506e5e9c Mon Sep 17 00:00:00 2001 From: SOOS-JAlvarez Date: Tue, 23 Jan 2024 14:46:31 -0300 Subject: [PATCH 3/4] version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cba3fea..775204d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@soos-io/soos-sast", - "version": "0.1.22", + "version": "0.1.23", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@soos-io/soos-sast", - "version": "0.1.22", + "version": "0.1.23", "license": "MIT", "dependencies": { "@soos-io/api-client": "0.2.35-pre.1", diff --git a/package.json b/package.json index d6957c9..4944e38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soos-io/soos-sast", - "version": "0.1.22", + "version": "0.1.23", "description": "SOOS Static Application Security Testing (SAST) scanning support.", "main": "bin/index.js", "scripts": { From 9b32dd262a544c11cdf9048784e5a97f44918487 Mon Sep 17 00:00:00 2001 From: SOOS-JAlvarez Date: Tue, 23 Jan 2024 15:28:54 -0300 Subject: [PATCH 4/4] stable --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 775204d..3e0389e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.23", "license": "MIT", "dependencies": { - "@soos-io/api-client": "0.2.35-pre.1", + "@soos-io/api-client": "0.2.35", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2" @@ -50,9 +50,9 @@ } }, "node_modules/@soos-io/api-client": { - "version": "0.2.35-pre.1", - "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.35-pre.1.tgz", - "integrity": "sha512-ZyS3rCToCiDm7JxBToyIzO0RAVP7EZNOW/ne+Z6yS8BR8e8VKwBzaxV5RN5AsnIOSgZjpTWieWVFN9RwCvTAjA==", + "version": "0.2.35", + "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.35.tgz", + "integrity": "sha512-k/e598Yc2hxyZEM8cwrVps/8PQ5STmDiZMMUSDTn88ZXULR9WGF4fBgZwYFTwpW6TqR5E5mzGIQiLWFEMCrKbA==", "dependencies": { "argparse": "^2.0.1", "axios": "^1.6.5", diff --git a/package.json b/package.json index 4944e38..e960bc5 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "homepage": "https://github.com/soos-io/soos-sast#readme", "dependencies": { - "@soos-io/api-client": "0.2.35-pre.1", + "@soos-io/api-client": "0.2.35", "argparse": "^2.0.1", "glob": "^10.3.10", "tslib": "^2.6.2"