From d4f1f49bba159bc4bd63e7bbd1cc423fe038beca Mon Sep 17 00:00:00 2001 From: SOOS-GSteen Date: Wed, 19 Jun 2024 15:32:18 -0400 Subject: [PATCH] PA-14328 syft 1.7.0 --- .npmrc | 1 + Dockerfile | 2 +- package-lock.json | 56 ++++++++++++++++++++++++++--------------------- package.json | 4 ++-- src/index.ts | 4 ++-- 5 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..0453efc --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +registry=https://registry.npmjs.org \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1d6de58..2317161 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:18-slim as BASE -ARG SYFT_VERSION=v1.0.1 +ARG SYFT_VERSION=v1.7.0 RUN apt-get update && apt-get install -y wget && \ wget -qO- https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin ${SYFT_VERSION} && \ diff --git a/package-lock.json b/package-lock.json index 1189092..207e59c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "soos-csa", - "version": "1.1.8", + "version": "1.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "soos-csa", - "version": "1.1.8", + "version": "1.2.0", "license": "MIT", "dependencies": { - "@soos-io/api-client": "0.2.48", + "@soos-io/api-client": "0.3.1", "argparse": "^2.0.1", "glob": "^10.3.14", "tslib": "^2.6.2" @@ -47,15 +47,15 @@ } }, "node_modules/@soos-io/api-client": { - "version": "0.2.48", - "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.2.48.tgz", - "integrity": "sha512-383+r3hB5z5c55dYNj78f+44ZzQnR4O8aSTR4GQ4O3MCr+5nbTGsgBav2pbjKkFvEwwsrViPxGDUVujm/sccUQ==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@soos-io/api-client/-/api-client-0.3.1.tgz", + "integrity": "sha512-GCmGcZMgwUGmT7in7+dJTmRjEB99aTs9vJhDL3/ogIOzZ28/OIFKCLC0g5z3SqNNrtc2A6F1uv/Mts4Dm8EjVg==", "dependencies": { "argparse": "^2.0.1", "axios": "^1.7.2", "form-data": "^4.0.0", "glob": "^10.4.1", - "tslib": "^2.6.2" + "tslib": "^2.6.3" } }, "node_modules/@types/argparse": { @@ -65,9 +65,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.12.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.13.tgz", - "integrity": "sha512-gBGeanV41c1L171rR7wjbMiEpEI/l5XFQdLLfhr/REwpgDy/4U8y89+i8kRiLzDyZdOkXh+cRaTetUnCYutoXA==", + "version": "20.14.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.6.tgz", + "integrity": "sha512-JbA0XIJPL1IiNnU7PFxDXyfAwcwVVrOoqyzzyQTyMeVhBzkJVMSkC1LlVsRQ2lpqiY4n6Bb9oCS6lzDKVQxbZw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -206,9 +206,9 @@ } }, "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -234,14 +234,15 @@ } }, "node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "version": "10.4.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz", + "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { @@ -268,9 +269,9 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/jackspeak": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", - "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz", + "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -333,6 +334,11 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -357,9 +363,9 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -495,9 +501,9 @@ } }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/typescript": { "version": "5.4.5", diff --git a/package.json b/package.json index 5cb3df4..9428644 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "author": "SOOS", "publisher": "SOOS", "license": "MIT", - "version": "1.1.8", + "version": "1.2.0", "main": "dist/index.js", "scripts": { "setup:install": "npm install", @@ -43,7 +43,7 @@ }, "homepage": "https://github.com/soos-io/soos-csa#readme", "dependencies": { - "@soos-io/api-client": "0.2.48", + "@soos-io/api-client": "0.3.1", "argparse": "^2.0.1", "glob": "^10.3.14", "tslib": "^2.6.2" diff --git a/src/index.ts b/src/index.ts index 9e19cfe..4256481 100644 --- a/src/index.ts +++ b/src/index.ts @@ -212,7 +212,7 @@ class SOOSCSAAnalysis { }); syftProcess.on("close", (code) => { - soosLogger.verboseDebug(`syft: child process exited with code ${code}`); + soosLogger.debug(`syft: child process exited with code ${code}`); if (code === 0) { resolve(); } else { @@ -230,7 +230,7 @@ class SOOSCSAAnalysis { soosLogger.setMinLogLevel(args.logLevel); soosLogger.setVerbose(args.verbose); soosLogger.info("Configuration read"); - soosLogger.verboseDebug( + soosLogger.debug( JSON.stringify( obfuscateProperties(args as unknown as Record, ["apiKey"]), null,