From 5ecf649a417b8ae17dc8383dc32d46c03f2312df Mon Sep 17 00:00:00 2001 From: "anchore-actions-token-generator[bot]" <102182147+anchore-actions-token-generator[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 09:05:53 -0500 Subject: [PATCH] chore(deps): update Syft to v0.98.0 (#431) * chore(deps): update Syft to v0.98.0 Signed-off-by: GitHub * chore: pretty print output for snapshot tests Syft no longer defaults to pretty-printed JSON. This change made snapshot diffs unreadable. Therefore, set integration tests to configure syft to pretty print SBOMs. Signed-off-by: Will Murphy --------- Signed-off-by: GitHub Signed-off-by: Will Murphy Co-authored-by: kzantow Co-authored-by: Will Murphy --- dist/attachReleaseAssets/index.js | 2 +- dist/downloadSyft/index.js | 2 +- dist/runSyftAction/index.js | 2 +- src/SyftVersion.ts | 2 +- tests/integration/formatExports.test.ts | 3 +++ tests/integration/syft_config.yaml | 2 ++ 6 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 tests/integration/syft_config.yaml diff --git a/dist/attachReleaseAssets/index.js b/dist/attachReleaseAssets/index.js index bde87669..76f1830b 100644 --- a/dist/attachReleaseAssets/index.js +++ b/dist/attachReleaseAssets/index.js @@ -23385,7 +23385,7 @@ function wrappy (fn, cb) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.VERSION = void 0; -exports.VERSION = "v0.97.1"; +exports.VERSION = "v0.98.0"; /***/ }), diff --git a/dist/downloadSyft/index.js b/dist/downloadSyft/index.js index 52d93edf..ca8b8e8e 100644 --- a/dist/downloadSyft/index.js +++ b/dist/downloadSyft/index.js @@ -23385,7 +23385,7 @@ function wrappy (fn, cb) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.VERSION = void 0; -exports.VERSION = "v0.97.1"; +exports.VERSION = "v0.98.0"; /***/ }), diff --git a/dist/runSyftAction/index.js b/dist/runSyftAction/index.js index 679bc962..c132d332 100644 --- a/dist/runSyftAction/index.js +++ b/dist/runSyftAction/index.js @@ -23385,7 +23385,7 @@ function wrappy (fn, cb) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.VERSION = void 0; -exports.VERSION = "v0.97.1"; +exports.VERSION = "v0.98.0"; /***/ }), diff --git a/src/SyftVersion.ts b/src/SyftVersion.ts index 77f617f8..708507ac 100644 --- a/src/SyftVersion.ts +++ b/src/SyftVersion.ts @@ -1 +1 @@ -export const VERSION = "v0.97.1"; +export const VERSION = "v0.98.0"; diff --git a/tests/integration/formatExports.test.ts b/tests/integration/formatExports.test.ts index 040e7433..444ecc82 100644 --- a/tests/integration/formatExports.test.ts +++ b/tests/integration/formatExports.test.ts @@ -3,6 +3,7 @@ import * as github from "@actions/github"; import * as fs from "fs"; import * as client from "../../src/github/GithubClient"; import { runSyftAction } from "../../src/github/SyftGithubAction"; +import path from "path"; jest.setTimeout(30000); Date.now = jest.fn(() => 1482363367071); @@ -65,6 +66,8 @@ const testSource = async (source: string, format = "spdx"): Promise => { // SPDX-json is not consistently sorted, // so we sort text SPDX output for snapshots return format; + case "config": + return path.join("tests","integration", "syft_config.yaml"); } return ""; }); diff --git a/tests/integration/syft_config.yaml b/tests/integration/syft_config.yaml new file mode 100644 index 00000000..55154156 --- /dev/null +++ b/tests/integration/syft_config.yaml @@ -0,0 +1,2 @@ +format: + pretty: true