Skip to content

Remove yaml config from some paths #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pvdz wants to merge 2 commits into from
Closed

Remove yaml config from some paths #405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4af79de
Remove yaml config from some paths
pvdz Apr 3, 2025
75933e3
Merge branch 'main' into less_yaml
jdalton Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 4 additions & 26 deletions src/utils/path-resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,9 @@ import { resolveBinPath } from '@socketsecurity/registry/lib/npm'
import { directoryPatterns } from './ignore-by-default'
import constants from '../constants'

import type { SocketYml } from '@socketsecurity/config'
import type { SocketSdkReturnType } from '@socketsecurity/sdk'
import type { GlobOptions } from 'tinyglobby'

type GlobWithGitIgnoreOptions = GlobOptions & {
socketConfig?: SocketYml | undefined
}

const { NODE_MODULES, NPM, shadowBinPath } = constants

async function filterGlobResultToSupportedFiles(
Expand All @@ -42,30 +37,15 @@ async function filterGlobResultToSupportedFiles(
return entries.filter(p => micromatch.some(p, patterns))
}

async function globWithGitIgnore(
patterns: string[],
options: GlobWithGitIgnoreOptions
) {
const {
cwd = process.cwd(),
socketConfig,
...additionalOptions
} = { __proto__: null, ...options } as GlobWithGitIgnoreOptions
const projectIgnorePaths = socketConfig?.projectIgnorePaths
async function globWithGitIgnore(patterns: string[], options: GlobOptions) {
const { cwd = process.cwd(), ...additionalOptions } = options
const ignoreFiles = await tinyGlob(['**/.gitignore'], {
absolute: true,
cwd,
expandDirectories: true
})
const ignores = [
...directoryPatterns(),
...(Array.isArray(projectIgnorePaths)
? ignoreFileLinesToGlobPatterns(
projectIgnorePaths,
path.join(cwd, '.gitignore'),
cwd
)
: []),
...(
await Promise.all(
ignoreFiles.map(async filepath =>
Expand Down Expand Up @@ -251,8 +231,7 @@ export function findNpmPathSync(npmBinPath: string): string | undefined {
export async function getPackageFilesForScan(
cwd: string,
inputPaths: string[],
supportedFiles: SocketSdkReturnType<'getReportSupportedFiles'>['data'],
config?: SocketYml | undefined
supportedFiles: SocketSdkReturnType<'getReportSupportedFiles'>['data']
): Promise<string[]> {
debugLog(
`getPackageFilesForScan: resolving ${inputPaths.length} paths:`,
Expand All @@ -265,8 +244,7 @@ export async function getPackageFilesForScan(
spinner.start('Searching for local files to include in scan...')

const entries = await globWithGitIgnore(pathsToPatterns(inputPaths), {
cwd,
socketConfig: config
cwd
})

if (isDebug()) {
Expand Down