Improved current pipeline detection (#16)

Author: pepakriz

src/GitlabApi.ts

@@ -129,6 +129,10 @@ export class GitlabApi {
 		return this.sendRequestWithMultiResponse(`/api/v4/projects/${projectId}/merge_requests/${mergeRequestIid}/discussions`, RequestMethod.Get);
 	}
 
+	public async getMergeRequestPipelines(projectId: number, mergeRequestIid: number): Promise<MergeRequestPipeline[]> {
+		return this.sendRequestWithMultiResponse(`/api/v4/projects/${projectId}/merge_requests/${mergeRequestIid}/pipelines`, RequestMethod.Get);
+	}
+
 	public async updateMergeRequest(projectId: number, mergeRequestIid: number, data: MergeRequestUpdateData): Promise<MergeRequestInfo> {
 		return this.sendRequestWithSingleResponse(`/api/v4/projects/${projectId}/merge_requests/${mergeRequestIid}`, RequestMethod.Put, data);
 	}

src/MergeRequestAcceptor.ts

@@ -94,7 +94,7 @@ export const filterBotLabels = (labels: string[]) => {
 };
 
 export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: MergeRequest, user: User, options: AcceptMergeRequestOptions): Promise<AcceptMergeRequestResult> => {
-	let mergeRequestInfo;
+	let mergeRequestInfo: MergeRequestInfo;
 	let numberOfPipelineValidationRetries = defaultPipelineValidationRetries;
 
 	while (true) {
@@ -162,26 +162,35 @@ export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: Mer
 			continue;
 		}
 
-		if (mergeRequestInfo.pipeline === null || mergeRequestInfo.pipeline.sha !== mergeRequestInfo.sha) {
-			const message = mergeRequestInfo.pipeline === null
-				? `[MR] Merge request can't be merged. Pipeline does not exist`
-				: `[MR] Merge request can't be merged. The latest pipeline is not executed on the latest commit`;
-			console.log(message);
-
-			if (numberOfPipelineValidationRetries > 0) {
-				numberOfPipelineValidationRetries--;
-				await Promise.all(tasks);
-				continue;
+		let currentPipeline: MergeRequestPipeline | null = mergeRequestInfo.pipeline;
+
+		if (currentPipeline === null || currentPipeline.sha !== mergeRequestInfo.sha) {
+			const pipelines = await gitlabApi.getMergeRequestPipelines(mergeRequest.project_id, mergeRequest.iid);
+			const currentPipelineCandidate = pipelines.find((pipeline) => pipeline.sha === mergeRequestInfo.sha);
+
+			if (currentPipelineCandidate === undefined) {
+				const message = mergeRequestInfo.pipeline === null
+					? `[MR] Merge request can't be merged. Pipeline does not exist`
+					: `[MR] Merge request can't be merged. The latest pipeline is not executed on the latest commit`;
+				console.log(message);
+
+				if (numberOfPipelineValidationRetries > 0) {
+					numberOfPipelineValidationRetries--;
+					await Promise.all(tasks);
+					continue;
+				}
+
+				return {
+					kind: AcceptMergeRequestResultKind.InvalidPipeline,
+					mergeRequestInfo,
+					pipeline: mergeRequestInfo.pipeline,
+				};
 			}
 
-			return {
-				kind: AcceptMergeRequestResultKind.InvalidPipeline,
-				mergeRequestInfo,
-				pipeline: mergeRequestInfo.pipeline,
-			};
+			currentPipeline = currentPipelineCandidate;
 		}
 
-		if (mergeRequestInfo.pipeline.status === PipelineStatus.Running || mergeRequestInfo.pipeline.status === PipelineStatus.Pending) {
+		if (currentPipeline.status === PipelineStatus.Running || currentPipeline.status === PipelineStatus.Pending) {
 			if (!containsLabel(mergeRequestInfo.labels, BotLabels.WaitingForPipeline)) {
 				tasks.push(
 					gitlabApi.updateMergeRequest(mergeRequest.project_id, mergeRequest.iid, {
@@ -190,28 +199,28 @@ export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: Mer
 				);
 			}
 
-			console.log(`[MR] Waiting for CI. Current status: ${mergeRequestInfo.pipeline.status}`);
+			console.log(`[MR] Waiting for CI. Current status: ${currentPipeline.status}`);
 			await Promise.all(tasks);
 			continue;
 		}
 
-		if (mergeRequestInfo.pipeline.status === PipelineStatus.Canceled) {
+		if (currentPipeline.status === PipelineStatus.Canceled) {
 			console.log(`[MR] pipeline is canceled calling retry`);
-			await gitlabApi.retryPipeline(mergeRequest.project_id, mergeRequestInfo.pipeline.id);
+			await gitlabApi.retryPipeline(mergeRequest.project_id, currentPipeline.id);
 			numberOfPipelineValidationRetries = defaultPipelineValidationRetries;
 			continue;
 		}
 
-		if (mergeRequestInfo.pipeline.status === PipelineStatus.Failed) {
+		if (currentPipeline.status === PipelineStatus.Failed) {
 			return {
 				kind: AcceptMergeRequestResultKind.FailedPipeline,
 				mergeRequestInfo,
-				pipeline: mergeRequestInfo.pipeline,
+				pipeline: currentPipeline,
 			};
 		}
 
-		if (mergeRequestInfo.pipeline.status !== PipelineStatus.Success) {
-			throw new Error(`Unexpected pipeline status: ${mergeRequestInfo.pipeline.status}`);
+		if (currentPipeline.status !== PipelineStatus.Success) {
+			throw new Error(`Unexpected pipeline status: ${currentPipeline.status}`);
 		}
 
 		console.log('[MR] Calling merge request');