From c7ba03393c6abd2fb37827f5fa2cf4708088b680 Mon Sep 17 00:00:00 2001 From: Erik Engervall Date: Thu, 29 Apr 2021 15:33:51 +0200 Subject: [PATCH] Replace api.patch.createReference with api.createRef Signed-off-by: Erik Engervall --- .../src/api/GitReleaseApiClient.test.ts | 1 - .../src/api/GitReleaseApiClient.ts | 26 ------------------- .../src/features/Patch/hooks/usePatch.test.ts | 2 +- .../src/features/Patch/hooks/usePatch.ts | 8 +++--- .../src/test-helpers/test-helpers.ts | 4 --- 5 files changed, 5 insertions(+), 36 deletions(-) diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts index 215c615963..ba697ca99b 100644 --- a/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts +++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts @@ -54,7 +54,6 @@ describe('GitReleaseApiClient', () => { "host": "github.com", "patch": Object { "createCherryPickCommit": [Function], - "createReference": [Function], "createTempCommit": [Function], "forceBranchHeadToTempCommit": [Function], "merge": [Function], diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts index d35b5a043b..5d263f54a0 100644 --- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts +++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts @@ -443,20 +443,6 @@ ${messageSuffix}`, }; }, - createReference: async ({ owner, repo, bumpedTag, createdTagObject }) => { - const { octokit } = await this.getOctokit(); - const { data: reference } = await octokit.git.createRef({ - owner, - repo, - ref: `refs/tags/${bumpedTag}`, - sha: createdTagObject.tagSha, - }); - - return { - ref: reference.ref, - }; - }, - updateRelease: async ({ owner, repo, @@ -779,15 +765,6 @@ export interface GitReleaseApi { }; }>; - createReference: ( - args: { - bumpedTag: string; - createdTagObject: CreateTagObjectResult; - } & OwnerRepo, - ) => Promise<{ - ref: string; - }>; - updateRelease: ( args: { bumpedTag: string; @@ -897,9 +874,6 @@ export type ReplaceTempCommitResult = UnboxReturnedPromise< export type CreateTagObjectResult = UnboxReturnedPromise< GitReleaseApi['createTagObject'] >; -export type CreateReferenceResult = UnboxReturnedPromise< - GitReleaseApi['patch']['createReference'] ->; export type UpdateReleaseResult = UnboxReturnedPromise< GitReleaseApi['patch']['updateRelease'] >; diff --git a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.test.ts b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.test.ts index 9741244c23..8d91d1c467 100644 --- a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.test.ts +++ b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.test.ts @@ -106,7 +106,7 @@ describe('patch', () => { "secondaryMessage": "with name \\"mock_tag_object_tag\\"", }, Object { - "message": "Created new reference \\"mock_reference_ref\\"", + "message": "Created new reference \\"mock_createRef_ref\\"", "secondaryMessage": "for tag object \\"mock_tag_object_tag\\"", }, Object { 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 bc71267089..140648e91a 100644 --- a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts +++ b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts @@ -271,12 +271,12 @@ export function usePatch({ abortIfError(createdTagObjRes.error); if (!createdTagObjRes.value) return undefined; - const reference = await pluginApiClient.patch - .createReference({ + const reference = await pluginApiClient + .createRef({ owner: project.owner, repo: project.repo, - bumpedTag, - createdTagObject: createdTagObjRes.value, + ref: `refs/tags/${bumpedTag}`, + sha: createdTagObjRes.value.tagSha, }) .catch(asyncCatcher); 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 47a04e62ff..6b2951b9a3 100644 --- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts +++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts @@ -248,10 +248,6 @@ export const mockApiClient: GitReleaseApi = { sha: 'mock_cherrypick_sha', })), - createReference: jest.fn(async () => ({ - ref: 'mock_reference_ref', - })), - createTempCommit: jest.fn(async () => ({ message: 'mock_commit_message', sha: 'mock_commit_sha',