Making apiBase injectable (#6022)

* Making apiBase injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Convert all of Helm functions to be DI Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make PortForward's use of apiBase fully injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Convert all metric requests to be injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Replace resource applier with injectables Signed-off-by: Sebastian Malton <sebastian@malton.name> * Switch KubeJsonApi.forCluster to be injectable but do not use Signed-off-by: Sebastian Malton <sebastian@malton.name> * Convert the rest of shell sessions to be DI-ed - This is a prerequesit for using the new createKubeJsonApiForClusterInjectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Use new createKubeJsonApiForClusterInjectable for openNodeShellSession Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make KubeconfigDialog injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove jest-fetch-mock and make fetch injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests with new global override Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add new injectable for create KubeJsonApi and JsonApi instances Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix showing-details-for-helm-release behavioural tests - Remove HelmChartStore in favour of all injectables - Create a model for UpgradeChartDockTab Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix show details and updating helm releases tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix residual typing issues related to metrics Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix crash on load due to circular dependency Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix create resource tab not working Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove legacy apiBase global Signed-off-by: Sebastian Malton <sebastian@malton.name> * Introduce and use isDebuggingInjectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Introduce and use windowLocationInjectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove global legacy apiKube Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve injectable filenames compared to the injectables inside Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove modifying input in requestActivePortForwardInjectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Introduce and use get(Milli)SecondsFromUnixEpochInjectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Switch to non-reactive way of gettting possible helm release versions Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix typo Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix bug in KubeApi constructor Signed-off-by: Sebastian Malton <sebastian@malton.name> * Convert all KubeApi related tests to use asyncFn Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix unit tests after introducing new injectables that have side effects Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix bad rebase causing tests to fail Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve expects for multiple field values Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix crash will looking up api refs Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix breaking change on KubeApi.list Signed-off-by: Sebastian Malton <sebastian@malton.name> * Better fix for formatting urls Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove injectable for time since we should just use useMockTime Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add happy path behavioural tests for upgrade chart tab Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove debug message Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix showing-details-for-helm-release tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix installing-helm-chart-from-new-tab tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests relating to hosted cluster id Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots to recent changes in master Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Reupdated upgrade chart new tab test snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix flakiness in unit test when using <Animated> Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix flakiness and improve tests for DeleteClusterDialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix kubeconfig-sync tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix <Extensions> tests by removing mockFs and making everything injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix build issues Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix getElectronAppPathInjectable override not returning absolute paths - Also fixes the listing-active-helm-repos-in-prefs tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Replace all uses of getAbsolutePath with joinPaths as it is more correct and less confusing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix opening application window tests by making override properly absolute Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots relating no longer using getAbsolutePath Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix and add behavioural tests for RenderDelay Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix extension discovery tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix test flakiness because of path side effects, propagate uses to as many places Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix extension-discovery tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add global override to fix some tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Rewrite and fix implementation of KubeconfigManager and its tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests by global override pathExists Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix unit tests failing on windows by using injectable verions of path functions Signed-off-by: Sebastian Malton <sebastian@malton.name> * Attempt to fix test timeout by using runInAction Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots after rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots after rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests after rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix setupIpcMainHandlers usage Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> Signed-off-by: Sebastian Malton <sebastian@malton.name> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> Co-authored-by: Iku-turso <mikko.aspiala@gmail.com>
2025-05-20 05:10:56 +00:00 · 2022-10-05 08:10:36 -04:00
1 parent ed073d6562
commit 76066c5ebf
@@ -0,0 +1,20 @@
+/**
+ * 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 type { ClusterId } from "../../../../common/cluster-types";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-injection-token";
+import { requestChannelInjectionToken } from "../../../../common/utils/channel/request-channel-injection-token";
+
+export type ClearClusterAsDeletingChannel = RequestChannel<ClusterId, void>;
+
+const clearClusterAsDeletingChannelInjectable = getInjectable({
+  id: "clear-cluster-as-deleting-channel",
+  instantiate: (): ClearClusterAsDeletingChannel => ({
+    id: "clear-cluster-as-deleting",
+  }),
+  injectionToken: requestChannelInjectionToken,
+});
+
+export default clearClusterAsDeletingChannelInjectable;
@@ -0,0 +1,20 @@
+/**
+ * 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 type { ClusterId } from "../../../../common/cluster-types";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-injection-token";
+import { requestChannelInjectionToken } from "../../../../common/utils/channel/request-channel-injection-token";
+
+export type DeleteClusterChannel = RequestChannel<ClusterId, void>;
+
+const deleteClusterChannelInjectable = getInjectable({
+  id: "delete-cluster-channel",
+  instantiate: (): DeleteClusterChannel => ({
+    id: "delete-cluster",
+  }),
+  injectionToken: requestChannelInjectionToken,
+});
+
+export default deleteClusterChannelInjectable;
@@ -0,0 +1,20 @@
+/**
+ * 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 type { ClusterId } from "../../../../common/cluster-types";
+import type { RequestChannel } from "../../../../common/utils/channel/request-channel-injection-token";
+import { requestChannelInjectionToken } from "../../../../common/utils/channel/request-channel-injection-token";
+
+export type SetClusterAsDeletingChannel = RequestChannel<ClusterId, void>;
+
+const setClusterAsDeletingChannelInjectable = getInjectable({
+  id: "set-cluster-as-deleting-channel",
+  instantiate: (): SetClusterAsDeletingChannel => ({
+    id: "set-cluster-as-deleting",
+  }),
+  injectionToken: requestChannelInjectionToken,
+});
+
+export default setClusterAsDeletingChannelInjectable;
@@ -0,0 +1,284 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import "@testing-library/jest-dom/extend-expect";
+import { KubeConfig } from "@kubernetes/client-node";
+import type { RenderResult } from "@testing-library/react";
+import type { CreateCluster } from "../../../common/cluster/create-cluster-injection-token";
+import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token";
+import createContextHandlerInjectable from "../../../main/context-handler/create-context-handler.injectable";
+import createKubeconfigManagerInjectable from "../../../main/kubeconfig-manager/create-kubeconfig-manager.injectable";
+import normalizedPlatformInjectable from "../../../common/vars/normalized-platform.injectable";
+import kubectlBinaryNameInjectable from "../../../main/kubectl/binary-name.injectable";
+import kubectlDownloadingNormalizedArchInjectable from "../../../main/kubectl/normalized-arch.injectable";
+import openDeleteClusterDialogInjectable, { type OpenDeleteClusterDialog } from "../../../renderer/components/delete-cluster-dialog/open.injectable";
+import { type ApplicationBuilder, getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
+import storesAndApisCanBeCreatedInjectable from "../../../renderer/stores-apis-can-be-created.injectable";
+import type { Cluster } from "../../../common/cluster/cluster";
+import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
+import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
+import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
+import joinPathsInjectable from "../../../common/path/join-paths.injectable";
+
+const currentClusterServerUrl = "https://localhost";
+const nonCurrentClusterServerUrl = "http://localhost";
+const multiClusterConfig = `
+apiVersion: v1
+clusters:
+- cluster:
+    server: ${currentClusterServerUrl}
+  name: some-current-context-cluster
+- cluster:
+    server: ${nonCurrentClusterServerUrl}
+  name: some-non-current-context-cluster
+contexts:
+- context:
+    cluster: some-current-context-cluster
+    user: some-user
+  name: some-current-context
+- context:
+    cluster: some-non-current-context-cluster
+    user: some-user
+  name: some-non-current-context
+current-context: some-current-context
+kind: Config
+preferences: {}
+users:
+- name: some-user
+  user:
+    token: kubeconfig-user-q4lm4:xxxyyyy
+`;
+
+const singleClusterServerUrl = "http://localhost";
+const singleClusterConfig = `
+apiVersion: v1
+clusters:
+- cluster:
+    server: ${singleClusterServerUrl}
+  name: some-cluster
+contexts:
+- context:
+    cluster: some-cluster
+    user: some-user
+  name: some-context
+current-context: some-context
+kind: Config
+preferences: {}
+users:
+- name: some-user
+  user:
+    token: kubeconfig-user-q4lm4:xxxyyyy
+`;
+
+describe("Deleting a cluster", () => {
+  let builder: ApplicationBuilder;
+  let openDeleteClusterDialog: OpenDeleteClusterDialog;
+  let createCluster: CreateCluster;
+  let rendered: RenderResult;
+  let config: KubeConfig;
+
+  beforeEach(async () => {
+    config = new KubeConfig();
+    builder = getApplicationBuilder();
+
+    builder.beforeApplicationStart((mainDi) => {
+      mainDi.override(createContextHandlerInjectable, () => () => undefined as never);
+      mainDi.override(createKubeconfigManagerInjectable, () => () => undefined as never);
+      mainDi.override(kubectlBinaryNameInjectable, () => "kubectl");
+      mainDi.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
+      mainDi.override(normalizedPlatformInjectable, () => "darwin");
+    });
+
+    builder.beforeWindowStart((windowDi) => {
+      windowDi.override(storesAndApisCanBeCreatedInjectable, () => true);
+      openDeleteClusterDialog = windowDi.inject(openDeleteClusterDialogInjectable);
+
+      // TODO: remove this line when all global uses of appEventBus are removed
+      windowDi.permitSideEffects(appEventBusInjectable);
+    });
+
+    builder.afterWindowStart(windowDi => {
+      createCluster = windowDi.inject(createClusterInjectionToken);
+
+      const navigateToCatalog = windowDi.inject(navigateToCatalogInjectable);
+
+      navigateToCatalog();
+    });
+
+    rendered = await builder.render();
+  });
+
+  describe("when the kubeconfig has multiple clusters", () => {
+    let currentCluster: Cluster;
+    let nonCurrentCluster: Cluster;
+
+    beforeEach(() => {
+      config.loadFromString(multiClusterConfig);
+
+      currentCluster = createCluster({
+        id: "some-current-context-cluster",
+        contextName: "some-current-context",
+        preferences: {
+          clusterName: "some-current-context-cluster",
+        },
+        kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: currentClusterServerUrl,
+      });
+      nonCurrentCluster = createCluster({
+        id: "some-non-current-context-cluster",
+        contextName: "some-non-current-context",
+        preferences: {
+          clusterName: "some-non-current-context-cluster",
+        },
+        kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: currentClusterServerUrl,
+      });
+    });
+
+    describe("when the dialog is opened for the current cluster", () => {
+      // TODO: replace with actual behaviour instead of technical use
+      beforeEach(async () => {
+        openDeleteClusterDialog({
+          cluster: currentCluster,
+          config,
+        });
+
+        await rendered.findByTestId("delete-cluster-dialog");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows context switcher", () => {
+        expect(rendered.queryByText("Select new context...")).toBeInTheDocument();
+      });
+
+      it("shows warning", () => {
+        expect(rendered.queryByTestId("current-context-warning")).toBeInTheDocument();
+      });
+    });
+
+    describe("when the dialog is opened for not the current cluster", () => {
+      // TODO: replace with actual behaviour instead of technical use
+      beforeEach(async () => {
+        openDeleteClusterDialog({
+          cluster: nonCurrentCluster,
+          config,
+        });
+
+        await rendered.findByTestId("delete-cluster-dialog");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows warning", () => {
+        expect(rendered.queryByTestId("kubeconfig-change-warning")).toBeInTheDocument();
+      });
+
+      it("does not show context switcher", () => {
+        expect(rendered.queryByText("Select new context...")).not.toBeInTheDocument();
+      });
+
+      describe("when context switching checkbox is clicked", () => {
+        beforeEach(() => {
+          rendered.getByTestId("delete-cluster-dialog-context-switch").click();
+        });
+
+        it("renders", () => {
+          expect(rendered.baseElement).toMatchSnapshot();
+        });
+
+        it("shows context switcher", () => {
+          expect(rendered.queryByText("Select new context...")).toBeInTheDocument();
+        });
+      });
+    });
+  });
+
+  describe("when an internal kubeconfig cluster is used", () => {
+    let currentCluster: Cluster;
+
+    beforeEach(() => {
+      config.loadFromString(singleClusterConfig);
+
+      const directoryForKubeConfigs = builder.applicationWindow.only.di.inject(directoryForKubeConfigsInjectable);
+      const joinPaths = builder.applicationWindow.only.di.inject(joinPathsInjectable);
+
+      currentCluster = createCluster({
+        id: "some-cluster",
+        contextName: "some-context",
+        preferences: {
+          clusterName: "some-cluster",
+        },
+        kubeConfigPath: joinPaths(directoryForKubeConfigs, "some-cluster.json"),
+      }, {
+        clusterServerUrl: singleClusterServerUrl,
+      });
+    });
+
+    describe("when the dialog is opened", () => {
+      // TODO: replace with actual behaviour instead of technical use
+      beforeEach(async () => {
+        openDeleteClusterDialog({
+          cluster: currentCluster,
+          config,
+        });
+
+        await rendered.findByTestId("delete-cluster-dialog");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows warning", () => {
+        expect(rendered.queryByTestId("internal-kubeconfig-warning")).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe("when the kubeconfig has only one cluster", () => {
+    let currentCluster: Cluster;
+
+    beforeEach(() => {
+      config.loadFromString(singleClusterConfig);
+
+      currentCluster = createCluster({
+        id: "some-cluster",
+        contextName: "some-context",
+        preferences: {
+          clusterName: "some-cluster",
+        },
+        kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: singleClusterServerUrl,
+      });
+    });
+
+    describe("when the dialog is opened", () => {
+      // TODO: replace with actual behaviour instead of technical use
+      beforeEach(async () => {
+        openDeleteClusterDialog({
+          cluster: currentCluster,
+          config,
+        });
+
+        await rendered.findByTestId("delete-cluster-dialog");
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("shows warning", () => {
+        expect(rendered.queryByTestId("no-more-contexts-warning")).toBeInTheDocument();
+      });
+    });
+  });
+});
@@ -0,0 +1,23 @@
+/**
+ * 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 { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import clustersThatAreBeingDeletedInjectable from "../../../../main/cluster/are-being-deleted.injectable";
+import clearClusterAsDeletingChannelInjectable from "../common/clear-as-deleting-channel.injectable";
+
+const clearClusterAsDeletingChannelHandlerInjectable = getInjectable({
+  id: "clear-cluster-as-deleting-channel-handler",
+  instantiate: (di) => {
+    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
+
+    return {
+      channel: di.inject(clearClusterAsDeletingChannelInjectable),
+      handler: (clusterId) => clustersThatAreBeingDeleted.delete(clusterId),
+    };
+  },
+  injectionToken: requestChannelListenerInjectionToken,
+});
+
+export default clearClusterAsDeletingChannelHandlerInjectable;
@@ -0,0 +1,56 @@
+/**
+ * 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 appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
+import clusterFramesInjectable from "../../../../common/cluster-frames.injectable";
+import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable";
+import directoryForLensLocalStorageInjectable from "../../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
+import deleteFileInjectable from "../../../../common/fs/delete-file.injectable";
+import joinPathsInjectable from "../../../../common/path/join-paths.injectable";
+import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import deleteClusterChannelInjectable from "../common/delete-channel.injectable";
+
+const deleteClusterChannelHandlerInjectable = getInjectable({
+  id: "delete-cluster-channel-handler",
+  instantiate: (di) => {
+    const appEventBus = di.inject(appEventBusInjectable);
+    const clusterStore = di.inject(clusterStoreInjectable);
+    const clusterFrames = di.inject(clusterFramesInjectable);
+    const joinPaths = di.inject(joinPathsInjectable);
+    const directoryForLensLocalStorage = di.inject(directoryForLensLocalStorageInjectable);
+    const deleteFile = di.inject(deleteFileInjectable);
+
+    return {
+      channel: di.inject(deleteClusterChannelInjectable),
+      handler: async (clusterId) =>{
+        appEventBus.emit({ name: "cluster", action: "remove" });
+
+        const cluster = clusterStore.getById(clusterId);
+
+        if (!cluster) {
+          return;
+        }
+
+        cluster.disconnect();
+        clusterFrames.delete(cluster.id);
+
+        // Remove from the cluster store as well, this should clear any old settings
+        clusterStore.clusters.delete(cluster.id);
+
+        try {
+          // remove the local storage file
+          const localStorageFilePath = joinPaths(directoryForLensLocalStorage, `${cluster.id}.json`);
+
+          await deleteFile(localStorageFilePath);
+        } catch {
+          // ignore error
+        }
+      },
+    };
+  },
+  injectionToken: requestChannelListenerInjectionToken,
+});
+
+export default deleteClusterChannelHandlerInjectable;
@@ -0,0 +1,23 @@
+/**
+ * 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 { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import clustersThatAreBeingDeletedInjectable from "../../../../main/cluster/are-being-deleted.injectable";
+import setClusterAsDeletingChannelInjectable from "../common/set-as-deleting-channel.injectable";
+
+const setClusterAsDeletingChannelHandlerInjectable = getInjectable({
+  id: "set-cluster-as-deleting-channel-handler",
+  instantiate: (di) => {
+    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
+
+    return {
+      channel: di.inject(setClusterAsDeletingChannelInjectable),
+      handler: (clusterId) => clustersThatAreBeingDeleted.add(clusterId),
+    };
+  },
+  injectionToken: requestChannelListenerInjectionToken,
+});
+
+export default setClusterAsDeletingChannelHandlerInjectable;
@@ -0,0 +1,22 @@
+/**
+ * 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 type { ClusterId } from "../../../../common/cluster-types";
+import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
+import clearClusterAsDeletingChannelInjectable from "../common/clear-as-deleting-channel.injectable";
+
+export type RequestClearClusterAsDeleting = (clusterId: ClusterId) => Promise<void>;
+
+const requestClearClusterAsDeletingInjectable = getInjectable({
+  id: "request-clear-cluster-as-deleting",
+  instantiate: (di): RequestClearClusterAsDeleting => {
+    const requestChannel = di.inject(requestFromChannelInjectable);
+    const clearClusterAsDeletingChannel = di.inject(clearClusterAsDeletingChannelInjectable);
+
+    return (clusterId) => requestChannel(clearClusterAsDeletingChannel, clusterId);
+  },
+});
+
+export default requestClearClusterAsDeletingInjectable;
@@ -0,0 +1,22 @@
+/**
+ * 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 type { ClusterId } from "../../../../common/cluster-types";
+import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
+import deleteClusterChannelInjectable from "../common/delete-channel.injectable";
+
+export type RequestDeleteCluster = (clusterId: ClusterId) => Promise<void>;
+
+const requestDeleteClusterInjectable = getInjectable({
+  id: "request-delete-cluster",
+  instantiate: (di): RequestDeleteCluster => {
+    const requestChannel = di.inject(requestFromChannelInjectable);
+    const deleteClusterChannel = di.inject(deleteClusterChannelInjectable);
+
+    return (clusterId) => requestChannel(deleteClusterChannel, clusterId);
+  },
+});
+
+export default requestDeleteClusterInjectable;
@@ -0,0 +1,22 @@
+/**
+ * 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 type { ClusterId } from "../../../../common/cluster-types";
+import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable";
+import setClusterAsDeletingChannelInjectable from "../common/set-as-deleting-channel.injectable";
+
+export type RequestSetClusterAsDeleting = (clusterId: ClusterId) => Promise<void>;
+
+const requestSetClusterAsDeletingInjectable = getInjectable({
+  id: "request-set-cluster-as-deleting",
+  instantiate: (di): RequestSetClusterAsDeleting => {
+    const requestChannel = di.inject(requestFromChannelInjectable);
+    const setClusterAsDeletingChannel = di.inject(setClusterAsDeletingChannelInjectable);
+
+    return (clusterId) => requestChannel(setClusterAsDeletingChannel, clusterId);
+  },
+});
+
+export default requestSetClusterAsDeletingInjectable;