From 4c827eb42de866862e37ec9a240df4b23ebb7393 Mon Sep 17 00:00:00 2001 From: Edward Ezekiel Date: Thu, 17 Apr 2025 14:32:55 -0500 Subject: [PATCH 1/2] feat: enable vuln count feature --- bin/dev.js | 3 +++ e2e/scan/eol.test.ts | 2 +- src/api/queries/nes/sbom.ts | 3 +-- src/service/nes/nes.svc.ts | 6 ------ 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bin/dev.js b/bin/dev.js index 7ff655ee..db50ecef 100755 --- a/bin/dev.js +++ b/bin/dev.js @@ -8,4 +8,7 @@ process.env.GRAPHQL_HOST = 'http://localhost:3000'; // Dev // process.env.GRAPHQL_HOST = 'https://api.dev.nes.herodevs.com'; +// Prod +// process.env.GRAPHQL_HOST = 'https://api.nes.herodevs.com'; + await execute({ development: true, dir: import.meta.url }); diff --git a/e2e/scan/eol.test.ts b/e2e/scan/eol.test.ts index 6804862f..142747bb 100644 --- a/e2e/scan/eol.test.ts +++ b/e2e/scan/eol.test.ts @@ -118,7 +118,7 @@ describe('scan:eol e2e', () => { match(stdout, /┌.*┬.*┬.*┬.*┬.*┐/, 'Should show table top border'); match( stdout, - /│ NAME\s*│ VERSION\s*│ EOL\s*│ DAYS EOL\s*│ TYPE\s*│/, // TODO: add vulns to monorepo api + /│ NAME\s*│ VERSION\s*│ EOL\s*│ DAYS EOL\s*│ TYPE\s*│ # OF VULNS*|/, 'Should show table headers', ); match(stdout, /├.*┼.*┼.*┼.*┼.*┤/, 'Should show table header separator'); diff --git a/src/api/queries/nes/sbom.ts b/src/api/queries/nes/sbom.ts index 47ec848c..c88977d0 100644 --- a/src/api/queries/nes/sbom.ts +++ b/src/api/queries/nes/sbom.ts @@ -14,8 +14,7 @@ export const M_SCAN = { eolAt daysEol status - # TODO: uncomment vulnCount once backend changes are deployed - # vulnCount + vulnCount } } diagnostics diff --git a/src/service/nes/nes.svc.ts b/src/service/nes/nes.svc.ts index f5ffa377..be4c11f8 100644 --- a/src/service/nes/nes.svc.ts +++ b/src/service/nes/nes.svc.ts @@ -12,12 +12,6 @@ import { debugLogger } from '../log.svc.ts'; export const buildScanResult = (scan: InsightsEolScanResult): ScanResult => { const components = new Map(); for (const c of scan.components) { - const { status } = c.info; - // TODO: remove this once backend changes are deployed - // @ts-expect-error - if (status === 'LTS') { - c.info.status = 'SUPPORTED'; - } components.set(c.purl, c); } From eb1e9d12da6a00a8690e86669c150571bada4bde Mon Sep 17 00:00:00 2001 From: Edward Ezekiel Date: Thu, 17 Apr 2025 14:37:39 -0500 Subject: [PATCH 2/2] chore: fix linting error --- e2e/scan/eol.test.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/e2e/scan/eol.test.ts b/e2e/scan/eol.test.ts index 142747bb..b8fa649e 100644 --- a/e2e/scan/eol.test.ts +++ b/e2e/scan/eol.test.ts @@ -116,11 +116,7 @@ describe('scan:eol e2e', () => { // Match table header match(stdout, /┌.*┬.*┬.*┬.*┬.*┐/, 'Should show table top border'); - match( - stdout, - /│ NAME\s*│ VERSION\s*│ EOL\s*│ DAYS EOL\s*│ TYPE\s*│ # OF VULNS*|/, - 'Should show table headers', - ); + match(stdout, /│ NAME\s*│ VERSION\s*│ EOL\s*│ DAYS EOL\s*│ TYPE\s*│ # OF VULNS*|/, 'Should show table headers'); match(stdout, /├.*┼.*┼.*┼.*┼.*┤/, 'Should show table header separator'); // Match table content