From 4d0b3702bde8940dde22582b95be29c73613d083 Mon Sep 17 00:00:00 2001 From: kzantow Date: Thu, 7 Apr 2022 07:10:32 +0000 Subject: [PATCH 1/2] Update Syft to v0.43.2 Signed-off-by: GitHub --- dist/attachReleaseAssets/index.js | 2 +- dist/downloadSyft/index.js | 2 +- dist/runSyftAction/index.js | 2 +- src/SyftVersion.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/attachReleaseAssets/index.js b/dist/attachReleaseAssets/index.js index 9f0f598d..39ebf256 100644 --- a/dist/attachReleaseAssets/index.js +++ b/dist/attachReleaseAssets/index.js @@ -18641,7 +18641,7 @@ function wrappy (fn, cb) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.VERSION = void 0; -exports.VERSION = "v0.42.2"; +exports.VERSION = "v0.43.2"; /***/ }), diff --git a/dist/downloadSyft/index.js b/dist/downloadSyft/index.js index ca33bfba..9132a3b0 100644 --- a/dist/downloadSyft/index.js +++ b/dist/downloadSyft/index.js @@ -18641,7 +18641,7 @@ function wrappy (fn, cb) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.VERSION = void 0; -exports.VERSION = "v0.42.2"; +exports.VERSION = "v0.43.2"; /***/ }), diff --git a/dist/runSyftAction/index.js b/dist/runSyftAction/index.js index 27c0c676..9833fadd 100644 --- a/dist/runSyftAction/index.js +++ b/dist/runSyftAction/index.js @@ -18641,7 +18641,7 @@ function wrappy (fn, cb) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.VERSION = void 0; -exports.VERSION = "v0.42.2"; +exports.VERSION = "v0.43.2"; /***/ }), diff --git a/src/SyftVersion.ts b/src/SyftVersion.ts index 85ae24fd..94327a60 100644 --- a/src/SyftVersion.ts +++ b/src/SyftVersion.ts @@ -1 +1 @@ -export const VERSION = "v0.42.2"; +export const VERSION = "v0.43.2"; From b8d40b8d44ef25fe62ff12f240f25b230868f110 Mon Sep 17 00:00:00 2001 From: Keith Zantow Date: Thu, 7 Apr 2022 09:20:30 -0400 Subject: [PATCH 2/2] Update snapshots Signed-off-by: Keith Zantow --- .../__snapshots__/formatExports.test.ts.snap | 91 +++++++++++++------ 1 file changed, 64 insertions(+), 27 deletions(-) diff --git a/tests/integration/__snapshots__/formatExports.test.ts.snap b/tests/integration/__snapshots__/formatExports.test.ts.snap index cd26c9f3..070cfb21 100644 --- a/tests/integration/__snapshots__/formatExports.test.ts.snap +++ b/tests/integration/__snapshots__/formatExports.test.ts.snap @@ -24,6 +24,7 @@ exports[`CycloneDX JSON alpine 1`] = ` }, \\"components\\": [ { + , \\"type\\": \\"library\\", \\"publisher\\": \\"A. Wilcox \\\\u003cawilfox@adelielinux.org\\\\u003e\\", \\"name\\": \\"libvncserver\\", @@ -155,6 +156,7 @@ exports[`CycloneDX JSON debian 1`] = ` }, \\"components\\": [ { + , \\"type\\": \\"library\\", \\"author\\": \\"Georg Brandl \\\\u003cgeorg@python.org\\\\u003e\\", \\"name\\": \\"Pygments\\", @@ -265,6 +267,7 @@ exports[`CycloneDX JSON debian 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"publisher\\": \\"APT Development Team \\\\u003cdeity@lists.debian.org\\\\u003e\\", \\"name\\": \\"apt\\", @@ -303,6 +306,7 @@ exports[`CycloneDX JSON debian 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"author\\": \\"André Arko,Samuel Giddins,Colby Swandale,Hiroshi Shibata,David Rodríguez,Grey Baker,Stephanie Morillo,Chris Morris,James Wen,Tim Moore,André Medeiros,Jessica Lynn Suttles,Terence Lee,Carl Lerche,Yehuda Katz\\", \\"name\\": \\"bundler\\", @@ -462,6 +466,7 @@ exports[`CycloneDX JSON debian 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"group\\": \\"org.anchore\\", \\"name\\": \\"example-java-app-maven\\", @@ -560,10 +565,15 @@ exports[`CycloneDX JSON debian 1`] = ` { \\"name\\": \\"syft:metadata:-:groupID\\", + }, + { + \\"name\\": \\"syft:metadata:virtualPath\\", + } ] }, { + , \\"type\\": \\"library\\", \\"group\\": \\"joda-time\\", \\"name\\": \\"joda-time\\", @@ -622,10 +632,15 @@ exports[`CycloneDX JSON debian 1`] = ` { \\"name\\": \\"syft:metadata:-:groupID\\", + }, + { + \\"name\\": \\"syft:metadata:virtualPath\\", + } ] }, { + , \\"type\\": \\"library\\", \\"author\\": \\"Isaac Z. Schlueter \\\\u003ci@izs.me\\\\u003e (http://blog.izs.me)\\", \\"name\\": \\"npm\\", @@ -748,6 +763,7 @@ exports[`CycloneDX JSON npm 1`] = ` }, \\"components\\": [ { + , \\"type\\": \\"library\\", \\"name\\": \\"chownr\\", , @@ -777,6 +793,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"fs-minipass\\", , @@ -830,6 +847,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"js-tokens\\", , @@ -883,6 +901,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"loose-envify\\", , @@ -936,6 +955,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"minipass\\", , @@ -965,6 +985,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"minizlib\\", , @@ -994,6 +1015,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"mkdirp\\", , @@ -1023,6 +1045,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"object-assign\\", , @@ -1076,6 +1099,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"prop-types\\", , @@ -1129,6 +1153,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"react\\", , @@ -1158,6 +1183,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"react-is\\", , @@ -1211,6 +1237,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"tar\\", , @@ -1240,6 +1267,7 @@ exports[`CycloneDX JSON npm 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"yallist\\", , @@ -1296,6 +1324,7 @@ exports[`CycloneDX JSON yarn 1`] = ` }, \\"components\\": [ { + , \\"type\\": \\"library\\", \\"name\\": \\"js-tokens\\", , @@ -1349,6 +1378,7 @@ exports[`CycloneDX JSON yarn 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"loose-envify\\", , @@ -1402,6 +1432,7 @@ exports[`CycloneDX JSON yarn 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"object-assign\\", , @@ -1455,6 +1486,7 @@ exports[`CycloneDX JSON yarn 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"prop-types\\", , @@ -1508,6 +1540,7 @@ exports[`CycloneDX JSON yarn 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"react\\", , @@ -1537,6 +1570,7 @@ exports[`CycloneDX JSON yarn 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"react-is\\", , @@ -1590,6 +1624,7 @@ exports[`CycloneDX JSON yarn 1`] = ` ] }, { + , \\"type\\": \\"library\\", \\"name\\": \\"trim\\", , @@ -1641,7 +1676,7 @@ exports[`CycloneDX XML alpine 1`] = ` - + A. Wilcox <awilfox@adelielinux.org> libvncserver @@ -1713,7 +1748,7 @@ exports[`CycloneDX XML debian 1`] = ` - + Georg Brandl <georg@python.org> Pygments @@ -1747,7 +1782,7 @@ exports[`CycloneDX XML debian 1`] = ` - + APT Development Team <deity@lists.debian.org> apt @@ -1763,7 +1798,7 @@ exports[`CycloneDX XML debian 1`] = ` apt-dev - + André Arko,Samuel Giddins,Colby Swandale,Hiroshi Shibata,David Rodríguez,Grey Baker,Stephanie Morillo,Chris Morris,James Wen,Tim Moore,André Medeiros,Jessica Lynn Suttles,Terence Lee,Carl Lerche,Yehuda Katz bundler @@ -1816,7 +1851,7 @@ exports[`CycloneDX XML debian 1`] = ` - + org.anchore example-java-app-maven @@ -1846,9 +1881,10 @@ exports[`CycloneDX XML debian 1`] = ` example-java-app-maven org.anchore + /java/example-java-app-maven-0.1.0.jar - + joda-time joda-time @@ -1868,9 +1904,10 @@ exports[`CycloneDX XML debian 1`] = ` joda-time joda-time + /java/example-java-app-maven-0.1.0.jar:joda-time - + Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me) npm @@ -1943,7 +1980,7 @@ exports[`CycloneDX XML npm 1`] = ` - + chownr cpe:2.3:a:chownr:chownr:2.0.0:*:*:*:*:*:*:* @@ -1956,7 +1993,7 @@ exports[`CycloneDX XML npm 1`] = ` - + fs-minipass cpe:2.3:a:fs-minipass:fs-minipass:2.1.0:*:*:*:*:*:*:* @@ -1975,7 +2012,7 @@ exports[`CycloneDX XML npm 1`] = ` - + js-tokens cpe:2.3:a:js-tokens:js-tokens:4.0.0:*:*:*:*:*:*:* @@ -1994,7 +2031,7 @@ exports[`CycloneDX XML npm 1`] = ` - + loose-envify cpe:2.3:a:loose-envify:loose-envify:1.4.0:*:*:*:*:*:*:* @@ -2013,7 +2050,7 @@ exports[`CycloneDX XML npm 1`] = ` - + minipass cpe:2.3:a:minipass:minipass:3.1.3:*:*:*:*:*:*:* @@ -2026,7 +2063,7 @@ exports[`CycloneDX XML npm 1`] = ` - + minizlib cpe:2.3:a:minizlib:minizlib:2.1.2:*:*:*:*:*:*:* @@ -2039,7 +2076,7 @@ exports[`CycloneDX XML npm 1`] = ` - + mkdirp cpe:2.3:a:mkdirp:mkdirp:1.0.4:*:*:*:*:*:*:* @@ -2052,7 +2089,7 @@ exports[`CycloneDX XML npm 1`] = ` - + object-assign cpe:2.3:a:object-assign:object-assign:4.1.1:*:*:*:*:*:*:* @@ -2071,7 +2108,7 @@ exports[`CycloneDX XML npm 1`] = ` - + prop-types cpe:2.3:a:prop-types:prop-types:15.7.2:*:*:*:*:*:*:* @@ -2090,7 +2127,7 @@ exports[`CycloneDX XML npm 1`] = ` - + react cpe:2.3:a:react:react:16.14.0:*:*:*:*:*:*:* @@ -2103,7 +2140,7 @@ exports[`CycloneDX XML npm 1`] = ` - + react-is cpe:2.3:a:react-is:react-is:16.13.1:*:*:*:*:*:*:* @@ -2122,7 +2159,7 @@ exports[`CycloneDX XML npm 1`] = ` - + tar cpe:2.3:a:tar:tar:6.1.0:*:*:*:*:*:*:* @@ -2135,7 +2172,7 @@ exports[`CycloneDX XML npm 1`] = ` - + yallist cpe:2.3:a:yallist:yallist:4.0.0:*:*:*:*:*:*:* @@ -2169,7 +2206,7 @@ exports[`CycloneDX XML yarn 1`] = ` - + js-tokens cpe:2.3:a:js-tokens:js-tokens:4.0.0:*:*:*:*:*:*:* @@ -2188,7 +2225,7 @@ exports[`CycloneDX XML yarn 1`] = ` - + loose-envify cpe:2.3:a:loose-envify:loose-envify:1.4.0:*:*:*:*:*:*:* @@ -2207,7 +2244,7 @@ exports[`CycloneDX XML yarn 1`] = ` - + object-assign cpe:2.3:a:object-assign:object-assign:4.1.1:*:*:*:*:*:*:* @@ -2226,7 +2263,7 @@ exports[`CycloneDX XML yarn 1`] = ` - + prop-types cpe:2.3:a:prop-types:prop-types:15.7.2:*:*:*:*:*:*:* @@ -2245,7 +2282,7 @@ exports[`CycloneDX XML yarn 1`] = ` - + react cpe:2.3:a:react:react:16.14.0:*:*:*:*:*:*:* @@ -2258,7 +2295,7 @@ exports[`CycloneDX XML yarn 1`] = ` - + react-is cpe:2.3:a:react-is:react-is:16.13.1:*:*:*:*:*:*:* @@ -2277,7 +2314,7 @@ exports[`CycloneDX XML yarn 1`] = ` - + trim cpe:2.3:a:trim:trim:0.0.2:*:*:*:*:*:*:*