From daa40c8283581d131efa7aa1ce367872dbecd817 Mon Sep 17 00:00:00 2001 From: Peter van der Zee Date: Mon, 7 Apr 2025 13:23:18 +0200 Subject: [PATCH] Support `./` for scan create too --- src/cli.ts | 4 +++- src/commands/scan/cmd-scan-create.ts | 12 ++++++------ src/utils/path-resolve.ts | 6 ++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/cli.ts b/src/cli.ts index a9f150cef..bd904ac1e 100755 --- a/src/cli.ts +++ b/src/cli.ts @@ -6,6 +6,7 @@ import { pathToFileURL } from 'node:url' import { messageWithCauses, stackWithCauses } from 'pony-cause' import updateNotifier from 'tiny-updater' +import { debugLog } from '@socketsecurity/registry/lib/debug' import { logger } from '@socketsecurity/registry/lib/logger' import { cmdAnalytics } from './commands/analytics/cmd-analytics' @@ -107,9 +108,10 @@ void (async () => { } else { errorTitle = 'Unexpected error with no details' } + logger.error('\n') // Any-spinner-newline logger.fail(failMsgWithBadge(errorTitle, errorMessage)) if (errorBody) { - logger.error(`\n${errorBody}`) + debugLog(`${errorBody}`) } await captureException(e) } diff --git a/src/commands/scan/cmd-scan-create.ts b/src/commands/scan/cmd-scan-create.ts index 643ba01e2..bf74f3f3a 100644 --- a/src/commands/scan/cmd-scan-create.ts +++ b/src/commands/scan/cmd-scan-create.ts @@ -161,6 +161,7 @@ async function run( }) const { + branch: branchName = '', cwd: cwdOverride, defaultBranch, dryRun, @@ -168,17 +169,20 @@ async function run( markdown, pendingHead, readOnly, + repo: repoName = '', report, tmp } = cli.flags as { + branch: string cwd: string + defaultBranch: boolean dryRun: boolean - report: boolean json: boolean markdown: boolean - defaultBranch: boolean pendingHead: boolean readOnly: boolean + repo: string + report: boolean tmp: boolean } const defaultOrgSlug = getConfigValue('defaultOrg') @@ -189,10 +193,6 @@ async function run( cwdOverride && cwdOverride !== 'process.cwd()' ? String(cwdOverride) : process.cwd() - const { branch: branchName = '', repo: repoName = '' } = cli.flags as { - branch: string - repo: string - } // We're going to need an api token to suggest data because those suggestions // must come from data we already know. Don't error on missing api token yet. diff --git a/src/utils/path-resolve.ts b/src/utils/path-resolve.ts index 629b4f74a..1a756515d 100644 --- a/src/utils/path-resolve.ts +++ b/src/utils/path-resolve.ts @@ -172,7 +172,7 @@ function ignorePatternToMinimatch(pattern: string): string { function pathsToPatterns(paths: string[] | readonly string[]): string[] { // TODO: Does not support `~/` paths. - return paths.map(p => (p === '.' ? '**/*' : p)) + return paths.map(p => (p === '.' || p === './' ? '**/*' : p)) } export function findBinPathDetailsSync(binName: string): { @@ -262,9 +262,11 @@ export async function getPackageFilesForScan( // Lazily access constants.spinner. const { spinner } = constants + const pats = pathsToPatterns(inputPaths) + spinner.start('Searching for local files to include in scan...') - const entries = await globWithGitIgnore(pathsToPatterns(inputPaths), { + const entries = await globWithGitIgnore(pats, { cwd, socketConfig: config })