1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Make deleteHelmRelease injectable

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-12-22 12:57:54 -05:00
parent c69eb16248
commit 468ca34495
5 changed files with 51 additions and 31 deletions

View File

@ -57,7 +57,6 @@ import normalizedPlatformArchitectureInjectable from "../common/vars/normalized-
import getHelmChartVersionsInjectable from "./helm/helm-service/get-helm-chart-versions.injectable";
import getHelmChartValuesInjectable from "./helm/helm-service/get-helm-chart-values.injectable";
import listHelmChartsInjectable from "./helm/helm-service/list-helm-charts.injectable";
import deleteHelmReleaseInjectable from "./helm/helm-service/delete-helm-release.injectable";
import getHelmReleaseHistoryInjectable from "./helm/helm-service/get-helm-release-history.injectable";
import getHelmReleaseValuesInjectable from "./helm/helm-service/get-helm-release-values.injectable";
import rollbackHelmReleaseInjectable from "./helm/helm-service/rollback-helm-release.injectable";
@ -137,7 +136,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
getHelmChartVersionsInjectable,
getHelmChartValuesInjectable,
listHelmChartsInjectable,
deleteHelmReleaseInjectable,
getHelmReleaseHistoryInjectable,
getHelmReleaseValuesInjectable,
rollbackHelmReleaseInjectable,

View File

@ -0,0 +1,37 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import execHelmInjectable from "./exec-helm/exec-helm.injectable";
export interface DeleteHelmReleaseData {
name: string;
namespace: string;
}
export type DeleteHelmRelease = (kubeconfigPath: string, data: DeleteHelmReleaseData) => Promise<string>;
const deleteHelmReleaseInjectable = getInjectable({
id: "delete-helm-release",
instantiate: (di): DeleteHelmRelease => {
const execHelm = di.inject(execHelmInjectable);
return async (kubeconfigPath, { name, namespace }) => {
const result = await execHelm([
"delete",
name,
"--namespace", namespace,
"--kubeconfig", kubeconfigPath,
]);
if (result.callWasSuccessful) {
return result.response;
}
throw result.error;
};
},
});
export default deleteHelmReleaseInjectable;

View File

@ -10,21 +10,6 @@ import execHelmInjectable from "./exec-helm/exec-helm.injectable";
const execHelm = asLegacyGlobalFunctionForExtensionApi(execHelmInjectable);
export async function deleteRelease(name: string, namespace: string, kubeconfigPath: string): Promise<string> {
const result = await execHelm([
"delete",
name,
"--namespace", namespace,
"--kubeconfig", kubeconfigPath,
]);
if (result.callWasSuccessful) {
return result.response;
}
throw result.error;
}
interface GetValuesOptions {
namespace: string;
all?: boolean;

View File

@ -4,25 +4,25 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import type { Cluster } from "../../../common/cluster/cluster";
import { deleteRelease } from "../helm-release-manager";
import loggerInjectable from "../../../common/logger.injectable";
import type { DeleteHelmReleaseData } from "../delete-helm-release.injectable";
import deleteHelmReleaseInjectable from "../delete-helm-release.injectable";
const deleteHelmReleaseInjectable = getInjectable({
id: "delete-helm-release",
const deleteClusterHelmReleaseInjectable = getInjectable({
id: "delete-cluster-helm-release",
instantiate: (di) => {
const logger = di.inject(loggerInjectable);
const deleteHelmRelease = di.inject(deleteHelmReleaseInjectable);
return async (cluster: Cluster, releaseName: string, namespace: string) => {
return async (cluster: Cluster, data: DeleteHelmReleaseData) => {
const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
logger.debug("Delete release");
logger.debug(`[CLUSTER]: Delete helm release`, data);
return deleteRelease(releaseName, namespace, proxyKubeconfig);
return deleteHelmRelease(proxyKubeconfig, data);
};
},
causesSideEffects: true,
});
export default deleteHelmReleaseInjectable;
export default deleteClusterHelmReleaseInjectable;

View File

@ -5,19 +5,19 @@
import { apiPrefix } from "../../../../common/vars";
import { getRouteInjectable } from "../../../router/router.injectable";
import { clusterRoute } from "../../../router/route";
import deleteHelmReleaseInjectable from "../../../helm/helm-service/delete-helm-release.injectable";
import deleteClusterHelmReleaseInjectable from "../../../helm/helm-service/delete-helm-release.injectable";
const deleteReleaseRouteInjectable = getRouteInjectable({
id: "delete-release-route",
instantiate: (di) => {
const deleteHelmRelease = di.inject(deleteHelmReleaseInjectable);
const deleteHelmRelease = di.inject(deleteClusterHelmReleaseInjectable);
return clusterRoute({
method: "delete",
path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
})(async ({ cluster, params: { release, namespace }}) => ({
response: await deleteHelmRelease(cluster, release, namespace),
path: `${apiPrefix}/v2/releases/{namespace}/{name}`,
})(async ({ cluster, params }) => ({
response: await deleteHelmRelease(cluster, params),
}));
},
});