Compare commits

...

19 Commits

Author SHA1 Message Date
jiantw83 9279050ca9 feat: refactor commitAndPush to use GIT_ASKPASS for authentication and add tests 2026-05-12 01:01:19 +00:00
jiantw83 66d93abe24 Merge pull request 'feat: master 不會觸發 review.yaml' (#66) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#66
2026-05-11 14:12:38 +00:00
jiantw83 0063f3282f Merge pull request 'refactor: 改用 execSync' (#65) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#65
2026-05-11 13:56:13 +00:00
jiantw83 8c3d0d9a6d Merge pull request 'fix: add bash to Dockerfile dependencies' (#64) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#64
2026-05-11 10:54:08 +00:00
jiantw83 3849bb2168 Merge pull request 'fix: switch Dockerfile base image to alpine and install dependencies using apk' (#63) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#63
2026-05-11 10:46:43 +00:00
jiantw83 379938d6dc Merge pull request 'fix: Dockerfile 加入 git 安裝驗證,git.js 改回 git binary' (#62) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#62
2026-05-11 10:38:59 +00:00
jiantw83 5bf39966d0 Merge pull request 'fix: 換用 node:20 完整版(內建 git,不需要 apt-get)' (#61) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#61
2026-05-11 10:34:11 +00:00
jiantw83 3509a882e1 Merge pull request 'chore: add newline at end of TODO.md for better formatting' (#60) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#60
2026-05-11 10:19:46 +00:00
jiantw83 1d2e8236de Merge pull request 'chore: remove duplicate log assistance note in TODO.md' (#59) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#59
2026-05-11 10:18:13 +00:00
jiantw83 d8423c74b1 Merge pull request 'chore: remove test findings' (#58) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#58
2026-05-11 10:12:32 +00:00
jiantw83 94e974b5dc Merge pull request 'feat/refactor/kiro/1' (#57) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#57
2026-05-11 10:10:23 +00:00
jiantw83 a9a0b43ea5 Merge pull request 'debug: commit/push 失敗時顯示詳細錯誤' (#56) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#56
2026-05-11 10:04:49 +00:00
jiantw83 aa8234b5c7 Merge pull request 'fix: commitAndPush 加上 await' (#55) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#55
2026-05-11 10:01:12 +00:00
jiantw83 b0f2d45c11 Merge pull request 'fix: add newline at end of TODO.md for proper formatting' (#54) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#54
2026-05-11 09:59:14 +00:00
jiantw83 3fd9a7e13d Merge pull request 'feat: 階段五六 - findings commit/push 到來源分支,critical 問題 exit 1' (#53) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#53
2026-05-11 09:54:39 +00:00
jiantw83 39cc5c932c Merge pull request 'feat: 階段四 - findings 寫入與 comment 依序發布(舊問題→非嚴重→嚴重)' (#52) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#52
2026-05-11 09:48:41 +00:00
jiantw83 255adbabe4 Merge pull request 'feat: 階段三 - AI 語意去重,失敗時降級保留所有問題' (#51) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#51
2026-05-11 09:44:10 +00:00
jiantw83 a10fc8f176 Merge pull request 'feat/refactor/kiro/1' (#50) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#50
2026-05-11 09:40:12 +00:00
jiantw83 9b39908394 Merge pull request 'feat: 階段一 - 基本流程串接骨架' (#47) from feat/refactor/kiro/1 into feat/refactor/main
Reviewed-on: jiantw83/code-review#47
2026-05-11 07:53:38 +00:00
2 changed files with 50 additions and 5 deletions
+20 -5
View File
@@ -1,7 +1,7 @@
import { spawnSync } from 'child_process';
import fs from 'fs';
import path from 'path';
import { GITEA_SERVER_URL, GITEA_REPOSITORY, GITEA_TOKEN, PR_HEAD_BRANCH, FINDINGS_PATH } from './config.js';
import { GITEA_SERVER_URL, GITEA_REPOSITORY, PR_HEAD_BRANCH, FINDINGS_PATH } from './config.js';
function git(args, cwd) {
const result = spawnSync('git', args, { cwd, encoding: 'utf8' });
@@ -11,21 +11,36 @@ function git(args, cwd) {
}
export async function commitAndPush(workspace) {
const remoteUrl = GITEA_SERVER_URL.replace(/\/$/, '')
.replace('https://', `https://${GITEA_TOKEN}@`)
.replace('http://', `http://${GITEA_TOKEN}@`) + `/${GITEA_REPOSITORY}.git`;
const remoteUrl = GITEA_SERVER_URL.replace(/\/$/, '') + `/${GITEA_REPOSITORY}.git`;
const repoDir = path.join(workspace, 'repo');
try {
if (!fs.existsSync(repoDir)) {
git(['clone', '--depth=1', '--branch', PR_HEAD_BRANCH, remoteUrl, repoDir], workspace);
// Use GIT_ASKPASS to provide token for authentication
gitWithToken(['clone', '--depth=1', '--branch', PR_HEAD_BRANCH, remoteUrl, repoDir], workspace);
}
git(['config', 'user.email', 'ai-review[bot]@gitea'], repoDir);
git(['config', 'user.name', 'AI Review Bot'], repoDir);
git(['fetch', 'origin', PR_HEAD_BRANCH], repoDir);
git(['checkout', PR_HEAD_BRANCH], repoDir);
// Helper to run git with GITEA_TOKEN via GIT_ASKPASS
import { GITEA_TOKEN } from './config.js';
function gitWithToken(args, cwd) {
const askPassScript = `#!/bin/sh\necho \"${GITEA_TOKEN}\"`;
const askPassPath = path.join(cwd, 'git-askpass.sh');
fs.writeFileSync(askPassPath, askPassScript, { mode: 0o700 });
const result = spawnSync('git', args, {
cwd,
encoding: 'utf8',
env: { ...process.env, GIT_ASKPASS: askPassPath },
});
fs.unlinkSync(askPassPath);
if (result.error) throw result.error;
if (result.status !== 0) throw new Error((result.stderr || result.stdout || '').trim());
return (result.stdout || '').trim();
}
// 將 findings.json 從 workspace 複製到 clone 的 repo
const srcFindings = path.join(workspace, FINDINGS_PATH);
+30
View File
@@ -0,0 +1,30 @@
import { commitAndPush } from './git.js';
import fs from 'fs';
import path from 'path';
// Mock dependencies and environment
jest.mock('fs');
jest.mock('child_process', () => ({
spawnSync: jest.fn(() => ({ status: 0, stdout: '', stderr: '' }))
}));
describe('commitAndPush', () => {
const workspace = '/tmp/workspace';
const repoDir = path.join(workspace, 'repo');
beforeEach(() => {
jest.clearAllMocks();
fs.existsSync.mockReturnValue(false);
fs.writeFileSync.mockImplementation(() => {});
fs.unlinkSync.mockImplementation(() => {});
});
it('should clone repo and configure git', async () => {
await expect(commitAndPush(workspace)).resolves.not.toThrow();
});
it('should not clone if repo exists', async () => {
fs.existsSync.mockReturnValue(true);
await expect(commitAndPush(workspace)).resolves.not.toThrow();
});
});