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

test: reuse policy Git fixtures (#1469)

mldangelo-oai7d9452ac735f
diff --git a/sdk/typescript/tests-ts/api-policy.test.ts b/sdk/typescript/tests-ts/api-policy.test.ts
index 1c7902e1d..829c8fdbe 100644
--- a/sdk/typescript/tests-ts/api-policy.test.ts
+++ b/sdk/typescript/tests-ts/api-policy.test.ts
@@ -36,6 +36,7 @@ import {
addPolicySubmodule,
createPolicyTestFixtures,
policyGit,
+ policyGitDirectory,
policyPlugin,
stageResult,
} from "./support/security-policy.js";
@@ -339,11 +340,7 @@ describe("CodexSecurity policy API", () => {
join(f.root, "submodule-source"),
);
}
- let metadata = execFileSync(
- "git",
- ["-C", checkout, "rev-parse", "--absolute-git-dir"],
- { encoding: "utf8" },
- ).trim();
+ let metadata = policyGitDirectory(checkout);
if (kind.startsWith("unregistered-")) {
const common = metadata;
metadata = join(
@@ -498,11 +495,7 @@ describe("CodexSecurity policy API", () => {
policyGit(repository, "worktree", "add", "--quiet", "--detach", linked);
repository = linked;
}
- const gitDirectory = execFileSync(
- "git",
- ["-C", repository, "rev-parse", "--absolute-git-dir"],
- { encoding: "utf8" },
- ).trim();
+ const gitDirectory = policyGitDirectory(repository);
for (const metadata of new Set([common, gitDirectory])) {
const outputDir = join(metadata, "policy-artifacts");
for (const operation of [
diff --git a/sdk/typescript/tests-ts/security-policy.test.ts b/sdk/typescript/tests-ts/security-policy.test.ts
index 36f059b59..71c5426c6 100644
--- a/sdk/typescript/tests-ts/security-policy.test.ts
+++ b/sdk/typescript/tests-ts/security-policy.test.ts
@@ -33,12 +33,29 @@ import {
addPolicySubmodule,
createPolicyTestFixtures,
policyGit,
+ policyGitDirectory,
stageResult,
} from "./support/security-policy.js";
const { fixture, cleanup } = createPolicyTestFixtures();
afterEach(cleanup);
+function createPolicyWorktree(repository: string, root: string, name: string) {
+ policyGit(repository, "init", "--quiet");
+ policyGit(repository, "commit", "--allow-empty", "--quiet", "-m", "initial");
+ const linked = join(root, name);
+ policyGit(
+ repository,
+ "worktree",
+ "add",
+ "--quiet",
+ "--detach",
+ linked,
+ "HEAD",
+ );
+ return linked;
+}
+
describe("security policy generation", () => {
test("stores policy drafts separately from scans and rejects linked state children", async () => {
const f = await fixture();
@@ -349,30 +366,8 @@ describe("security policy generation", () => {
test("excludes copied linked-worktree metadata", async () => {
const f = await fixture();
- policyGit(f.repository, "init", "--quiet");
- policyGit(
- f.repository,
- "commit",
- "--allow-empty",
- "--quiet",
- "-m",
- "initial",
- );
- const linked = join(f.root, "linked");
- policyGit(
- f.repository,
- "worktree",
- "add",
- "--quiet",
- "--detach",
- linked,
- "HEAD",
- );
- const original = execFileSync(
- "git",
- ["-C", linked, "rev-parse", "--absolute-git-dir"],
- { encoding: "utf8" },
- ).trim();
+ const linked = createPolicyWorktree(f.repository, f.root, "linked");
+ const original = policyGitDirectory(linked);
const archived = join(f.repository, "archived-admin");
const common = join(f.repository, "shared-data");
await cp(join(f.repository, ".git"), common, { recursive: true });
@@ -585,24 +580,10 @@ describe("security policy generation", () => {
test("keeps linked worktrees and submodules as their own policy roots", async () => {
const f = await fixture();
- policyGit(f.repository, "init", "--quiet");
- policyGit(
+ const linked = createPolicyWorktree(
f.repository,
- "commit",
- "--allow-empty",
- "--quiet",
- "-m",
- "initial",
- );
- const linked = join(f.root, "linked-worktree");
- policyGit(
- f.repository,
- "worktree",
- "add",
- "--quiet",
- "--detach",
- linked,
- "HEAD",
+ f.root,
+ "linked-worktree",
);
await mkdir(join(linked, "component"));
expect(
@@ -612,11 +593,7 @@ describe("security policy generation", () => {
scope: "component",
targetPath: join(linked, "component", "SECURITY.md"),
});
- const linkedMetadata = execFileSync(
- "git",
- ["-C", linked, "rev-parse", "--absolute-git-dir"],
- { encoding: "utf8" },
- ).trim();
+ const linkedMetadata = policyGitDirectory(linked);
const backlink = join(linkedMetadata, "gitdir");
const originalBacklink = await readFile(backlink);
await writeFile(
diff --git a/sdk/typescript/tests-ts/support/security-policy.ts b/sdk/typescript/tests-ts/support/security-policy.ts
index 72cfb7cf3..433b20fb7 100644
--- a/sdk/typescript/tests-ts/support/security-policy.ts
+++ b/sdk/typescript/tests-ts/support/security-policy.ts
@@ -39,6 +39,14 @@ export function policyGit(repository: string, ...args: string[]): void {
]);
}
+export function policyGitDirectory(repository: string): string {
+ return execFileSync(
+ "git",
+ ["-C", repository, "rev-parse", "--absolute-git-dir"],
+ { encoding: "utf8" },
+ ).trim();
+}
+
export async function addPolicySubmodule(
repository: string,
source: string,