From 4d4a630fa9cebab261a36cd6addb0c6b43469c7a Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Fri, 30 Apr 2021 14:15:33 +0200
Subject: [PATCH] Api refactor, return object for createCommit

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 .../src/api/GitReleaseApiClient.ts                   | 12 ++++++++----
 .../src/features/Patch/hooks/usePatch.ts             |  4 ++--
 .../src/test-helpers/test-helpers.ts                 |  6 ++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
index 42f0bfc510..a0bcb255b7 100644
--- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
+++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
@@ -366,8 +366,10 @@ export class GitReleaseApiClient implements GitReleaseApi {
     });
 
     return {
-      message: commit.message,
-      sha: commit.sha,
+      commit: {
+        message: commit.message,
+        sha: commit.sha,
+      },
     };
   };
 
@@ -666,8 +668,10 @@ export interface GitReleaseApi {
       parents: string[];
     } & OwnerRepo,
   ) => Promise<{
-    message: string;
-    sha: string;
+    commit: {
+      message: string;
+      sha: string;
+    };
   }>;
 
   updateRef: (
diff --git a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts
index 63a0669bfe..b227eda50b 100644
--- a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts
+++ b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts
@@ -97,7 +97,7 @@ export function usePatch({
     abortIfError(releaseBranchRes.error);
     if (!releaseBranchRes.value) return undefined;
 
-    const tempCommit = await pluginApiClient
+    const { commit: tempCommit } = await pluginApiClient
       .createCommit({
         owner: project.owner,
         repo: project.repo,
@@ -186,7 +186,7 @@ export function usePatch({
     const releaseBranchSha = releaseBranchRes.value.releaseBranch.commit.sha;
     const selectedPatchCommit = releaseBranchRes.value.selectedPatchCommit;
 
-    const cherryPickCommit = await pluginApiClient.createCommit({
+    const { commit: cherryPickCommit } = await pluginApiClient.createCommit({
       owner: project.owner,
       repo: project.repo,
       message: `[patch ${bumpedTag}] ${selectedPatchCommit.commit.message}
diff --git a/plugins/git-release-manager/src/test-helpers/test-helpers.ts b/plugins/git-release-manager/src/test-helpers/test-helpers.ts
index 03df4f675b..9a6089c7aa 100644
--- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts
+++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts
@@ -260,8 +260,10 @@ export const mockApiClient: GitReleaseApi = {
   })),
 
   createCommit: jest.fn(async () => ({
-    message: 'mock_commit_message',
-    sha: 'mock_commit_sha',
+    commit: {
+      message: 'mock_commit_message',
+      sha: 'mock_commit_sha',
+    },
   })),
 
   updateRef: jest.fn(async () => ({