diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts index b61fb936f4..42f0bfc510 100644 --- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts +++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts @@ -342,8 +342,10 @@ export class GitReleaseApiClient implements GitReleaseApi { }); return { - tagName: createdTagObject.tag, - tagSha: createdTagObject.sha, + tagObject: { + tagName: createdTagObject.tag, + tagSha: createdTagObject.sha, + }, }; }; @@ -651,8 +653,10 @@ export interface GitReleaseApi { taggerName: string; } & OwnerRepo, ) => Promise<{ - tagName: string; - tagSha: string; + tagObject: { + tagName: string; + tagSha: string; + }; }>; createCommit: ( diff --git a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts index 936fb87b7b..9e8cf0b70b 100644 --- a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts +++ b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts @@ -130,7 +130,7 @@ export function useCreateReleaseCandidate({ abortIfError(releaseBranchRes.error); if (!releaseBranchRes.value) return undefined; - const createdTagObject = await pluginApiClient + const { tagObject } = await pluginApiClient .createTagObject({ owner: project.owner, repo: project.repo, @@ -144,11 +144,11 @@ export function useCreateReleaseCandidate({ addStepToResponseSteps({ message: 'Created Tag Object', - secondaryMessage: `with sha "${createdTagObject.tagSha}"`, + secondaryMessage: `with sha "${tagObject.tagSha}"`, }); return { - ...createdTagObject, + ...tagObject, }; }, [releaseBranchRes.value, releaseBranchRes.error]); 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 aacacf06c6..63a0669bfe 100644 --- a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts +++ b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts @@ -243,7 +243,7 @@ export function usePatch({ abortIfError(updatedRefRes.error); if (!updatedRefRes.value) return undefined; - const createdTagObject = await pluginApiClient + const { tagObject } = await pluginApiClient .createTagObject({ owner: project.owner, repo: project.repo, @@ -257,11 +257,11 @@ export function usePatch({ addStepToResponseSteps({ message: 'Created new tag object', - secondaryMessage: `with name "${createdTagObject.tagName}"`, + secondaryMessage: `with name "${tagObject.tagName}"`, }); return { - ...createdTagObject, + ...tagObject, }; }, [updatedRefRes.value, updatedRefRes.error]); diff --git a/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts b/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts index ff164dc5eb..8d50449b01 100644 --- a/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts +++ b/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts @@ -77,7 +77,7 @@ export function usePromoteRc({ abortIfError(latestReleaseBranchCommitSha.error); if (!latestReleaseBranchCommitSha.value) return undefined; - const createdTagObject = await pluginApiClient + const { tagObject } = await pluginApiClient .createTagObject({ owner: project.owner, repo: project.repo, @@ -91,11 +91,11 @@ export function usePromoteRc({ addStepToResponseSteps({ message: 'Created Tag Object', - secondaryMessage: `with sha "${createdTagObject.tagSha}"`, + secondaryMessage: `with sha "${tagObject.tagSha}"`, }); return { - ...createdTagObject, + ...tagObject, }; }, [latestReleaseBranchCommitSha.value, latestReleaseBranchCommitSha.error]); 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 02fd160797..03df4f675b 100644 --- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts +++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts @@ -253,8 +253,10 @@ export const mockApiClient: GitReleaseApi = { })), createTagObject: jest.fn(async () => ({ - tagName: 'mock_tag_object_tag', - tagSha: 'mock_tag_object_sha', + tagObject: { + tagName: 'mock_tag_object_tag', + tagSha: 'mock_tag_object_sha', + }, })), createCommit: jest.fn(async () => ({