From 1104c4932f3fa2d83ce22920255f185e2917c74c Mon Sep 17 00:00:00 2001 From: Erik Engervall Date: Fri, 30 Apr 2021 14:28:41 +0200 Subject: [PATCH] Api refactor, rename getSingleTag to getTag Signed-off-by: Erik Engervall --- .../src/api/GitReleaseApiClient.ts | 12 +++--------- .../src/features/Stats/helpers/getTagDates.ts | 6 +++--- .../src/test-helpers/test-helpers.ts | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts index 8083f1a16b..b01ed7d73f 100644 --- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts +++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts @@ -489,11 +489,7 @@ export class GitReleaseApiClient implements GitReleaseApi { }; }; - getSingleTag: GitReleaseApi['getSingleTag'] = async ({ - owner, - repo, - tagSha, - }) => { + getTag: GitReleaseApi['getTag'] = async ({ owner, repo, tagSha }) => { const { octokit } = await this.getOctokit(); const singleTag = await octokit.git.getTag({ owner, @@ -754,7 +750,7 @@ export interface GitReleaseApi { }>; }>; - getSingleTag: ( + getTag: ( args: { tagSha: string; } & OwnerRepo, @@ -809,6 +805,4 @@ export type GetAllTagsResult = UnboxReturnedPromise< export type GetAllReleasesResult = UnboxReturnedPromise< GitReleaseApi['getAllReleases'] >; -export type GetSingleTagResult = UnboxReturnedPromise< - GitReleaseApi['getSingleTag'] ->; +export type GetTagResult = UnboxReturnedPromise; diff --git a/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts b/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts index 05243f83d2..d61b865579 100644 --- a/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts +++ b/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts @@ -42,12 +42,12 @@ export const getTagDates = async ({ { tag: startTagResponse }, { tag: endTagResponse }, ] = await Promise.all([ - pluginApiClient.getSingleTag({ + pluginApiClient.getTag({ owner: project.owner, repo: project.repo, tagSha: startTag.tagSha, }), - pluginApiClient.getSingleTag({ + pluginApiClient.getTag({ owner: project.owner, repo: project.repo, tagSha: endTag.tagSha, @@ -126,7 +126,7 @@ async function getCommitFromTag({ project: GetTagDates['project']; tag: GetTagDates['startTag'] | GetTagDates['endTag']; }) { - const { tag: tagResponse } = await pluginApiClient.getSingleTag({ + const { tag: tagResponse } = await pluginApiClient.getTag({ owner: project.owner, repo: project.repo, tagSha: tag.tagSha, 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 04d15103df..68015feaa0 100644 --- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts +++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts @@ -315,7 +315,7 @@ export const mockApiClient: GitReleaseApi = { ], })), - getSingleTag: jest.fn(async () => ({ + getTag: jest.fn(async () => ({ tag: { date: '2021-04-29T12:48:30.120Z', username: 'mock_user_single_tag_name',