Use official merge request API (#9)

Author: pepakriz

Dockerfile

@@ -19,7 +19,6 @@ ENV DATA_DIR=/data
 
 RUN set -ex \
 	&& apk --no-cache --update add \
-		git \
 		ca-certificates \
 		libstdc++ \
 		libgcc \

data/.gitignore

@@ -1,6 +1,5 @@
-import * as fs from 'fs';
 import fetch, { RequestInit, Response } from 'node-fetch';
-import { Git } from './Git';
+import queryString from 'querystring';
 
 export interface User {
 	id: number;
@@ -41,6 +40,7 @@ export interface MergeRequest {
 	state: MergeState;
 	force_remove_source_branch: boolean;
 	labels: string[];
+	squash: boolean;
 }
 
 interface MergeRequestUpdateData {
@@ -73,6 +73,8 @@ export interface MergeRequestInfo extends MergeRequest {
 		head_sha: string,
 	};
 	pipeline: MergeRequestPipeline | null;
+	diverged_commits_count: number;
+	rebase_in_progress: boolean;
 }
 
 export interface DiscussionNote {
@@ -84,16 +86,6 @@ export interface MergeRequestDiscussion {
 	notes: DiscussionNote[];
 }
 
-interface Commit {
-	id: string;
-}
-
-interface Project {
-	id: number;
-	ssh_url_to_repo: string;
-	path_with_namespace: string;
-}
-
 interface Pipeline {
 	user: {
 		id: number,
@@ -110,28 +102,25 @@ export class GitlabApi {
 
 	private readonly gitlabUrl: string;
 	private readonly authToken: string;
-	private readonly repositoryDir: string;
 
-	constructor(gitlabUrl: string, authToken: string, repositoryDir: string) {
+	constructor(gitlabUrl: string, authToken: string) {
 		this.gitlabUrl = gitlabUrl;
 		this.authToken = authToken;
-		this.repositoryDir = repositoryDir;
 	}
 
 	public async getMe(): Promise<User> {
 		return this.sendRequestWithSingleResponse(`/api/v4/user`, RequestMethod.Get);
 	}
 
-	public async getLastCommitOnTarget(projectId: number, branch: string): Promise<Commit> {
-		return this.sendRequestWithSingleResponse(`/api/v4/projects/${projectId}/repository/commits/${branch}`, RequestMethod.Get);
-	}
-
 	public async getAssignedOpenedMergeRequests(): Promise<MergeRequest[]> {
 		return this.sendRequestWithMultiResponse(`/api/v4/merge_requests?scope=assigned_to_me&state=opened`, RequestMethod.Get);
 	}
 
 	public async getMergeRequestInfo(projectId: number, mergeRequestIid: number): Promise<MergeRequestInfo> {
-		return this.sendRequestWithSingleResponse(`/api/v4/projects/${projectId}/merge_requests/${mergeRequestIid}`, RequestMethod.Get);
+		return this.sendRequestWithSingleResponse(`/api/v4/projects/${projectId}/merge_requests/${mergeRequestIid}`, RequestMethod.Get, {
+			include_diverged_commits_count: true,
+			include_rebase_in_progress: true,
+		});
 	}
 
 	public async getMergeRequestDiscussions(projectId: number, mergeRequestIid: number): Promise<MergeRequestDiscussion[]> {
@@ -160,70 +149,14 @@ export class GitlabApi {
 		});
 	}
 
-	public async rebaseMergeRequest(mergeRequest: MergeRequest, user: User): Promise<void> {
-		const sourceProject = await this.getProject(mergeRequest.source_project_id);
-		const targetProject = await this.getProject(mergeRequest.target_project_id);
-
-		if (!fs.existsSync(this.repositoryDir)) {
-			fs.mkdirSync(this.repositoryDir, {
-				recursive: true,
-			});
-		}
-
-		const git = await Git.create(`${this.repositoryDir}/${mergeRequest.target_project_id}`);
-
-		const remoteRepositories = [
-			targetProject.path_with_namespace,
-		];
-
-		if (targetProject.path_with_namespace !== sourceProject.path_with_namespace) {
-			remoteRepositories.push(sourceProject.path_with_namespace);
-		}
-
-		remoteRepositories.forEach(async (remoteRepository: string) => {
-			try {
-				await git.run(`remote add ${remoteRepository} ${this.gitlabUrl}:${this.authToken}@gitlab.com/${remoteRepository}.git`);
-			} catch (e) {
-				if (e.message.indexOf(`fatal: remote ${remoteRepository} already exists.`) === -1) {
-					throw e;
-				}
-			}
-		});
-
-		await git.run(`config user.name "${user.name}"`);
-		await git.run(`config user.email "${user.email}"`);
-
-		await git.run(`fetch ${targetProject.path_with_namespace} ${mergeRequest.target_branch}`);
-		await git.run(`fetch ${sourceProject.path_with_namespace} ${mergeRequest.source_branch}`);
-
-		await git.run(`checkout ${targetProject.path_with_namespace}/${mergeRequest.target_branch}`);
-
-		try {
-			await git.run(`branch -D ${mergeRequest.source_branch}`);
-		} catch (e) {
-			if (e.message.indexOf(`error: branch '${mergeRequest.source_branch}' not found.`) === -1) {
-				throw e;
-			}
-		}
-
-		await git.run(`checkout -b ${mergeRequest.source_branch} ${sourceProject.path_with_namespace}/${mergeRequest.source_branch}`);
-		await git.run(`rebase ${targetProject.path_with_namespace}/${mergeRequest.target_branch} ${mergeRequest.source_branch}`);
-
-		await git.run(`push --force-with-lease ${sourceProject.path_with_namespace} ${mergeRequest.source_branch}:${mergeRequest.source_branch}`);
-		await git.run(`checkout ${targetProject.path_with_namespace}/${mergeRequest.target_branch}`);
-		await git.run(`branch -D ${mergeRequest.source_branch}`);
-	}
-
-	private async getProject(projectId: number): Promise<Project> {
-		return this.sendRequestWithSingleResponse(`/api/v4/projects/${projectId}`, RequestMethod.Get);
+	public async rebaseMergeRequest(projectId: number, mergeRequestIid: number): Promise<void> {
+		const response = await this.sendRawRequest(`/api/v4/projects/${projectId}/merge_requests/${mergeRequestIid}/rebase`, RequestMethod.Put);
+		this.validateResponseStatus(response);
 	}
 
 	private async sendRequestWithSingleResponse(url: string, method: RequestMethod, body?: object): Promise<any> {
 		const response = await this.sendRawRequest(url, method, body);
-
-		if (response.status === 401) {
-			throw new Error('Unauthorized');
-		}
+		this.validateResponseStatus(response);
 
 		const data = await response.json();
 		if (typeof data !== 'object' && data.id === undefined) {
@@ -236,10 +169,7 @@ export class GitlabApi {
 
 	private async sendRequestWithMultiResponse(url: string, method: RequestMethod, body?: object): Promise<any> {
 		const response = await this.sendRawRequest(url, method, body);
-
-		if (response.status === 401) {
-			throw new Error('Unauthorized');
-		}
+		this.validateResponseStatus(response);
 
 		const data = await response.json();
 		if (!Array.isArray(data)) {
@@ -250,6 +180,20 @@ export class GitlabApi {
 		return data;
 	}
 
+	private validateResponseStatus(response: Response): void {
+		if (response.status === 401) {
+			throw new Error('Unauthorized');
+		}
+
+		if (response.status === 403) {
+			throw new Error('Forbidden');
+		}
+
+		if (response.status < 200 || response.status >= 300) {
+			throw new Error('Unexpected status code');
+		}
+	}
+
 	public sendRawRequest(url: string, method: RequestMethod, body?: object): Promise<Response> {
 		const options: RequestInit = {
 			method,
@@ -260,7 +204,11 @@ export class GitlabApi {
 		};
 
 		if (body !== undefined) {
-			options.body = JSON.stringify(body);
+			if (method === RequestMethod.Get) {
+				url = url + '?' + queryString.stringify(body);
+			} else {
+				options.body = JSON.stringify(body);
+			}
 		}
 
 		return fetch(`${this.gitlabUrl}${url}`, options);

src/Git.ts

@@ -79,7 +79,6 @@ export const filterBotLabels = (labels: string[]) => {
 
 export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: MergeRequest, user: User, options: AcceptMergeRequestOptions): Promise<AcceptMergeRequestResult> => {
 	let mergeRequestInfo;
-	let lastCommitOnTarget;
 
 	while (true) {
 		const tasks: Array<Promise<any>> = [sleep(options.ciInterval)];
@@ -117,15 +116,20 @@ export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: Mer
 			};
 		}
 
-		lastCommitOnTarget = await gitlabApi.getLastCommitOnTarget(mergeRequest.project_id, mergeRequest.target_branch);
-		if (mergeRequestInfo.diff_refs.base_sha !== lastCommitOnTarget.id) {
+		if (mergeRequestInfo.rebase_in_progress) {
+			console.log(`[MR] Still rebasing`);
+			await Promise.all(tasks);
+			continue;
+		}
+
+		if (mergeRequestInfo.diverged_commits_count > 0) {
 			await gitlabApi.updateMergeRequest(mergeRequest.project_id, mergeRequest.iid, {
 				labels: [...filterBotLabels(mergeRequestInfo.labels), BotLabels.Rebasing].join(','),
 			});
 			console.log(`[MR] source branch is not up to date, rebasing`);
 			await Promise.all([
 				tryCancelPipeline(gitlabApi, mergeRequestInfo, user),
-				gitlabApi.rebaseMergeRequest(mergeRequest, user),
+				gitlabApi.rebaseMergeRequest(mergeRequest.project_id, mergeRequest.iid),
 			]);
 			await gitlabApi.updateMergeRequest(mergeRequest.project_id, mergeRequest.iid, {
 				labels: [...filterBotLabels(mergeRequestInfo.labels), BotLabels.Accepting].join(','),

src/GitlabApi.ts

@@ -1,5 +1,4 @@
 import * as env from 'env-var';
-import * as fs from 'fs';
 import { assignToAuthorAndResetLabels } from './AssignToAuthor';
 import { setBotLabels } from './BotLabelsSetter';
 import { DiscussionNote, GitlabApi, MergeRequest, MergeRequestDiscussion, MergeStatus, User } from './GitlabApi';
@@ -18,13 +17,8 @@ const GITLAB_AUTH_TOKEN = env.get('GITLAB_AUTH_TOKEN').required().asString();
 const CI_CHECK_INTERVAL = env.get('CI_CHECK_INTERVAL', '10').asIntPositive() * 1000;
 const MR_CHECK_INTERVAL = env.get('MR_CHECK_INTERVAL', '20').asIntPositive() * 1000;
 const REMOVE_BRANCH_AFTER_MERGE = env.get('REMOVE_BRANCH_AFTER_MERGE', 'true').asBoolStrict();
-const dataDir = env.get('DATA_DIR', `${__dirname}/../data`).asString();
 
-if (!fs.existsSync(dataDir)) {
-	throw new Error(`Data directory ${dataDir} does not exist`);
-}
-
-const gitlabApi = new GitlabApi(GITLAB_URL, GITLAB_AUTH_TOKEN, `${dataDir}/repository`);
+const gitlabApi = new GitlabApi(GITLAB_URL, GITLAB_AUTH_TOKEN);
 const worker = new Worker();
 
 const runMergeRequestCheckerLoop = async (user: User) => {