From b83db8947bf6e56023194ac8eabee18e0ba52783 Mon Sep 17 00:00:00 2001 From: Erik Engervall Date: Wed, 5 May 2021 17:44:25 +0200 Subject: [PATCH] Rename GitReleaseApiClient to GitReleaseClient Signed-off-by: Erik Engervall --- ...leaseApiClient.test.ts => GitReleaseClient.test.ts} | 10 +++++----- .../{GitReleaseApiClient.ts => GitReleaseClient.ts} | 2 +- plugins/git-release-manager/src/api/serviceApiRef.ts | 2 +- .../CreateReleaseCandidate/CreateReleaseCandidate.tsx | 2 +- .../hooks/useCreateReleaseCandidate.ts | 2 +- plugins/git-release-manager/src/features/Info/Info.tsx | 2 +- .../git-release-manager/src/features/Patch/Patch.tsx | 2 +- .../src/features/Patch/PatchBody.tsx | 2 +- .../src/features/Patch/hooks/usePatch.ts | 2 +- .../src/features/PromoteRc/PromoteRc.tsx | 2 +- .../src/features/PromoteRc/PromoteRcBody.tsx | 2 +- .../src/features/PromoteRc/hooks/usePromoteRc.ts | 2 +- .../src/features/Stats/helpers/getMappedReleases.tsx | 2 +- .../src/features/Stats/helpers/getReleaseStats.tsx | 2 +- .../src/features/Stats/helpers/getTagDates.ts | 2 +- .../src/helpers/getReleaseCandidateGitInfo.ts | 2 +- .../src/hooks/useGetGitBatchInfo.ts | 2 +- plugins/git-release-manager/src/plugin.ts | 4 ++-- .../src/test-helpers/test-helpers.ts | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) rename plugins/git-release-manager/src/api/{GitReleaseApiClient.test.ts => GitReleaseClient.test.ts} (88%) rename plugins/git-release-manager/src/api/{GitReleaseApiClient.ts => GitReleaseClient.ts} (99%) diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts b/plugins/git-release-manager/src/api/GitReleaseClient.test.ts similarity index 88% rename from plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts rename to plugins/git-release-manager/src/api/GitReleaseClient.test.ts index 76c9bf4fff..c5b03b3c13 100644 --- a/plugins/git-release-manager/src/api/GitReleaseApiClient.test.ts +++ b/plugins/git-release-manager/src/api/GitReleaseClient.test.ts @@ -16,21 +16,21 @@ import { ConfigReader, OAuthApi } from '@backstage/core'; -import { GitReleaseApiClient } from './GitReleaseApiClient'; +import { GitReleaseClient } from './GitReleaseClient'; -describe('GitReleaseApiClient', () => { +describe('GitReleaseClient', () => { it('should return the default plugin api client', () => { const configApi = new ConfigReader({}); const githubAuthApi: OAuthApi = { getAccessToken: jest.fn(), }; - const gitReleaseApiClient = new GitReleaseApiClient({ + const gitReleaseClient = new GitReleaseClient({ configApi, githubAuthApi, }); - expect(gitReleaseApiClient).toMatchInlineSnapshot(` - GitReleaseApiClient { + expect(gitReleaseClient).toMatchInlineSnapshot(` + GitReleaseClient { "baseUrl": "https://api.github.com", "createCommit": [Function], "createRef": [Function], diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseClient.ts similarity index 99% rename from plugins/git-release-manager/src/api/GitReleaseApiClient.ts rename to plugins/git-release-manager/src/api/GitReleaseClient.ts index 3bcba9226a..602fb99a5c 100644 --- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts +++ b/plugins/git-release-manager/src/api/GitReleaseClient.ts @@ -22,7 +22,7 @@ import { DISABLE_CACHE } from '../constants/constants'; import { Project } from '../contexts/ProjectContext'; import { UnboxArray, UnboxReturnedPromise } from '../types/helpers'; -export class GitReleaseApiClient implements GitReleaseApi { +export class GitReleaseClient implements GitReleaseApi { private readonly githubAuthApi: OAuthApi; private readonly baseUrl: string; readonly host: string; diff --git a/plugins/git-release-manager/src/api/serviceApiRef.ts b/plugins/git-release-manager/src/api/serviceApiRef.ts index d8c9887fcb..7a5c045d40 100644 --- a/plugins/git-release-manager/src/api/serviceApiRef.ts +++ b/plugins/git-release-manager/src/api/serviceApiRef.ts @@ -16,7 +16,7 @@ import { createApiRef } from '@backstage/core'; -import { GitReleaseApi } from './GitReleaseApiClient'; +import { GitReleaseApi } from './GitReleaseClient'; export const gitReleaseManagerApiRef = createApiRef({ id: 'plugin.git-release-manager.service', diff --git a/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx b/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx index 8f99610fb3..ea074b5fe6 100644 --- a/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx +++ b/plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx @@ -30,7 +30,7 @@ import { GetBranchResult, GetLatestReleaseResult, GetRepositoryResult, -} from '../../api/GitReleaseApiClient'; +} from '../../api/GitReleaseClient'; import { ComponentConfigCreateRc } from '../../types/types'; import { Differ } from '../../components/Differ'; import { getReleaseCandidateGitInfo } from '../../helpers/getReleaseCandidateGitInfo'; 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 dbef49d185..5ab4fe2338 100644 --- a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts +++ b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts @@ -21,7 +21,7 @@ import { useApi } from '@backstage/core'; import { GetLatestReleaseResult, GetRepositoryResult, -} from '../../../api/GitReleaseApiClient'; +} from '../../../api/GitReleaseClient'; import { CardHook, ComponentConfigCreateRc } from '../../../types/types'; import { getReleaseCandidateGitInfo } from '../../../helpers/getReleaseCandidateGitInfo'; import { gitReleaseManagerApiRef } from '../../../api/serviceApiRef'; diff --git a/plugins/git-release-manager/src/features/Info/Info.tsx b/plugins/git-release-manager/src/features/Info/Info.tsx index 1ddf82997b..2bd31fa25a 100644 --- a/plugins/git-release-manager/src/features/Info/Info.tsx +++ b/plugins/git-release-manager/src/features/Info/Info.tsx @@ -21,7 +21,7 @@ import BarChartIcon from '@material-ui/icons/BarChart'; import { GetBranchResult, GetLatestReleaseResult, -} from '../../api/GitReleaseApiClient'; +} from '../../api/GitReleaseClient'; import { Differ } from '../../components/Differ'; import { InfoCardPlus } from '../../components/InfoCardPlus'; import { Stats } from '../Stats/Stats'; diff --git a/plugins/git-release-manager/src/features/Patch/Patch.tsx b/plugins/git-release-manager/src/features/Patch/Patch.tsx index ac54f01398..9ccb061696 100644 --- a/plugins/git-release-manager/src/features/Patch/Patch.tsx +++ b/plugins/git-release-manager/src/features/Patch/Patch.tsx @@ -21,7 +21,7 @@ import { Alert, AlertTitle } from '@material-ui/lab'; import { GetBranchResult, GetLatestReleaseResult, -} from '../../api/GitReleaseApiClient'; +} from '../../api/GitReleaseClient'; import { ComponentConfigPatch } from '../../types/types'; import { getBumpedTag } from '../../helpers/getBumpedTag'; import { InfoCardPlus } from '../../components/InfoCardPlus'; diff --git a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx index b8e037800c..85e62f4610 100644 --- a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx +++ b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx @@ -38,7 +38,7 @@ import { Progress, useApi } from '@backstage/core'; import { GetBranchResult, GetLatestReleaseResult, -} from '../../api/GitReleaseApiClient'; +} from '../../api/GitReleaseClient'; import { CalverTagParts } from '../../helpers/tagParts/getCalverTagParts'; import { ComponentConfigPatch } from '../../types/types'; import { Differ } from '../../components/Differ'; 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 d0f22fba4f..7f1dc35667 100644 --- a/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts +++ b/plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts @@ -21,7 +21,7 @@ import { useApi } from '@backstage/core'; import { GetLatestReleaseResult, GetRecentCommitsResultSingle, -} from '../../../api/GitReleaseApiClient'; +} from '../../../api/GitReleaseClient'; import { CalverTagParts } from '../../../helpers/tagParts/getCalverTagParts'; import { ComponentConfigPatch, CardHook } from '../../../types/types'; import { getPatchCommitSuffix } from '../helpers/getPatchCommitSuffix'; diff --git a/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx b/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx index 6166fde1b6..ecb584a6f4 100644 --- a/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx +++ b/plugins/git-release-manager/src/features/PromoteRc/PromoteRc.tsx @@ -19,7 +19,7 @@ import { Alert, AlertTitle } from '@material-ui/lab'; import { Box, Typography } from '@material-ui/core'; import { ComponentConfigPromoteRc } from '../../types/types'; -import { GetLatestReleaseResult } from '../../api/GitReleaseApiClient'; +import { GetLatestReleaseResult } from '../../api/GitReleaseClient'; import { InfoCardPlus } from '../../components/InfoCardPlus'; import { NoLatestRelease } from '../../components/NoLatestRelease'; import { PromoteRcBody } from './PromoteRcBody'; diff --git a/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx b/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx index 3ca1d916f3..29e1de52cd 100644 --- a/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx +++ b/plugins/git-release-manager/src/features/PromoteRc/PromoteRcBody.tsx @@ -19,7 +19,7 @@ import { Button, Typography, Box } from '@material-ui/core'; import { ComponentConfigPromoteRc } from '../../types/types'; import { Differ } from '../../components/Differ'; -import { GetLatestReleaseResult } from '../../api/GitReleaseApiClient'; +import { GetLatestReleaseResult } from '../../api/GitReleaseClient'; import { ResponseStepDialog } from '../../components/ResponseStepDialog/ResponseStepDialog'; import { TEST_IDS } from '../../test-helpers/test-ids'; import { usePromoteRc } from './hooks/usePromoteRc'; 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 1d78895aee..318c928479 100644 --- a/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts +++ b/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts @@ -19,7 +19,7 @@ import { useAsync, useAsyncFn } from 'react-use'; import { useApi } from '@backstage/core'; import { CardHook, ComponentConfigPromoteRc } from '../../../types/types'; -import { GetLatestReleaseResult } from '../../../api/GitReleaseApiClient'; +import { GetLatestReleaseResult } from '../../../api/GitReleaseClient'; import { gitReleaseManagerApiRef } from '../../../api/serviceApiRef'; import { GitReleaseManagerError } from '../../../errors/GitReleaseManagerError'; import { TAG_OBJECT_MESSAGE } from '../../../constants/constants'; diff --git a/plugins/git-release-manager/src/features/Stats/helpers/getMappedReleases.tsx b/plugins/git-release-manager/src/features/Stats/helpers/getMappedReleases.tsx index 953864461c..0ea94d29ac 100644 --- a/plugins/git-release-manager/src/features/Stats/helpers/getMappedReleases.tsx +++ b/plugins/git-release-manager/src/features/Stats/helpers/getMappedReleases.tsx @@ -15,7 +15,7 @@ */ import { calverRegexp } from '../../../helpers/tagParts/getCalverTagParts'; -import { GetAllReleasesResult } from '../../../api/GitReleaseApiClient'; +import { GetAllReleasesResult } from '../../../api/GitReleaseClient'; import { Project } from '../../../contexts/ProjectContext'; import { ReleaseStats } from '../contexts/ReleaseStatsContext'; import { semverRegexp } from '../../../helpers/tagParts/getSemverTagParts'; diff --git a/plugins/git-release-manager/src/features/Stats/helpers/getReleaseStats.tsx b/plugins/git-release-manager/src/features/Stats/helpers/getReleaseStats.tsx index e6b7d91f60..e4e57c1114 100644 --- a/plugins/git-release-manager/src/features/Stats/helpers/getReleaseStats.tsx +++ b/plugins/git-release-manager/src/features/Stats/helpers/getReleaseStats.tsx @@ -15,7 +15,7 @@ */ import { calverRegexp } from '../../../helpers/tagParts/getCalverTagParts'; -import { GetAllTagsResult } from '../../../api/GitReleaseApiClient'; +import { GetAllTagsResult } from '../../../api/GitReleaseClient'; import { Project } from '../../../contexts/ProjectContext'; import { ReleaseStats } from '../contexts/ReleaseStatsContext'; import { semverRegexp } from '../../../helpers/tagParts/getSemverTagParts'; 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 d61b865579..d4803be4be 100644 --- a/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts +++ b/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { GitReleaseApi } from '../../../api/GitReleaseApiClient'; +import { GitReleaseApi } from '../../../api/GitReleaseClient'; import { GitReleaseManagerError } from '../../../errors/GitReleaseManagerError'; import { Project } from '../../../contexts/ProjectContext'; diff --git a/plugins/git-release-manager/src/helpers/getReleaseCandidateGitInfo.ts b/plugins/git-release-manager/src/helpers/getReleaseCandidateGitInfo.ts index 80ed3083ce..729439cea6 100644 --- a/plugins/git-release-manager/src/helpers/getReleaseCandidateGitInfo.ts +++ b/plugins/git-release-manager/src/helpers/getReleaseCandidateGitInfo.ts @@ -17,7 +17,7 @@ import { DateTime } from 'luxon'; import { getBumpedSemverTagParts } from './getBumpedTag'; -import { GetLatestReleaseResult } from '../api/GitReleaseApiClient'; +import { GetLatestReleaseResult } from '../api/GitReleaseClient'; import { getSemverTagParts } from './tagParts/getSemverTagParts'; import { Project } from '../contexts/ProjectContext'; import { SEMVER_PARTS } from '../constants/constants'; diff --git a/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts b/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts index 235f4ff9bd..74f31a4ee3 100644 --- a/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts +++ b/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts @@ -16,7 +16,7 @@ import { useAsync } from 'react-use'; -import { GitReleaseApi } from '../api/GitReleaseApiClient'; +import { GitReleaseApi } from '../api/GitReleaseClient'; import { Project } from '../contexts/ProjectContext'; interface GetGitBatchInfo { diff --git a/plugins/git-release-manager/src/plugin.ts b/plugins/git-release-manager/src/plugin.ts index de5a945de3..6b15b79a9f 100644 --- a/plugins/git-release-manager/src/plugin.ts +++ b/plugins/git-release-manager/src/plugin.ts @@ -23,7 +23,7 @@ import { } from '@backstage/core'; import { gitReleaseManagerApiRef } from './api/serviceApiRef'; -import { GitReleaseApiClient } from './api/GitReleaseApiClient'; +import { GitReleaseClient } from './api/GitReleaseClient'; import { rootRouteRef } from './routes'; export { gitReleaseManagerApiRef }; @@ -41,7 +41,7 @@ export const gitReleaseManagerPlugin = createPlugin({ githubAuthApi: githubAuthApiRef, }, factory: ({ configApi, githubAuthApi }) => { - return new GitReleaseApiClient({ + return new GitReleaseClient({ configApi, githubAuthApi, }); 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 c39f0a49b0..b824107748 100644 --- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts +++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts @@ -21,7 +21,7 @@ import { GetTagResult, GitReleaseApi, GetCommitResult, -} from '../api/GitReleaseApiClient'; +} from '../api/GitReleaseClient'; import { CalverTagParts } from '../helpers/tagParts/getCalverTagParts'; import { Project } from '../contexts/ProjectContext'; import { getReleaseCandidateGitInfo } from '../helpers/getReleaseCandidateGitInfo';