.github/workflows/ci.yml

@@ -19,9 +19,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Setup Node ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci

.github/workflows/coverage.yml

@@ -16,7 +16,7 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: ArtiomTr/jest-coverage-report-action@v2
         with:
           test-script: npm test

.github/workflows/prepare-release.yml

@@ -19,11 +19,11 @@ jobs:
     name: Prepare release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: 18
       - name: Git config

.github/workflows/pull-request.yml

@@ -24,9 +24,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Setup Node ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci

.github/workflows/release.yml

@@ -17,11 +17,11 @@ jobs:
     name: Release package
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: 18
       - name: Git config

CHANGELOG.md

@@ -1,40 +1,5 @@
 # Changelog
 
-## <small>4.8.5 (2025-04-15)</small>
-
-* build(deps): audit fix (#150) ([3a9d367](https://github.com/kiegroup/git-backporting/commit/3a9d367)), closes [#150](https://github.com/kiegroup/git-backporting/issues/150)
-* build(deps): upgrade release-it to v18 (#153) ([c9a7375](https://github.com/kiegroup/git-backporting/commit/c9a7375)), closes [#153](https://github.com/kiegroup/git-backporting/issues/153)
-* fix(#151): fix gitlab post comments url (#152) ([d74a787](https://github.com/kiegroup/git-backporting/commit/d74a787)), closes [#152](https://github.com/kiegroup/git-backporting/issues/152)
-
-## [4.8.4](https://github.com/kiegroup/git-backporting/compare/v4.8.3...v4.8.4) (2024-11-02)
-
-
-### Bug Fixes
-
-* abort conflicting cherry-pick before starting new one ([#146](https://github.com/kiegroup/git-backporting/issues/146)) ([3deee59](https://github.com/kiegroup/git-backporting/commit/3deee59d4c3b726ae131b5974af4618dd5e7d1d2))
-
-## [4.8.3](https://github.com/kiegroup/git-backporting/compare/v4.8.2...v4.8.3) (2024-10-10)
-
-
-### Bug Fixes
-
-* auto-no-squash inference for GitLab ([#140](https://github.com/kiegroup/git-backporting/issues/140)) ([b4d0481](https://github.com/kiegroup/git-backporting/commit/b4d0481c5649115367f1ae0724d12d55b6b86e10))
-
-## [4.8.2](https://github.com/kiegroup/git-backporting/compare/v4.8.1...v4.8.2) (2024-10-07)
-
-
-### Bug Fixes
-
-* cherry-pick order on GitLab by reversing commmit list only once ([#137](https://github.com/kiegroup/git-backporting/issues/137)) ([e2d73d0](https://github.com/kiegroup/git-backporting/commit/e2d73d050c8387c0858877ac3c56c565bacaf4f9))
-* handle Codeberg returning null entry in requested_reviewers ([#136](https://github.com/kiegroup/git-backporting/issues/136)) ([1e8358b](https://github.com/kiegroup/git-backporting/commit/1e8358bb2c461c56cf86e82bec4d71284866b13b))
-
-## [4.8.1](https://github.com/kiegroup/git-backporting/compare/v4.8.0...v4.8.1) (2024-07-16)
-
-
-### Bug Fixes
-
-* **gh130:** apply commits in the correct order on github ([#131](https://github.com/kiegroup/git-backporting/issues/131)) ([cb3473d](https://github.com/kiegroup/git-backporting/commit/cb3473d7c9de66cb7bec188f08538e134cdc4bc0))
-
 ## [4.8.0](https://github.com/kiegroup/git-backporting/compare/v4.7.1...v4.8.0) (2024-04-11)
 
 
@@ -209,4 +174,4 @@ Project moved under @kiegroup organization.
 ### Features
 
 * backport still open pull requests ([b3936e0](https://github.com/kiegroup/git-backporting/commit/b3936e019a19976281c5e2582904264e974b8b42))
-* pull request backporting ([b3936e0](https://github.com/kiegroup/git-backporting/commit/b3936e019a19976281c5e2582904264e974b8b42))
+* pull request backporting ([b3936e0](https://github.com/kiegroup/git-backporting/commit/b3936e019a19976281c5e2582904264e974b8b42))

examples/on-pr-merge/automated-workflow.yaml

@@ -35,7 +35,7 @@ jobs:
       fail-fast: true
     steps:    
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Backporting

mise.toml

@@ -1,2 +0,0 @@
-[tools]
-node = "20"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kie/git-backporting",
-  "version": "4.8.5",
+  "version": "4.8.0",
   "description": "Git backporting is a tool to execute automatic pull request git backporting.",
   "author": "",
   "license": "MIT",
@@ -55,7 +55,7 @@
     "@gitbeaker/rest": "^39.1.0",
     "@kie/mock-github": "^1.1.0",
     "@octokit/webhooks-types": "^6.8.0",
-    "@release-it/conventional-changelog": "^10.0.0",
+    "@release-it/conventional-changelog": "^7.0.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.2.4",
     "@types/node": "^18.11.17",
@@ -66,7 +66,7 @@
     "husky": "^8.0.2",
     "jest": "^29.0.0",
     "jest-sonar-reporter": "^2.0.0",
-    "release-it": "^19.0.2",
+    "release-it": "^16.1.3",
     "semver": "^7.3.8",
     "ts-jest": "^29.0.0",
     "ts-node": "^10.8.1",

src/service/git/git-cli.ts

@@ -68,15 +68,6 @@ export default class GitCLIService {
     }
     
     this.logger.info(`Folder ${to} already exist. Won't clone`);
-    
-    // ensure the working tree is properly reset - no stale changes 
-    // from previous (failed) backport
-    const ongoingCherryPick = await this.anyConflict(to);
-    if (ongoingCherryPick) {
-      this.logger.warn("Found previously failed cherry-pick, aborting it");
-      await this.git(to).raw(["cherry-pick", "--abort"]);
-    }
-
     // checkout to the proper branch
     this.logger.info(`Checking out branch ${branch}`);
     await this.git(to).checkout(branch);
@@ -140,21 +131,6 @@ export default class GitCLIService {
     }
   }
 
-  /**
-   * Check whether there are some conflicts in the current working directory
-   * which means there is an ongoing cherry-pick that did not complete successfully
-   * @param cwd repository in which the check should be performed
-   * @return true if there is some conflict, false otherwise
-   */
-  async anyConflict(cwd: string): Promise<boolean> {
-    const status = await this.git(cwd).status();
-    if (status.conflicted.length > 0) {
-      this.logger.debug(`Found conflicts in branch ${status.current}`);
-      return true;
-    }
-    return false;
-  }
-
   /**
    * Push a branch to a remote
    * @param cwd repository in which the push should be performed

src/service/git/git-util.ts

@@ -45,17 +45,17 @@ export const inferGitApiUrl = (prUrl: string, apiVersion = "v4"): string => {
 /**
  * Infer the value of the squash option
  * @param open true if the pull/merge request is still open
- * @param squash_commit undefined or null if the pull/merge request was merged, the sha of the squashed commit if it was squashed
+ * @param squash_commit undefined if the pull/merge request was merged, the sha of the squashed commit if it was squashed
  * @returns true if a single commit must be cherry-picked, false if all merged commits must be cherry-picked
  */
-export const inferSquash = (open: boolean, squash_commit: string | undefined | null): boolean => {
+export const inferSquash = (open: boolean, squash_commit: string | undefined): boolean => {
   const logger = LoggerServiceFactory.getLogger();
 
   if (open) {
     logger.debug("cherry-pick all commits because they have not been merged (or squashed) in the base branch yet");
     return false;
   } else {
-    if (squash_commit) {
+    if (squash_commit !== undefined) {
       logger.debug(`cherry-pick the squashed commit ${squash_commit}`);
       return true;
     } else {

src/service/git/github/github-client.ts

@@ -73,11 +73,6 @@ export default class GitHubClient implements GitClient {
         });
 
         commits.push(...data.map(c => c.sha));
-        if (this.isForCodeberg) {
-          // For some reason, even though Codeberg advertises API compatibility
-          // with GitHub, it returns commits in reversed order.
-          commits.reverse();
-        }
       } catch(error) {
         throw new Error(`Failed to retrieve commits for pull request n. ${prNumber}`);
       }

src/service/git/github/github-mapper.ts

@@ -24,8 +24,8 @@ export default class GitHubMapper implements GitResponseMapper<PullRequest, "ope
       state: this.mapGitState(pr.state), // TODO fix using custom mapper
       merged: pr.merged ?? false,
       mergedBy: pr.merged_by?.login,
-      reviewers: pr.requested_reviewers?.filter(r => r && "login" in r).map((r => (r as User)?.login)) ?? [],
+      reviewers: pr.requested_reviewers?.filter(r => "login" in r).map((r => (r as User)?.login)) ?? [],
-      assignees: pr.assignees?.filter(r => r && "login" in r).map(r => r.login) ?? [],
+      assignees: pr.assignees?.filter(r => "login" in r).map(r => r.login) ?? [],
       labels: pr.labels?.map(l => l.name) ?? [],
       sourceRepo: await this.mapSourceRepo(pr),
       targetRepo: await this.mapTargetRepo(pr),

src/service/git/gitlab/gitlab-client.ts

@@ -48,9 +48,7 @@ export default class GitLabClient implements GitClient {
   // example: <host>/api/v4/projects/<namespace>%2Fbackporting-example/merge_requests/1
   async getPullRequest(namespace: string, repo: string, mrNumber: number, squash: boolean | undefined): Promise<GitPullRequest> {
     const projectId = this.getProjectId(namespace, repo);
-    const url = `/projects/${projectId}/merge_requests/${mrNumber}`;
+    const { data } = await this.client.get(`/projects/${projectId}/merge_requests/${mrNumber}`);
-    this.logger.debug(`Fetching pull request ${url}`);
-    const { data } = await this.client.get(`${url}`);
 
     if (squash === undefined) {
       squash = inferSquash(data.state === "opened", data.squash_commit_sha);
@@ -171,7 +169,7 @@ export default class GitLabClient implements GitClient {
       const { namespace, project, id } = this.extractMergeRequestData(mrUrl);
       const projectId = this.getProjectId(namespace, project);
 
-      const { data } = await this.client.post(`/projects/${projectId}/merge_requests/${id}/notes`, {
+      const { data } = await this.client.post(`/projects/${projectId}/issues/${id}/notes`, {
         body: comment,
       });
 

src/service/runner/runner.ts

@@ -152,7 +152,7 @@ export default class Runner {
 
     // 7. apply all changes to the new branch
     this.logger.debug("Cherry picking commits..");
-    for (const sha of originalPR.commits) {
+    for (const sha of originalPR.commits.reverse()!) {
       await git.gitCli.cherryPick(configs.folder, sha, configs.mergeStrategy, configs.mergeStrategyOption, configs.cherryPickOptions);
     }
 

test/service/git/git-util.test.ts

@@ -59,6 +59,5 @@ describe("check git utilities", () => {
     expect(inferSquash(true, undefined)).toStrictEqual(false);
     expect(inferSquash(false, "SHA")).toStrictEqual(true);
     expect(inferSquash(false, undefined)).toStrictEqual(false);
-    expect(inferSquash(false, null)).toStrictEqual(false);
   });
 });

test/service/runner/cli-github-runner.test.ts

@@ -376,8 +376,8 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "pull/4444/head:pr/4444");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", undefined, undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toHaveBeenLastCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", undefined, undefined, undefined);
-    expect(GitCLIService.prototype.cherryPick).toHaveBeenLastCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", undefined, undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", undefined, undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");
@@ -733,8 +733,8 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", undefined, undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toHaveBeenLastCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", undefined, undefined, undefined);
-    expect(GitCLIService.prototype.cherryPick).toHaveBeenLastCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", undefined, undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", undefined, undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");
@@ -839,8 +839,8 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", "ort", "find-renames", undefined);
+    expect(GitCLIService.prototype.cherryPick).toHaveBeenLastCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", "ort", "find-renames", undefined);
-    expect(GitCLIService.prototype.cherryPick).toHaveBeenLastCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", "ort", "find-renames", undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", "ort", "find-renames", undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");

test/service/runner/cli-gitlab-runner.test.ts

@@ -582,8 +582,8 @@ describe("cli runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledWith(cwd, "merge-requests/2/head:pr/2");
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
-    expect(GitCLIService.prototype.cherryPick).toHaveBeenNthCalledWith(1, cwd, "e4dd336a4a20f394df6665994df382fb1d193a11", undefined, undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "e4dd336a4a20f394df6665994df382fb1d193a11", undefined, undefined, undefined);
-    expect(GitCLIService.prototype.cherryPick).toHaveBeenNthCalledWith(2, cwd, "974519f65c9e0ed65277cd71026657a09fca05e7", undefined, undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "974519f65c9e0ed65277cd71026657a09fca05e7", undefined, undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-e4dd336-974519f");
@@ -604,50 +604,6 @@ describe("cli runner", () => {
     );
   });
 
-  test("merged MR with --auto-no-squash", async () => {
-    addProcessArgs([
-      "-tb",
-      "target",
-      "-pr",
-      "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/5",
-      "--auto-no-squash",
-    ]);
-
-    await runner.execute();
-
-    const cwd = process.cwd() + "/bp";
-
-    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
-    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
-
-    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
-
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-e4dd336");
-
-    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "e4dd336a4a20f394df6665994df382fb1d193a11", undefined, undefined, undefined);
-
-    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-e4dd336");
-
-    expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
-    expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
-        owner: "superuser", 
-        repo: "backporting-example", 
-        head: "bp-target-e4dd336",
-        base: "target", 
-        title: "[target] Update test.txt", 
-        body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/5"),
-        reviewers: ["superuser"],
-        assignees: [],
-        labels: [],
-        comments: [],
-      }
-    );
-  });
-
   test("auth using GITLAB_TOKEN takes precedence over GIT_TOKEN env variable", async () => {
     process.env[AuthTokenId.GIT_TOKEN] = "mygittoken";
     process.env[AuthTokenId.GITLAB_TOKEN] = "mygitlabtoken";

test/service/runner/gha-github-runner.test.ts

@@ -500,8 +500,8 @@ describe("gha runner", () => {
     expect(GitCLIService.prototype.fetch).toBeCalledTimes(0);
 
     expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(2);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", undefined, undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toHaveBeenLastCalledWith(cwd, "0404fb922ab75c3a8aecad5c97d9af388df04695", undefined, undefined, undefined);
-    expect(GitCLIService.prototype.cherryPick).toHaveBeenLastCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", undefined, undefined, undefined);
+    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "11da4e38aa3e577ffde6d546f1c52e53b04d3151", undefined, undefined, undefined);
 
     expect(GitCLIService.prototype.push).toBeCalledTimes(1);
     expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-0404fb9-11da4e3");

test/service/runner/gha-gitlab-runner.test.ts

@@ -519,46 +519,4 @@ describe("gha runner", () => {
       }
     );
   });
-
-  test("merged MR with auto-no-squash", async () => {
-    spyGetInput({
-      "target-branch": "target",
-      "pull-request": "https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/5",
-      "auto-no-squash": "true",
-    });
-
-    await runner.execute();
-
-    const cwd = process.cwd() + "/bp";
-
-    expect(GitClientFactory.getOrCreate).toBeCalledTimes(1);
-    expect(GitClientFactory.getOrCreate).toBeCalledWith(GitClientType.GITLAB, undefined, "https://my.gitlab.host.com/api/v4");
-
-    expect(GitCLIService.prototype.clone).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.clone).toBeCalledWith("https://my.gitlab.host.com/superuser/backporting-example.git", cwd, "target");
-
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.createLocalBranch).toBeCalledWith(cwd, "bp-target-e4dd336");
-
-    expect(GitCLIService.prototype.cherryPick).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.cherryPick).toBeCalledWith(cwd, "e4dd336a4a20f394df6665994df382fb1d193a11", undefined, undefined, undefined);
-
-    expect(GitCLIService.prototype.push).toBeCalledTimes(1);
-    expect(GitCLIService.prototype.push).toBeCalledWith(cwd, "bp-target-e4dd336");
-
-    expect(GitLabClient.prototype.createPullRequest).toBeCalledTimes(1);
-    expect(GitLabClient.prototype.createPullRequest).toBeCalledWith({
-        owner: "superuser", 
-        repo: "backporting-example", 
-        head: "bp-target-e4dd336",
-        base: "target", 
-        title: "[target] Update test.txt", 
-        body: expect.stringContaining("**Backport:** https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/5"),
-        reviewers: ["superuser"],
-        assignees: [],
-        labels: [],
-        comments: [],
-      }
-    );
-  });
 });

test/support/mock/git-client-mock-support.ts

@@ -1,8 +1,7 @@
 import LoggerServiceFactory from "@bp/service/logger/logger-service-factory";
 import { Moctokit } from "@kie/mock-github";
 import { TARGET_OWNER, REPO, MERGED_PR_FIXTURE, OPEN_PR_FIXTURE, NOT_MERGED_PR_FIXTURE, NOT_FOUND_PR_NUMBER, MULT_COMMITS_PR_FIXTURE, MULT_COMMITS_PR_COMMITS, NEW_PR_URL, NEW_PR_NUMBER, GITHUB_GET_COMMIT } from "./github-data";
-import { CLOSED_NOT_MERGED_MR, MERGED_SQUASHED_MR, NESTED_NAMESPACE_MR, OPEN_MR, OPEN_PR_COMMITS, PROJECT_EXAMPLE, NESTED_PROJECT_EXAMPLE, SUPERUSER, MERGED_SQUASHED_MR_COMMITS, MERGED_NOT_SQUASHED_MR, MERGED_NOT_SQUASHED_MR_COMMITS } from "./gitlab-data";
+import { CLOSED_NOT_MERGED_MR, MERGED_SQUASHED_MR, NESTED_NAMESPACE_MR, OPEN_MR, OPEN_PR_COMMITS, PROJECT_EXAMPLE, NESTED_PROJECT_EXAMPLE, SUPERUSER, MERGED_SQUASHED_MR_COMMITS } from "./gitlab-data";
-import { CB_TARGET_OWNER, CB_REPO, CB_MERGED_PR_FIXTURE, CB_OPEN_PR_FIXTURE, CB_NOT_MERGED_PR_FIXTURE, CB_NOT_FOUND_PR_NUMBER, CB_MULT_COMMITS_PR_FIXTURE, CB_MULT_COMMITS_PR_COMMITS, CB_NEW_PR_URL, CB_NEW_PR_NUMBER, CODEBERG_GET_COMMIT } from "./codeberg-data";
 
 // high number, for each test we are not expecting 
 // to send more than 3 reqs per api endpoint
@@ -25,8 +24,6 @@ export const getAxiosMocked = (url: string) => {
     data = CLOSED_NOT_MERGED_MR;
   }  else if (url.endsWith("merge_requests/4")) {
     data = NESTED_NAMESPACE_MR;
-  } else if (url.endsWith("merge_requests/5")) {
-    data = MERGED_NOT_SQUASHED_MR;
   } else if (url.endsWith("projects/76316")) {
     data = PROJECT_EXAMPLE;
   } else if (url.endsWith("projects/1645")) {
@@ -37,8 +34,6 @@ export const getAxiosMocked = (url: string) => {
     data = MERGED_SQUASHED_MR_COMMITS;
   } else if (url.endsWith("merge_requests/2/commits")) {
     data = OPEN_PR_COMMITS;
-  } else if (url.endsWith("merge_requests/5/commits")) {
-    data = MERGED_NOT_SQUASHED_MR_COMMITS;
   }
 
   return {
@@ -244,151 +239,3 @@ export const mockGitHubClient = (apiUrl = "https://api.github.com"): Moctokit =>
 
   return mock;
 };
-
-// CODEBERG - OCTOKIT
-
-export const mockCodebergClient = (apiUrl = "https://codeberg.org/api/v1"): Moctokit => {
-  logger.debug("Setting up moctokit..");
-  
-  const mock = new Moctokit(apiUrl);
-
-  // setup the mock requests here
-
-  // valid requests
-  mock.rest.pulls
-    .get({
-      owner: CB_TARGET_OWNER,
-      repo: CB_REPO,
-      pull_number: CB_MERGED_PR_FIXTURE.number
-    })
-    .reply({
-      status: 200,
-      data: CB_MERGED_PR_FIXTURE
-    });
-
-  mock.rest.pulls
-    .get({
-      owner: CB_TARGET_OWNER,
-      repo: CB_REPO,
-      pull_number: CB_MULT_COMMITS_PR_FIXTURE.number
-    })
-    .reply({
-      status: 200,
-      data: CB_MULT_COMMITS_PR_FIXTURE
-    });
-  
-  mock.rest.pulls
-    .get({
-      owner: CB_TARGET_OWNER,
-      repo: CB_REPO,
-      pull_number: CB_OPEN_PR_FIXTURE.number
-    })
-    .reply({
-      status: 200,
-      data: CB_OPEN_PR_FIXTURE
-    });
-  
-  mock.rest.pulls
-    .get({
-      owner: CB_TARGET_OWNER,
-      repo: CB_REPO,
-      pull_number: CB_NOT_MERGED_PR_FIXTURE.number
-    })
-    .reply({
-      status: 200,
-      data: CB_NOT_MERGED_PR_FIXTURE
-    });
-  
-  mock.rest.pulls
-    .listCommits({
-      owner: CB_TARGET_OWNER,
-      repo: CB_REPO,
-      pull_number: CB_MULT_COMMITS_PR_FIXTURE.number
-    })
-    .reply({
-      status: 200,
-      data: CB_MULT_COMMITS_PR_COMMITS
-    });
-  
-  mock.rest.pulls
-    .listCommits({
-      owner: CB_TARGET_OWNER,
-      repo: CB_REPO,
-      pull_number: CB_OPEN_PR_FIXTURE.number
-    })
-    .reply({
-      status: 200,
-      data: CB_MULT_COMMITS_PR_COMMITS
-    });
-
-  mock.rest.pulls
-    .create()
-    .reply({
-      repeat: REPEAT,
-      status: 201,
-      data: {
-        number: CB_NEW_PR_NUMBER,
-        html_url: CB_NEW_PR_URL,
-      }
-    });
-
-  mock.rest.pulls
-    .requestReviewers()
-    .reply({
-      repeat: REPEAT,
-      status: 201,
-      data: CB_MERGED_PR_FIXTURE
-    });
-
-  mock.rest.issues
-    .addAssignees()
-    .reply({
-      repeat: REPEAT,
-      status: 201,
-      data: {}
-    });
-
-  mock.rest.issues
-    .addLabels()
-    .reply({
-      repeat: REPEAT,
-      status: 200,
-      data: {}
-    });
-
-  mock.rest.issues
-    .createComment()
-    .reply({
-      repeat: REPEAT,
-      status: 201,
-      data: {}
-    });
-
-  mock.rest.git
-    .getCommit({
-      owner: CB_TARGET_OWNER,
-      repo: CB_REPO,
-      commit_sha: "28f63db774185f4ec4b57cd9aaeb12dbfb4c9ecc",
-    })
-    .reply({
-      status: 200,
-      data: CODEBERG_GET_COMMIT,
-    });
-
-  // invalid requests
-  mock.rest.pulls
-    .get({
-      owner: CB_TARGET_OWNER,
-      repo: CB_REPO,
-      pull_number: CB_NOT_FOUND_PR_NUMBER
-    })
-    .reply({
-      repeat: REPEAT,
-      status: 404,
-      data: {
-        message: "Not found"
-      }
-    });
-
-  return mock;
-};

test/support/mock/gitlab-data.ts

@@ -755,29 +755,6 @@ export const OPEN_PR_COMMITS = [
    }
 ];
 
-export const MERGED_NOT_SQUASHED_MR_COMMITS = [
-   {
-      "id":"e4dd336a4a20f394df6665994df382fb1d193a11",
-      "short_id":"e4dd336a",
-      "created_at":"2023-06-29T09:59:10.000Z",
-      "parent_ids":[
-         
-      ],
-      "title":"Add new file",
-      "message":"Add new file",
-      "author_name":"Super User",
-      "author_email":"superuser@email.com",
-      "authored_date":"2023-06-29T09:59:10.000Z",
-      "committer_name":"Super User",
-      "committer_email":"superuser@email.com",
-      "committed_date":"2023-06-29T09:59:10.000Z",
-      "trailers":{
-         
-      },
-      "web_url":"https://gitlab.com/superuser/backporting-example/-/commit/e4dd336a4a20f394df6665994df382fb1d193a11"
-   },
-];
-
 export const SUPERUSER = {
    "id":14041,
    "username":"superuser",
@@ -921,138 +898,3 @@ export const NESTED_NAMESPACE_MR = {
       "can_merge":true
    }
  };
-
-export const MERGED_NOT_SQUASHED_MR = {
-  "id":807106,
-  "iid":1,
-  "project_id":76316,
-  "title":"Update test.txt",
-  "description":"This is the body",
-  "state":"merged",
-  "created_at":"2023-06-28T14:32:40.943Z",
-  "updated_at":"2023-06-28T14:37:12.108Z",
-  "merged_by":{
-     "id":14041,
-     "username":"superuser",
-     "name":"Super User",
-     "state":"active",
-     "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
-     "web_url":"https://my.gitlab.host.com/superuser"
-  },
-  "merge_user":{
-     "id":14041,
-     "username":"superuser",
-     "name":"Super User",
-     "state":"active",
-     "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
-     "web_url":"https://my.gitlab.host.com/superuser"
-  },
-  "merged_at":"2023-06-28T14:37:11.667Z",
-  "closed_by":null,
-  "closed_at":null,
-  "target_branch":"main",
-  "source_branch":"feature",
-  "user_notes_count":0,
-  "upvotes":0,
-  "downvotes":0,
-  "author":{
-     "id":14041,
-     "username":"superuser",
-     "name":"Super User",
-     "state":"active",
-     "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
-     "web_url":"https://my.gitlab.host.com/superuser"
-  },
-  "assignees":[
-     {
-        "id":14041,
-        "username":"superuser",
-        "name":"Super User",
-        "state":"active",
-        "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
-        "web_url":"https://my.gitlab.host.com/superuser"
-     }
-  ],
-  "assignee":{
-     "id":14041,
-     "username":"superuser",
-     "name":"Super User",
-     "state":"active",
-     "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
-     "web_url":"https://my.gitlab.host.com/superuser"
-  },
-  "reviewers":[
-     {
-        "id":1404188,
-        "username":"superuser1",
-        "name":"Super User",
-        "state":"active",
-        "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
-        "web_url":"https://my.gitlab.host.com/superuser"
-     },
-     {
-        "id":1404199,
-        "username":"superuser2",
-        "name":"Super User",
-        "state":"active",
-        "avatar_url":"https://my.gitlab.host.com/uploads/-/system/user/avatar/14041/avatar.png",
-        "web_url":"https://my.gitlab.host.com/superuser"
-     }
-  ],
-  "source_project_id":76316,
-  "target_project_id":76316,
-  "labels":[
-     "backport-prod"
-  ],
-  "draft":false,
-  "work_in_progress":false,
-  "milestone":null,
-  "merge_when_pipeline_succeeds":false,
-  "merge_status":"can_be_merged",
-  "detailed_merge_status":"not_open",
-  "sha":"9e15674ebd48e05c6e428a1fa31dbb60a778d644",
-  "merge_commit_sha":"4d369c3e9a8d1d5b7e56c892a8ab2a7666583ac3",
-  "squash_commit_sha":null,
-  "discussion_locked":null,
-  "should_remove_source_branch":true,
-  "force_remove_source_branch":true,
-  "reference":"!5",
-  "references":{
-     "short":"!5",
-     "relative":"!5",
-     "full":"superuser/backporting-example!5"
-  },
-  "web_url":"https://my.gitlab.host.com/superuser/backporting-example/-/merge_requests/5",
-  "time_stats":{
-     "time_estimate":0,
-     "total_time_spent":0,
-     "human_time_estimate":null,
-     "human_total_time_spent":null
-  },
-  "squash":false,
-  "squash_on_merge":false,
-  "task_completion_status":{
-     "count":0,
-     "completed_count":0
-  },
-  "has_conflicts":false,
-  "blocking_discussions_resolved":true,
-  "approvals_before_merge":null,
-  "subscribed":true,
-  "changes_count":"1",
-  "latest_build_started_at":null,
-  "latest_build_finished_at":null,
-  "first_deployed_to_production_at":null,
-  "pipeline":null,
-  "head_pipeline":null,
-  "diff_refs":{
-     "base_sha":"2c553a0c4c133a51806badce5fa4842b7253cb3b",
-     "head_sha":"9e15674ebd48e05c6e428a1fa31dbb60a778d644",
-     "start_sha":"2c553a0c4c133a51806badce5fa4842b7253cb3b"
-  },
-  "merge_error":null,
-  "first_contribution":false,
-  "user":{
-     "can_merge":true
-  }
-};