Skip to content

OpenAI's Codex Security CLI and TypeScript SDK for finding, validating, and fixing security vulnerabilities. npm: https://www.npmjs.com/package/@openai/codex-security

perf(imports): avoid duplicate Git metadata discovery (#2205)

Michael D'Angelobd55abcee8a2
diff --git a/sdk/typescript/src/external-findings-local.ts b/sdk/typescript/src/external-findings-local.ts
index 7f648ae65..9edb1e3d3 100644
--- a/sdk/typescript/src/external-findings-local.ts
+++ b/sdk/typescript/src/external-findings-local.ts
@@ -23,6 +23,7 @@ import { localFindingRepositories } from "./external-findings-read.js";
import {
hasGitMetadata,
localGitProtectionRoots,
+ importGitProtectionRoots,
} from "./local-git-metadata.js";
import {
blackDuckReportRepositories,
@@ -596,16 +597,7 @@ async function localContext(
...new Set([
repository,
...(await abortable(
- () => localGitProtectionRoots(path, environment, dependencies.signal),
- dependencies.signal,
- )),
- ...(await abortable(
- () =>
- localGitProtectionRoots(
- process.cwd(),
- environment,
- dependencies.signal,
- ),
+ () => importGitProtectionRoots(path, environment, dependencies.signal),
dependencies.signal,
)),
]),
diff --git a/sdk/typescript/src/local-git-metadata.ts b/sdk/typescript/src/local-git-metadata.ts
index bb80c834e..76a63d889 100644
--- a/sdk/typescript/src/local-git-metadata.ts
+++ b/sdk/typescript/src/local-git-metadata.ts
@@ -1,6 +1,7 @@
import { lstat, readFile, realpath, stat } from "node:fs/promises";
import { dirname, isAbsolute, join, resolve, sep } from "node:path";
import { environmentEntry } from "./auth.js";
+import { abortReason } from "./errors.js";
import { canonicalConfigPath } from "./runtime.js";
import {
abortable,
@@ -185,6 +186,20 @@ export async function localGitProtectionRoots(
return [...roots];
}
+/** Discover Git metadata for the selection, then for the current working directory. */
+export async function importGitProtectionRoots(
+ repository: string,
+ environment: NodeJS.ProcessEnv,
+ signal?: AbortSignal,
+): Promise<string[]> {
+ const roots = await localGitProtectionRoots(repository, environment, signal);
+ const cwd = process.cwd();
+ if (signal?.aborted) throw abortReason(signal);
+ if (cwd !== repository)
+ roots.push(...(await localGitProtectionRoots(cwd, environment, signal)));
+ return roots;
+}
+
export async function hasGitMetadata(
repository: string,
signal?: AbortSignal,
diff --git a/sdk/typescript/src/sonar-import.ts b/sdk/typescript/src/sonar-import.ts
index a27005cbf..7888609af 100644
--- a/sdk/typescript/src/sonar-import.ts
+++ b/sdk/typescript/src/sonar-import.ts
@@ -10,7 +10,7 @@ import {
type ConfiguredFetchRemote,
prepareLocalImport,
} from "./external-findings-local.js";
-import { localGitProtectionRoots } from "./local-git-metadata.js";
+import { importGitProtectionRoots } from "./local-git-metadata.js";
import {
ExternalPublicationError,
externalPublicationStateDirectory,
@@ -176,8 +176,7 @@ export async function prepareSonarImport(
const configuredState = codexSecurityStateDirectory(environment);
const protectedRoots = [
repository,
- ...(await localGitProtectionRoots(options.cwd, environment, signal)),
- ...(await localGitProtectionRoots(process.cwd(), environment, signal)),
+ ...(await importGitProtectionRoots(options.cwd, environment, signal)),
];
requireOutputOutsideRepositories(protectedRoots, configuredState, "runtime");
const state = await canonicalConfigPath(configuredState);