diff --git a/src/commands/package/fetch-purl-deep-score.ts b/src/commands/package/fetch-purl-deep-score.ts index 256426bd2..48662791b 100644 --- a/src/commands/package/fetch-purl-deep-score.ts +++ b/src/commands/package/fetch-purl-deep-score.ts @@ -9,6 +9,8 @@ import { getDefaultToken } from '../../utils/sdk' const { SOCKET_CLI_ISSUES_URL } = constants export async function fetchPurlDeepScore(purl: string) { + logger.info(`Requesting deep score data for this purl: ${purl}`) + const apiToken = getDefaultToken() if (!apiToken) { throw new AuthError( diff --git a/src/commands/package/fetch-purls-shallow-score.ts b/src/commands/package/fetch-purls-shallow-score.ts index 55c7af16b..3041bf918 100644 --- a/src/commands/package/fetch-purls-shallow-score.ts +++ b/src/commands/package/fetch-purls-shallow-score.ts @@ -12,7 +12,7 @@ import type { export async function fetchPurlsShallowScore( purls: string[] ): Promise | undefined> { - logger.error( + logger.info( `Requesting shallow score data for ${purls.length} package urls (purl): ${purls.join(', ')}` ) diff --git a/src/commands/package/parse-package-specifiers.test.ts b/src/commands/package/parse-package-specifiers.test.ts index f023cc099..d0e4a1fc0 100644 --- a/src/commands/package/parse-package-specifiers.test.ts +++ b/src/commands/package/parse-package-specifiers.test.ts @@ -21,6 +21,19 @@ describe('parse-package-specifiers', async () => { `) }) + it('should support npm scoped packages', () => { + expect( + parsePackageSpecifiers('npm', ['@babel/core']) + ).toMatchInlineSnapshot(` + { + "purls": [ + "pkg:npm/@babel/core", + ], + "valid": true, + } + `) + }) + it('should parse a simple purl without prefix', () => { expect(parsePackageSpecifiers('npm/babel', [])).toMatchInlineSnapshot(` { @@ -52,7 +65,7 @@ describe('parse-package-specifiers', async () => { ).toMatchInlineSnapshot(` { "purls": [ - "pkg:golang/foo", + "pkg:npm/golang/foo", "pkg:npm/babel", "pkg:npm/tenko", ], diff --git a/src/commands/package/parse-package-specifiers.ts b/src/commands/package/parse-package-specifiers.ts index 3b4be2618..58cf27f96 100644 --- a/src/commands/package/parse-package-specifiers.ts +++ b/src/commands/package/parse-package-specifiers.ts @@ -19,9 +19,6 @@ export function parsePackageSpecifiers( } else if (pkg.startsWith('pkg:')) { // keep purls.push(pkg) - } else if (pkg.includes('/')) { - // Looks like this arg was already namespaced - purls.push('pkg:' + pkg) } else { purls.push('pkg:' + ecosystem + '/' + pkg) }