Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
chornns committed May 23, 2024
2 parents 612dec6 + 6ed64a9 commit 901b53b
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 20 deletions.
15 changes: 11 additions & 4 deletions dist/nowsecure-convert-sarif/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -49201,7 +49201,7 @@ const nowsecure_version_1 = __nccwpck_require__(1328);
function encodePurl(ecosystem, name, version) {
let purl = `pkg:${ecosystem}/${name}`;
if (version) {
purl += `@${version}`;
purl += `@${encodeURIComponent(version)}`;
}
return purl;
}
Expand Down Expand Up @@ -49238,8 +49238,15 @@ function convertToSnapshot(deputy, githubCorrelator, context) {
// added the TypeScript compiler will emit an error.
}
const purl = encodePurl(ecosystem, component.name, component.version);
manifest.addDirectDependency(new dependency_submission_toolkit_1.Package(purl));
manifests[source] = manifest;
try {
const pkg = new dependency_submission_toolkit_1.Package(purl);
manifest.addDirectDependency(pkg);
manifests[source] = manifest;
}
catch (e) {
// Add some additional context about the PURL that failed to be parsed.
console.warn(`${e.message} (PURL is '${purl}')`);
}
}
const snapshot = new dependency_submission_toolkit_1.Snapshot({
version: nowsecure_version_1.version,
Expand Down Expand Up @@ -49454,7 +49461,7 @@ exports.getFindingsTable = getFindingsTable;
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.version = void 0;
// Generated by genversion.
exports.version = "4.0.0";
exports.version = "4.0.1";


/***/ }),
Expand Down
2 changes: 1 addition & 1 deletion dist/nowsecure-convert-sarif/index.js.map

Large diffs are not rendered by default.

15 changes: 11 additions & 4 deletions dist/nowsecure-create-issues/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -77268,7 +77268,7 @@ const nowsecure_version_1 = __nccwpck_require__(1328);
function encodePurl(ecosystem, name, version) {
let purl = `pkg:${ecosystem}/${name}`;
if (version) {
purl += `@${version}`;
purl += `@${encodeURIComponent(version)}`;
}
return purl;
}
Expand Down Expand Up @@ -77305,8 +77305,15 @@ function convertToSnapshot(deputy, githubCorrelator, context) {
// added the TypeScript compiler will emit an error.
}
const purl = encodePurl(ecosystem, component.name, component.version);
manifest.addDirectDependency(new dependency_submission_toolkit_1.Package(purl));
manifests[source] = manifest;
try {
const pkg = new dependency_submission_toolkit_1.Package(purl);
manifest.addDirectDependency(pkg);
manifests[source] = manifest;
}
catch (e) {
// Add some additional context about the PURL that failed to be parsed.
console.warn(`${e.message} (PURL is '${purl}')`);
}
}
const snapshot = new dependency_submission_toolkit_1.Snapshot({
version: nowsecure_version_1.version,
Expand Down Expand Up @@ -77521,7 +77528,7 @@ exports.getFindingsTable = getFindingsTable;
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.version = void 0;
// Generated by genversion.
exports.version = "4.0.0";
exports.version = "4.0.1";


/***/ }),
Expand Down
2 changes: 1 addition & 1 deletion dist/nowsecure-create-issues/index.js.map

Large diffs are not rendered by default.

15 changes: 11 additions & 4 deletions dist/nowsecure-upload-app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48986,7 +48986,7 @@ const nowsecure_version_1 = __nccwpck_require__(1328);
function encodePurl(ecosystem, name, version) {
let purl = `pkg:${ecosystem}/${name}`;
if (version) {
purl += `@${version}`;
purl += `@${encodeURIComponent(version)}`;
}
return purl;
}
Expand Down Expand Up @@ -49023,8 +49023,15 @@ function convertToSnapshot(deputy, githubCorrelator, context) {
// added the TypeScript compiler will emit an error.
}
const purl = encodePurl(ecosystem, component.name, component.version);
manifest.addDirectDependency(new dependency_submission_toolkit_1.Package(purl));
manifests[source] = manifest;
try {
const pkg = new dependency_submission_toolkit_1.Package(purl);
manifest.addDirectDependency(pkg);
manifests[source] = manifest;
}
catch (e) {
// Add some additional context about the PURL that failed to be parsed.
console.warn(`${e.message} (PURL is '${purl}')`);
}
}
const snapshot = new dependency_submission_toolkit_1.Snapshot({
version: nowsecure_version_1.version,
Expand Down Expand Up @@ -49126,7 +49133,7 @@ run();
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.version = void 0;
// Generated by genversion.
exports.version = "4.0.0";
exports.version = "4.0.1";


/***/ }),
Expand Down
2 changes: 1 addition & 1 deletion dist/nowsecure-upload-app/index.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nowsecure-action",
"version": "4.0.0",
"version": "4.0.1",
"main": "dist/index.js",
"license": "MIT",
"author": "Keegan Saunders <ksaunders@nowsecure.com>",
Expand Down
12 changes: 9 additions & 3 deletions src/nowsecure-snapshot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { USER_AGENT } from "./nowsecure-client";
function encodePurl(ecosystem: string, name: string, version?: string): string {
let purl = `pkg:${ecosystem}/${name}`;
if (version) {
purl += `@${version}`;
purl += `@${encodeURIComponent(version)}`;
}

return purl;
Expand Down Expand Up @@ -66,8 +66,14 @@ export function convertToSnapshot(

const purl = encodePurl(ecosystem, component.name, component.version);

manifest.addDirectDependency(new Package(purl));
manifests[source] = manifest;
try {
const pkg = new Package(purl);
manifest.addDirectDependency(pkg);
manifests[source] = manifest;
} catch (e) {
// Add some additional context about the PURL that failed to be parsed.
console.warn(`${(e as Error).message} (PURL is '${purl}')`);
}
}

const snapshot = new Snapshot(
Expand Down
2 changes: 1 addition & 1 deletion src/nowsecure-version.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Generated by genversion.
export const version = "4.0.0";
export const version = "4.0.1";

0 comments on commit 901b53b

Please sign in to comment.