chore: refine stage 7 json validation
This commit is contained in:
+10
-18
@@ -1,4 +1,3 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { GITEA_REPOSITORY, PR_NUMBER, PR_HEAD_BRANCH, PR_BASE_BRANCH, getLLMConfig, FINDINGS_PATH, EXCLUSIONS_PATH } from './config.js';
|
||||
import { loadRoles, getRoleIntro } from './roles.js';
|
||||
@@ -6,6 +5,7 @@ import { getPRDiff, postComment } from './gitea.js';
|
||||
import { analyzeWithRole, loadOldFindings, mergeFindings, sortByLevel, deduplicateWithAI, loadExclusions, applyExclusions, filterFalsePositivesWithAI } from './findings.js';
|
||||
import { saveFindings, postOldFindingsComment, postNewNonCriticalComment, postNewCriticalComments } from './comments.js';
|
||||
import { cloneRepo, commitAndPush } from './git.js';
|
||||
import { validateJSONArrayFile, ensureJSONArrayFileExists } from './json.js';
|
||||
|
||||
const WORKSPACE = process.env.GITHUB_WORKSPACE || '/workspace';
|
||||
|
||||
@@ -100,29 +100,21 @@ async function main() {
|
||||
|
||||
// Step7: 驗證 findings.json 與 exclusions.json 為合法 JSON
|
||||
console.log('\n🔎 Step6: JSON 格式驗證');
|
||||
const missingPaths = [];
|
||||
for (const relPath of [FINDINGS_PATH, EXCLUSIONS_PATH]) {
|
||||
const fullPath = path.join(repoDir || WORKSPACE, relPath);
|
||||
if (!fs.existsSync(fullPath)) {
|
||||
console.log(` ⚠️ ${relPath} 不存在,跳過驗證`);
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
JSON.parse(fs.readFileSync(fullPath, 'utf8'));
|
||||
console.log(` ✅ ${relPath} JSON 格式正確`);
|
||||
} catch (e) {
|
||||
console.error(` ❌ ${relPath} JSON 格式錯誤: ${e.message},嘗試修正...`);
|
||||
try {
|
||||
const backupPath = fullPath + '.bak';
|
||||
fs.copyFileSync(fullPath, backupPath);
|
||||
fs.writeFileSync(fullPath, '[]\n', 'utf8');
|
||||
console.log(` ✅ ${relPath} 已重置為空陣列(原檔備份至 ${relPath}.bak)`);
|
||||
} catch (repairErr) {
|
||||
console.error(` ❌ ${relPath} 修正失敗: ${repairErr.message}`);
|
||||
process.exit(1);
|
||||
}
|
||||
const result = await validateJSONArrayFile(fullPath, relPath);
|
||||
if (!result.exists) missingPaths.push({ fullPath, relPath });
|
||||
} catch {
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
for (const { fullPath, relPath } of missingPaths) {
|
||||
ensureJSONArrayFileExists(fullPath, relPath);
|
||||
}
|
||||
|
||||
// Step7: commit/push findings.json 到來源分支
|
||||
console.log('\n💾 Step7: 記憶區 Commit/Push');
|
||||
await commitAndPush(WORKSPACE, repoDir);
|
||||
|
||||
Reference in New Issue
Block a user