Replace patch.createCherryPickCommit with agnostic createCommit

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>

plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts

@@ -55,7 +55,6 @@ describe('GitReleaseApiClient', () => {
         },
         "host": "github.com",
         "patch": Object {
-          "createCherryPickCommit": [Function],
           "merge": [Function],
           "updateRelease": [Function],
         },

plugins/git-release-manager/src/api/GitReleaseApiClient.ts

@@ -398,32 +398,6 @@ export class GitReleaseApiClient implements GitReleaseApi {
       };
     },
 
-    createCherryPickCommit: async ({
-      owner,
-      repo,
-      bumpedTag,
-      selectedPatchCommit,
-      mergeTree,
-      releaseBranchSha,
-      messageSuffix,
-    }) => {
-      const { octokit } = await this.getOctokit();
-      const { data: cherryPickCommit } = await octokit.git.createCommit({
-        owner,
-        repo,
-        message: `[patch ${bumpedTag}] ${selectedPatchCommit.commit.message}
-
-${messageSuffix}`,
-        tree: mergeTree,
-        parents: [releaseBranchSha],
-      });
-
-      return {
-        message: cherryPickCommit.message,
-        sha: cherryPickCommit.sha,
-      };
-    },
-
     updateRelease: async ({
       owner,
       repo,
@@ -716,21 +690,6 @@ export interface GitReleaseApi {
       };
     }>;
 
-    createCherryPickCommit: (
-      args: {
-        bumpedTag: string;
-        selectedPatchCommit: UnboxArray<
-          UnboxReturnedPromise<GitReleaseApi['getRecentCommits']>
-        >;
-        mergeTree: string;
-        releaseBranchSha: string;
-        messageSuffix: string;
-      } & OwnerRepo,
-    ) => Promise<{
-      message: string;
-      sha: string;
-    }>;
-
     updateRelease: (
       args: {
         bumpedTag: string;
@@ -826,9 +785,6 @@ export type CreateReleaseResult = UnboxReturnedPromise<
   GitReleaseApi['createRelease']
 >;
 export type MergeResult = UnboxReturnedPromise<GitReleaseApi['patch']['merge']>;
-export type CreateCherryPickCommitResult = UnboxReturnedPromise<
-  GitReleaseApi['patch']['createCherryPickCommit']
->;
 export type CreateTagObjectResult = UnboxReturnedPromise<
   GitReleaseApi['createTagObject']
 >;

plugins/git-release-manager/src/features/Patch/hooks/usePatch.test.ts

@@ -96,7 +96,7 @@ describe('patch', () => {
           },
           Object {
             "message": "Cherry-picked patch commit to \\"mock_branch_commit_sha\\"",
-            "secondaryMessage": "with message \\"mock_cherrypick_message\\"",
+            "secondaryMessage": "with message \\"mock_commit_message\\"",
           },
           Object {
             "message": "Updated reference \\"mock_update_ref_ref\\"",

plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts

@@ -184,20 +184,19 @@ export function usePatch({
     if (!mergeRes.value || !releaseBranchRes.value) return undefined;
 
     const releaseBranchSha = releaseBranchRes.value.releaseBranch.commit.sha;
+    const selectedPatchCommit = releaseBranchRes.value.selectedPatchCommit;
 
-    const cherryPickCommit = await pluginApiClient.patch
-      .createCherryPickCommit({
-        owner: project.owner,
-        repo: project.repo,
-        bumpedTag,
-        mergeTree: mergeRes.value.commit.tree.sha,
-        releaseBranchSha,
-        selectedPatchCommit: releaseBranchRes.value.selectedPatchCommit,
-        messageSuffix: getPatchCommitSuffix({
-          commitSha: releaseBranchRes.value.selectedPatchCommit.sha,
-        }),
-      })
-      .catch(asyncCatcher);
+    const cherryPickCommit = await pluginApiClient.createCommit({
+      owner: project.owner,
+      repo: project.repo,
+      message: `[patch ${bumpedTag}] ${selectedPatchCommit.commit.message}
+
+      ${getPatchCommitSuffix({
+        commitSha: selectedPatchCommit.sha,
+      })}`,
+      parents: [releaseBranchSha],
+      tree: mergeRes.value.commit.tree.sha,
+    });
 
     addStepToResponseSteps({
       message: `Cherry-picked patch commit to "${releaseBranchSha}"`,

plugins/git-release-manager/src/test-helpers/test-helpers.ts

@@ -254,11 +254,6 @@ export const mockApiClient: GitReleaseApi = {
   })),
 
   patch: {
-    createCherryPickCommit: jest.fn(async () => ({
-      message: 'mock_cherrypick_message',
-      sha: 'mock_cherrypick_sha',
-    })),
-
     merge: jest.fn(async () => ({
       htmlUrl: 'mock_merge_html_url',
       commit: {