Skip to content

Commit

Permalink
Minor file renames from AppRepo to PkgRepo (#4955)
Browse files Browse the repository at this point in the history 
* Minor renames

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

* Rename files from AppRepo to PkgRepo

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>
  • Loading branch information
@antgamdia
antgamdia committed Jun 29, 2022
1 parent a8d94a8 commit 07559d4
Show file tree
Hide file tree
Showing 27 changed files with 259 additions and 204 deletions.
14 changes: 7 additions & 7 deletions dashboard/src/actions/repos.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ describe("installRepo", () => {
authHeader: "Bearer: abc",
});

it("calls AppRepository create including a auth struct (authHeader)", async () => {
it("calls PackageRepositoriesService create including a auth struct (authHeader)", async () => {
await store.dispatch(installRepoCMDAuth);
expect(PackageRepositoriesService.addPackageRepository).toHaveBeenCalledWith(
"default",
Expand All @@ -416,7 +416,7 @@ describe("installRepo", () => {
);
});

it("calls AppRepository create including ociRepositories", async () => {
it("calls PackageRepositoriesService create including ociRepositories", async () => {
await store.dispatch(
repoActions.installRepo("my-namespace", {
...pkgRepoFormData,
Expand All @@ -442,7 +442,7 @@ describe("installRepo", () => {
);
});

it("calls AppRepository create skipping TLS verification", async () => {
it("calls PackageRepositoriesService create skipping TLS verification", async () => {
await store.dispatch(
repoActions.installRepo("my-namespace", { ...pkgRepoFormData, skipTLS: true }),
);
Expand All @@ -469,7 +469,7 @@ describe("installRepo", () => {
customCA: "This is a cert!",
});

it("calls AppRepository create including a auth struct (custom CA)", async () => {
it("calls PackageRepositoriesService create including a auth struct (custom CA)", async () => {
await store.dispatch(installRepoCMDAuth);
expect(PackageRepositoriesService.addPackageRepository).toHaveBeenCalledWith(
"default",
Expand All @@ -489,7 +489,7 @@ describe("installRepo", () => {
});

context("when authHeader and customCA are empty", () => {
it("calls AppRepository create without a auth struct", async () => {
it("calls PackageRepositoriesService create without a auth struct", async () => {
await store.dispatch(installRepoCMD);
expect(PackageRepositoriesService.addPackageRepository).toHaveBeenCalledWith(
"default",
Expand Down Expand Up @@ -567,7 +567,7 @@ describe("installRepo", () => {
);
});

it("calls AppRepository create with description", async () => {
it("calls PackageRepositoriesService create with description", async () => {
await store.dispatch(
repoActions.installRepo("my-namespace", {
...pkgRepoFormData,
Expand Down Expand Up @@ -633,7 +633,7 @@ describe("updateRepo", () => {
const r = {
...packageRepositoryDetail,
tlsConfig: {
secretRef: { name: "apprepo-repo-abc", key: "data" },
secretRef: { name: "pkgrepo-repo-abc", key: "data" },
certAuthority: "",
insecureSkipVerify: false,
},
Expand Down
93 changes: 61 additions & 32 deletions dashboard/src/actions/repos.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const allActions = [
];
export type PkgReposAction = ActionType<typeof allActions[number]>;

// fetchRepos fetches the AppRepositories in a specified namespace.
// fetchRepos fetches the PackageRepositories in a specified namespace.
export const fetchRepos = (
namespace: string,
listGlobal?: boolean,
Expand Down Expand Up @@ -124,19 +124,20 @@ export const fetchRepo = (
try {
dispatch(requestRepo());
// Check if we have enough data to retrieve the package manually (instead of using its own availablePackageRef)
const appRepository = await PackageRepositoriesService.getPackageRepositoryDetail(
packageRepoRef,
);
if (!appRepository?.detail) {
const getPackageRepositoryDetailResponse =
await PackageRepositoriesService.getPackageRepositoryDetail(packageRepoRef);
if (!getPackageRepositoryDetailResponse?.detail) {
dispatch(
errorRepos(
new Error(`Can't get the repository: ${JSON.stringify(appRepository)}`),
new Error(
`Can't get the repository: ${JSON.stringify(getPackageRepositoryDetailResponse)}`,
),
"fetch",
),
);
return false;
}
dispatch(receiveRepo(appRepository.detail));
dispatch(receiveRepo(getPackageRepositoryDetailResponse.detail));
return true;
} catch (e: any) {
dispatch(errorRepos(e, "fetch"));
Expand All @@ -163,27 +164,40 @@ export const installRepo = (
namespaceScoped = false;
}

const data = await PackageRepositoriesService.addPackageRepository(
const addPackageRepositoryResponse = await PackageRepositoriesService.addPackageRepository(
currentCluster,
namespace,
request,
namespaceScoped,
);
// Ensure the repo have been created
if (!data?.packageRepoRef) {
if (!addPackageRepositoryResponse?.packageRepoRef) {
dispatch(
errorRepos(new Error(`Can't create the repository: ${JSON.stringify(data)}`), "create"),
errorRepos(
new Error(
`Can't create the repository: ${JSON.stringify(addPackageRepositoryResponse)}`,
),
"create",
),
);
return false;
}
const repo = await PackageRepositoriesService.getPackageRepositoryDetail(data.packageRepoRef);
if (!repo?.detail) {
const getPackageRepositoryDetailResponse =
await PackageRepositoriesService.getPackageRepositoryDetail(
addPackageRepositoryResponse.packageRepoRef,
);
if (!getPackageRepositoryDetailResponse?.detail) {
dispatch(
errorRepos(new Error(`The repo wasn't created: ${JSON.stringify(repo)}`), "create"),
errorRepos(
new Error(
`The repo wasn't created: ${JSON.stringify(getPackageRepositoryDetailResponse)}`,
),
"create",
),
);
return false;
}
dispatch(addedRepo(repo.detail));
dispatch(addedRepo(getPackageRepositoryDetailResponse.detail));
return true;
} catch (e: any) {
dispatch(errorRepos(e, "create"));
Expand All @@ -202,27 +216,41 @@ export const updateRepo = (
} = getState();
try {
dispatch(requestRepoUpdate());
const data = await PackageRepositoriesService.updatePackageRepository(
currentCluster,
namespace,
request,
);
const updatePackageRepositoryResponse =
await PackageRepositoriesService.updatePackageRepository(
currentCluster,
namespace,
request,
);

// Ensure the repo have been updated
if (!data?.packageRepoRef) {
if (!updatePackageRepositoryResponse?.packageRepoRef) {
dispatch(
errorRepos(new Error(`Can't update the repository: ${JSON.stringify(data)}`), "update"),
errorRepos(
new Error(
`Can't update the repository: ${JSON.stringify(updatePackageRepositoryResponse)}`,
),
"update",
),
);
return false;
}
const repo = await PackageRepositoriesService.getPackageRepositoryDetail(data.packageRepoRef);
if (!repo?.detail) {
const getPackageRepositoryDetailResponse =
await PackageRepositoriesService.getPackageRepositoryDetail(
updatePackageRepositoryResponse.packageRepoRef,
);
if (!getPackageRepositoryDetailResponse?.detail) {
dispatch(
errorRepos(new Error(`The repo wasn't updated: ${JSON.stringify(repo)}`), "update"),
errorRepos(
new Error(
`The repo wasn't updated: ${JSON.stringify(getPackageRepositoryDetailResponse)}`,
),
"update",
),
);
return false;
}
dispatch(repoUpdated(repo.detail));
dispatch(repoUpdated(getPackageRepositoryDetailResponse.detail));
return true;
} catch (e: any) {
dispatch(errorRepos(e, "update"));
Expand Down Expand Up @@ -255,18 +283,19 @@ export const findPackageInRepo = (
dispatch(requestRepo());
// Check if we have enough data to retrieve the package manually (instead of using its own availablePackageRef)
if (app?.availablePackageRef?.identifier && app?.availablePackageRef?.plugin) {
const appRepository = await PackageRepositoriesService.getPackageRepositoryDetail({
identifier: repoName,
context: { cluster, namespace: repoNamespace },
plugin: app.availablePackageRef.plugin,
});
const getPackageRepositoryDetailResponse =
await PackageRepositoriesService.getPackageRepositoryDetail({
identifier: repoName,
context: { cluster, namespace: repoNamespace },
plugin: app.availablePackageRef.plugin,
});
try {
await PackagesService.getAvailablePackageVersions({
context: { cluster: cluster, namespace: repoNamespace },
plugin: app.availablePackageRef.plugin,
identifier: app.availablePackageRef.identifier,
} as AvailablePackageReference);
if (!appRepository?.detail) {
if (!getPackageRepositoryDetailResponse?.detail) {
dispatch(
createErrorPackage(
new NotFoundError(
Expand All @@ -276,7 +305,7 @@ export const findPackageInRepo = (
);
return false;
}
dispatch(receiveRepo(appRepository.detail));
dispatch(receiveRepo(getPackageRepositoryDetailResponse.detail));
return true;
} catch (e: any) {
dispatch(
Expand Down
12 changes: 6 additions & 6 deletions dashboard/src/components/AppUpgrade/AppUpgrade.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { Plugin } from "gen/kubeappsapis/core/plugins/v1alpha1/plugins";
import * as ReactRedux from "react-redux";
import * as ReactRouter from "react-router";
import { MemoryRouter, Route } from "react-router-dom";
import { IAppRepositoryState } from "reducers/repos";
import { IPackageRepositoryState } from "reducers/repos";
import { defaultStore, getStore, mountWrapper } from "shared/specs/mountWrapper";
import {
CustomInstalledPackageDetail,
Expand Down Expand Up @@ -134,7 +134,7 @@ it("renders the repo selection form if not introduced when the app is loaded", (
const state = {
repos: {
repos: [repo1],
} as IAppRepositoryState,
} as IPackageRepositoryState,
apps: {
selected: { name: "foo" },
isFetching: false,
Expand Down Expand Up @@ -187,7 +187,7 @@ describe("when an error exists", () => {
const state = {
repos: {
repos: [] as PackageRepositorySummary[],
} as IAppRepositoryState,
} as IPackageRepositoryState,
apps: {
selected: { name: "foo" },
isFetching: false,
Expand Down Expand Up @@ -254,7 +254,7 @@ it("renders the upgrade form when the repo is available, clears state and fetche
repo: repo1,
repos: [repo1],
isFetching: false,
} as IAppRepositoryState,
} as IPackageRepositoryState,
packages: { selected: selectedPackage } as IPackageState,
};
const wrapper = mountWrapper(
Expand Down Expand Up @@ -290,7 +290,7 @@ it("renders the upgrade form with the version property", () => {
repo: repo1,
repos: [repo1],
isFetching: false,
} as IAppRepositoryState,
} as IPackageRepositoryState,
packages: { selected: selectedPackage } as IPackageState,
};
const wrapper = mountWrapper(
Expand Down Expand Up @@ -318,7 +318,7 @@ it("skips the repo selection form if the app contains upgrade info", () => {
repo: repo1,
repos: [repo1],
isFetching: false,
} as IAppRepositoryState,
} as IPackageRepositoryState,
packages: { selected: selectedPackage } as IPackageState,
};
const wrapper = mountWrapper(
Expand Down
Loading

0 comments on commit 07559d4

Please sign in to comment.