Skip to content

Commit a4d2b51

Browse files
pgondhi987pgondhi987
committed
chore: drop opengrep cleanup from rustup fix [AI]
1 parent 0f2c8ef commit a4d2b51

2 files changed

Lines changed: 0 additions & 96 deletions

File tree

‎scripts/run-opengrep.sh‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -142,41 +142,6 @@ resolve_changed_diff_ref() {
142142
printf '%s...%s\n' "$resolved_base" "$head_ref"
143143
}
144144

145-
is_semgrepignored_path() {
146-
local path="$1"
147-
local ignore_file="$REPO_ROOT/.semgrepignore"
148-
local pattern trimmed base dir_pattern
149-
base="${path##*/}"
150-
151-
[[ -f "$ignore_file" ]] || return 1
152-
153-
while IFS= read -r pattern || [[ -n "$pattern" ]]; do
154-
trimmed="${pattern#"${pattern%%[![:space:]]*}"}"
155-
trimmed="${trimmed%"${trimmed##*[![:space:]]}"}"
156-
[[ -z "$trimmed" || "${trimmed:0:1}" == "#" ]] && continue
157-
158-
if [[ "$trimmed" == */ ]]; then
159-
dir_pattern="${trimmed%/}"
160-
if [[ "$dir_pattern" == */* ]]; then
161-
[[ "$path" == $dir_pattern/* ]] && return 0
162-
continue
163-
fi
164-
if [[ "$path" == $dir_pattern/* || "$path" == */$dir_pattern/* ]]; then
165-
return 0
166-
fi
167-
continue
168-
fi
169-
170-
if [[ "$trimmed" == */* ]]; then
171-
[[ "$path" == $trimmed || "$path" == $trimmed/* ]] && return 0
172-
else
173-
[[ "$base" == $trimmed ]] && return 0
174-
fi
175-
done < "$ignore_file"
176-
177-
return 1
178-
}
179-
180145
# Default scan paths match CI. Override by passing `-- <paths...>`.
181146
if (( PATHS_PASSED == 0 )); then
182147
if (( CHANGED_ONLY )); then
@@ -191,9 +156,6 @@ if (( PATHS_PASSED == 0 )); then
191156
if [[ ! -f "$path" && ! -d "$path" ]]; then
192157
continue
193158
fi
194-
if is_semgrepignored_path "$path"; then
195-
continue
196-
fi
197159
SCAN_PATHS+=( "$path" )
198160
done < <(
199161
{

‎test/scripts/run-opengrep.test.ts‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -121,62 +121,4 @@ describe("run-opengrep.sh", () => {
121121
expect(args).toContain("src/pr.ts");
122122
expect(args).not.toContain("src/main-only.ts");
123123
});
124-
125-
it("does not pass changed files ignored by semgrepignore as explicit scan paths", () => {
126-
const repo = createTempDir("openclaw-run-opengrep-ignore-");
127-
git(repo, "init", "-q", "--initial-branch=main");
128-
git(repo, "config", "user.email", "test@example.com");
129-
git(repo, "config", "user.name", "Test User");
130-
131-
copyRunOpengrepFiles(repo);
132-
writeFile(path.join(repo, ".semgrepignore"), "*.test.*\nextensions/qa-*/\nscripts/test-*\n");
133-
writeFile(path.join(repo, "security/opengrep/precise.yml"), "rules: []\n");
134-
writeFile(path.join(repo, "src/prod.ts"), "export const prod = 1;\n");
135-
writeFile(path.join(repo, "src/prod.test.ts"), "export const test = 1;\n");
136-
writeFile(path.join(repo, "src/foo/extensions/qa-demo/index.ts"), "export const nested = 1;\n");
137-
writeFile(path.join(repo, "extensions/qa-backdoor.ts"), "export const qaBackdoor = 1;\n");
138-
writeFile(path.join(repo, "extensions/qa-demo/src/index.ts"), "export const qa = 1;\n");
139-
writeFile(path.join(repo, "scripts/test-planner/vitest-args.mjs"), "export const plan = 1;\n");
140-
git(repo, "add", ".");
141-
git(repo, "commit", "-qm", "base");
142-
143-
writeFile(path.join(repo, "src/prod.ts"), "export const prod = 2;\n");
144-
writeFile(path.join(repo, "src/prod.test.ts"), "export const test = 2;\n");
145-
writeFile(path.join(repo, "src/foo/extensions/qa-demo/index.ts"), "export const nested = 2;\n");
146-
writeFile(path.join(repo, "extensions/qa-backdoor.ts"), "export const qaBackdoor = 2;\n");
147-
writeFile(path.join(repo, "extensions/qa-demo/src/index.ts"), "export const qa = 2;\n");
148-
writeFile(path.join(repo, "scripts/test-planner/vitest-args.mjs"), "export const plan = 2;\n");
149-
150-
const argsPath = path.join(repo, "opengrep-args.txt");
151-
const binDir = path.join(repo, "bin");
152-
fs.mkdirSync(binDir);
153-
writeFile(
154-
path.join(binDir, "opengrep"),
155-
[
156-
"#!/usr/bin/env bash",
157-
`printf '%s\\n' "$@" > ${JSON.stringify(argsPath)}`,
158-
"exit 0",
159-
"",
160-
].join("\n"),
161-
);
162-
fs.chmodSync(path.join(binDir, "opengrep"), 0o755);
163-
164-
execFileSync("bash", ["scripts/run-opengrep.sh", "--changed"], {
165-
cwd: repo,
166-
env: {
167-
...process.env,
168-
PATH: `${binDir}${path.delimiter}${process.env.PATH ?? ""}`,
169-
OPENCLAW_OPENGREP_BASE_REF: "HEAD",
170-
},
171-
encoding: "utf8",
172-
});
173-
174-
const args = fs.readFileSync(argsPath, "utf8");
175-
expect(args).toContain("src/prod.ts");
176-
expect(args).toContain("src/foo/extensions/qa-demo/index.ts");
177-
expect(args).toContain("extensions/qa-backdoor.ts");
178-
expect(args).not.toContain("src/prod.test.ts");
179-
expect(args).not.toContain("extensions/qa-demo/src/index.ts");
180-
expect(args).not.toContain("scripts/test-planner/vitest-args.mjs");
181-
});
182124
});

0 commit comments

Comments
 (0)