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
@@ -1,275 +0,0 @@
-/**
- * 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 { fireEvent } from "@testing-library/react";
-import type { RenderResult } from "@testing-library/react";
-import * as selectEvent from "react-select-event";
-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 storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable";
-import createKubeconfigManagerInjectable from "../../../../main/kubeconfig-manager/create-kubeconfig-manager.injectable";
-import type { ApplicationBuilder } from "../../test-utils/get-application-builder";
-import { getApplicationBuilder } from "../../test-utils/get-application-builder";
-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 type { OpenDeleteClusterDialog } from "../open.injectable";
-import openDeleteClusterDialogInjectable from "../open.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("<DeleteClusterDialog />", () => {
-  let builder: ApplicationBuilder;
-
-  beforeEach(() => {
-    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);
-    });
-  });
-
-  it("shows context switcher when deleting current cluster", async () => {
-    const config = new KubeConfig();
-
-    config.loadFromString(multiClusterConfig);
-
-    const rendered = await builder.render();
-
-    const windowDi = builder.applicationWindow.only.di;
-
-    const createCluster = windowDi.inject(createClusterInjectionToken);
-
-    const cluster = createCluster({
-      id: "some-current-context-cluster",
-      contextName: "some-current-context",
-      preferences: {
-        clusterName: "some-current-context-cluster",
-      },
-      kubeConfigPath: "./temp-kube-config",
-    }, {
-      clusterServerUrl: currentClusterServerUrl,
-    });
-
-    const openDeleteClusterDialog = windowDi.inject(openDeleteClusterDialogInjectable);
-
-    openDeleteClusterDialog({ cluster, config });
-
-    const { getByText } = rendered;
-
-    const menu = getByText("Select new context...");
-
-    expect(menu).toBeInTheDocument();
-    selectEvent.openMenu(menu);
-
-    expect(getByText("some-current-context")).toBeInTheDocument();
-    expect(getByText("some-non-current-context")).toBeInTheDocument();
-  });
-
-  describe("Kubeconfig with different clusters", () => {
-    let rendered: RenderResult;
-    let openDeleteClusterDialog: OpenDeleteClusterDialog;
-    let createCluster: CreateCluster;
-    let config: KubeConfig;
-
-    beforeEach(async () => {
-      config = new KubeConfig();
-
-      config.loadFromString(multiClusterConfig);
-
-      rendered = await builder.render();
-
-      const windowDi = builder.applicationWindow.only.di;
-
-      openDeleteClusterDialog = windowDi.inject(openDeleteClusterDialogInjectable);
-      createCluster = windowDi.inject(createClusterInjectionToken);
-    });
-
-    it("renders w/o errors", () => {
-      expect(rendered.container).toBeInstanceOf(HTMLElement);
-    });
-
-    it("shows warning when deleting non-current-context cluster", () => {
-      const cluster = createCluster({
-        id: "some-non-current-context-cluster",
-        contextName: "some-non-current-context",
-        preferences: {
-          clusterName: "minikube",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: nonCurrentClusterServerUrl,
-      });
-
-      openDeleteClusterDialog({ cluster, config });
-
-      const message = "The contents of kubeconfig file will be changed!";
-
-      expect(rendered.getByText(message)).toBeInstanceOf(HTMLElement);
-    });
-
-    it("shows warning when deleting current-context cluster", () => {
-      const cluster = createCluster({
-        id: "some-current-context-cluster",
-        contextName: "some-current-context",
-        preferences: {
-          clusterName: "some-current-context-cluster",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: currentClusterServerUrl,
-      });
-
-      openDeleteClusterDialog({ cluster, config });
-
-      expect(rendered.getByTestId("current-context-warning")).toBeInstanceOf(HTMLElement);
-    });
-
-    it("shows context switcher after checkbox click", () => {
-      const cluster = createCluster({
-        id: "some-current-context-cluster",
-        contextName: "some-current-context",
-        preferences: {
-          clusterName: "some-current-context-cluster",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: currentClusterServerUrl,
-      });
-
-      openDeleteClusterDialog({ cluster, config });
-
-      const { getByText, getByTestId } = rendered;
-      const link = getByTestId("context-switch");
-
-      expect(link).toBeInstanceOf(HTMLElement);
-      fireEvent.click(link);
-
-      const menu = getByText("Select new context...");
-
-      expect(menu).toBeInTheDocument();
-      selectEvent.openMenu(menu);
-
-      expect(getByText("some-current-context")).toBeInTheDocument();
-      expect(getByText("some-non-current-context")).toBeInTheDocument();
-    });
-
-    it("given cluster in internal kubeconfig, when deleting cluster outside of current context, shows warning for internal kubeconfig cluster", () => {
-      const cluster = createCluster({
-        id: "some-non-current-context-cluster",
-        contextName: "some-non-current-context",
-        preferences: {
-          clusterName: "some-non-current-context-cluster",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: nonCurrentClusterServerUrl,
-      });
-
-      const spy = jest.spyOn(cluster, "isInLocalKubeconfig").mockImplementation(() => true);
-
-      openDeleteClusterDialog({ cluster, config });
-
-      expect(rendered.getByTestId("internal-kubeconfig-warning")).toBeInstanceOf(HTMLElement);
-
-      spy.mockRestore();
-    });
-  });
-
-  describe("Kubeconfig with single cluster", () => {
-    let rendered: RenderResult;
-    let openDeleteClusterDialog: OpenDeleteClusterDialog;
-    let createCluster: CreateCluster;
-    let config: KubeConfig;
-
-    beforeEach(async () => {
-      config = new KubeConfig();
-
-      config.loadFromString(singleClusterConfig);
-
-      rendered = await builder.render();
-
-      const windowDi = builder.applicationWindow.only.di;
-
-      openDeleteClusterDialog = windowDi.inject(openDeleteClusterDialogInjectable);
-      createCluster = windowDi.inject(createClusterInjectionToken);
-    });
-
-    it("shows warning if no other contexts left", () => {
-      const cluster = createCluster({
-        id: "some-cluster",
-        contextName: "some-context",
-        preferences: {
-          clusterName: "some-cluster",
-        },
-        kubeConfigPath: "./temp-kube-config",
-      }, {
-        clusterServerUrl: singleClusterServerUrl,
-      });
-
-      openDeleteClusterDialog({ cluster, config });
-
-      expect(rendered.getByTestId("no-more-contexts-warning")).toBeInstanceOf(HTMLElement);
-    });
-  });
-});
@@ -17,8 +17,6 @@ const deleteClusterDialogClusterFrameChildComponentInjectable = getInjectable({
  }),

  injectionToken: clusterFrameChildComponentInjectionToken,
-
-  causesSideEffects: true,
 });

 export default deleteClusterDialogClusterFrameChildComponentInjectable;
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { KubeConfig } from "@kubernetes/client-node";
-import { dumpYaml } from "@kubernetes/client-node";
-import fs from "fs";
-import * as lockFile from "proper-lockfile";
-
-export async function saveKubeconfig(config: KubeConfig, path: string) {
-  try {
-    const release = await lockFile.lock(path);
-    const contents = dumpYaml(JSON.parse(config.exportConfig()));
-
-    await fs.promises.writeFile(path, contents);
-    await release();
-  } catch (e) {
-    throw new Error(`Failed to acquire lock file.\n${e}`);
-  }
-}
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getGlobalOverride } from "../../../common/test-utils/get-global-override";
+import saveKubeconfigInjectable from "./save-kubeconfig.injectable";
+
+export default getGlobalOverride(saveKubeconfigInjectable, () => async () => {
+  throw new Error("tried to save a mondified kubeconfig without override");
+});
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { KubeConfig } from "@kubernetes/client-node";
+import { dumpYaml } from "@kubernetes/client-node";
+import * as lockFile from "proper-lockfile";
+import { getInjectable } from "@ogre-tools/injectable";
+import writeFileInjectable from "../../../common/fs/write-file.injectable";
+
+export type SaveKubeconfig = (config: KubeConfig, path: string) => Promise<void>;
+
+const saveKubeconfigInjectable = getInjectable({
+  id: "save-kubeconfig",
+  instantiate: (di): SaveKubeconfig => {
+    const writeFile = di.inject(writeFileInjectable);
+
+    return async (config, filePath) => {
+      const release = await lockFile.lock(filePath);
+
+      try {
+        const contents = dumpYaml(JSON.parse(config.exportConfig()));
+
+        await writeFile(filePath, contents);
+      } finally {
+        await release();
+      }
+    };
+  },
+  causesSideEffects: true,
+});
+
+export default saveKubeconfigInjectable;
+
@@ -10,22 +10,34 @@ import { observer } from "mobx-react";
 import React from "react";

 import { Button } from "../button";
-import { saveKubeconfig } from "./save-config";
-import { Notifications } from "../notifications";
+import type { ShowNotification } from "../notifications";
 import { Dialog } from "../dialog";
 import { Icon } from "../icon";
 import { Select } from "../select";
 import { Checkbox } from "../checkbox";
-import { requestClearClusterAsDeleting, requestDeleteCluster, requestSetClusterAsDeleting } from "../../ipc";
 import type { HotbarStore } from "../../../common/hotbars/store";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import hotbarStoreInjectable from "../../../common/hotbars/store.injectable";
 import type { DeleteClusterDialogState } from "./state.injectable";
 import deleteClusterDialogStateInjectable from "./state.injectable";
+import type { RequestSetClusterAsDeleting } from "../../../features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable";
+import requestSetClusterAsDeletingInjectable from "../../../features/cluster/delete-dialog/renderer/request-set-as-deleting.injectable";
+import type { RequestClearClusterAsDeleting } from "../../../features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable";
+import requestClearClusterAsDeletingInjectable from "../../../features/cluster/delete-dialog/renderer/request-clear-as-deleting.injectable";
+import type { RequestDeleteCluster } from "../../../features/cluster/delete-dialog/renderer/request-delete.injectable";
+import requestDeleteClusterInjectable from "../../../features/cluster/delete-dialog/renderer/request-delete.injectable";
+import type { SaveKubeconfig } from "./save-kubeconfig.injectable";
+import saveKubeconfigInjectable from "./save-kubeconfig.injectable";
+import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";

-export interface Dependencies {
+interface Dependencies {
  state: IObservableValue<DeleteClusterDialogState | undefined>;
  hotbarStore: HotbarStore;
+  requestSetClusterAsDeleting: RequestSetClusterAsDeleting;
+  requestDeleteCluster: RequestDeleteCluster;
+  requestClearClusterAsDeleting: RequestClearClusterAsDeleting;
+  showErrorNotification: ShowNotification;
+  saveKubeconfig: SaveKubeconfig;
 }

@observer
@@ -61,18 +73,18 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
  async onDelete(state: DeleteClusterDialogState) {
    const { cluster, config } = state;

-    await requestSetClusterAsDeleting(cluster.id);
+    await this.props.requestSetClusterAsDeleting(cluster.id);
    this.removeContext(state);
    this.changeCurrentContext(state);

    try {
-      await saveKubeconfig(config, cluster.kubeConfigPath);
+      await this.props.saveKubeconfig(config, cluster.kubeConfigPath);
      this.props.hotbarStore.removeAllHotbarItems(cluster.id);
-      await requestDeleteCluster(cluster.id);
+      await this.props.requestDeleteCluster(cluster.id);
    } catch(error) {
-      Notifications.error(`Cannot remove cluster, failed to process config file. ${error}`);
+      this.props.showErrorNotification(`Cannot remove cluster, failed to process config file. ${error}`);
    } finally {
-      await requestClearClusterAsDeleting(cluster.id);
+      await this.props.requestClearClusterAsDeleting(cluster.id);
    }

    this.onClose();
@@ -155,6 +167,14 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
  }

  getWarningMessage({ cluster, config }: DeleteClusterDialogState) {
+    if (cluster.isInLocalKubeconfig()) {
+      return (
+        <p data-testid="internal-kubeconfig-warning">
+          Are you sure you want to delete it? It can be re-added through the copy/paste mechanism.
+        </p>
+      );
+    }
+
    const contexts = config.contexts.filter(context => context.name !== cluster.contextName);

    if (!contexts.length) {
@@ -173,14 +193,6 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
      );
    }

-    if (cluster.isInLocalKubeconfig()) {
-      return (
-        <p data-testid="internal-kubeconfig-warning">
-          Are you sure you want to delete it? It can be re-added through the copy/paste mechanism.
-        </p>
-      );
-    }
-
    return (
      <p data-testid="kubeconfig-change-warning">The contents of kubeconfig file will be changed!</p>
    );
@@ -209,7 +221,7 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
              <hr className={styles.hr} />
              <div className="mt-4">
                <Checkbox
-                  data-testid="context-switch"
+                  data-testid="delete-cluster-dialog-context-switch"
                  label={(
                    <>
                      <span className="font-semibold">Select current-context</span>
@@ -255,6 +267,7 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
        close={this.close}
        onClose={this.onClose}
        onOpen={state && (() => this.onOpen(state))}
+        data-testid={state ? "delete-cluster-dialog" : undefined}
      >
        {state && this.renderContents(state)}
      </Dialog>
@@ -266,5 +279,10 @@ export const DeleteClusterDialog = withInjectables<Dependencies>(NonInjectedDele
  getProps: (di) => ({
    hotbarStore: di.inject(hotbarStoreInjectable),
    state: di.inject(deleteClusterDialogStateInjectable),
+    requestSetClusterAsDeleting: di.inject(requestSetClusterAsDeletingInjectable),
+    requestClearClusterAsDeleting: di.inject(requestClearClusterAsDeletingInjectable),
+    requestDeleteCluster: di.inject(requestDeleteClusterInjectable),
+    saveKubeconfig: di.inject(saveKubeconfigInjectable),
+    showErrorNotification: di.inject(showErrorNotificationInjectable),
  }),
 });