diff --git a/src/common/k8s-api/__tests__/kube-api.test.ts b/src/common/k8s-api/__tests__/kube-api.test.ts index 7bce8a3b7c..00f53c7555 100644 --- a/src/common/k8s-api/__tests__/kube-api.test.ts +++ b/src/common/k8s-api/__tests__/kube-api.test.ts @@ -32,6 +32,7 @@ import type { DiContainer } from "@ogre-tools/injectable"; import deploymentApiInjectable from "../endpoints/deployment.api.injectable"; import podApiInjectable from "../endpoints/pod.api.injectable"; import namespaceApiInjectable from "../endpoints/namespace.api.injectable"; +import lensProxyCertificateInjectable from "../../certificate/lens-proxy-certificate.injectable"; // NOTE: this is fine because we are testing something that only exported // eslint-disable-next-line no-restricted-imports @@ -48,6 +49,12 @@ describe("createKubeApiForRemoteCluster", () => { di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); di.override(storesAndApisCanBeCreatedInjectable, () => true); + di.inject(lensProxyCertificateInjectable).set({ + public: "", + private: "", + cert: "", + }); + const createCluster = di.inject(createClusterInjectable); di.override(hostedClusterInjectable, () => createCluster({ diff --git a/src/main/__test__/cluster.test.ts b/src/main/__test__/cluster.test.ts index 1d114abdf8..a05ae543ab 100644 --- a/src/main/__test__/cluster.test.ts +++ b/src/main/__test__/cluster.test.ts @@ -23,6 +23,7 @@ import pathExistsSyncInjectable from "../../common/fs/path-exists-sync.injectabl import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import readJsonSyncInjectable from "../../common/fs/read-json-sync.injectable"; import writeJsonSyncInjectable from "../../common/fs/write-json-sync.injectable"; +import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable"; describe("create clusters", () => { let cluster: Cluster; @@ -59,6 +60,12 @@ describe("create clusters", () => { di.override(readJsonSyncInjectable, () => () => { throw new Error("tried call readJsonSync without override"); }); di.override(writeJsonSyncInjectable, () => () => { throw new Error("tried call writeJsonSync without override"); }); + di.inject(lensProxyCertificateInjectable).set({ + public: "", + private: "", + cert: "", + }); + createCluster = di.inject(createClusterInjectionToken); jest.spyOn(Kubectl.prototype, "ensureKubectl").mockReturnValue(Promise.resolve(true)); diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts index c37a7f254d..9e62eb6e5c 100644 --- a/src/main/__test__/kube-auth-proxy.test.ts +++ b/src/main/__test__/kube-auth-proxy.test.ts @@ -24,9 +24,10 @@ import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable"; import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable"; import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable"; import writeJsonSyncInjectable from "../../common/fs/write-json-sync.injectable"; -import ensureDirInjectable from "../../common/fs/ensure-dir.injectable"; +import ensureDirectoryInjectable from "../../common/fs/ensure-directory.injectable"; import type { GetBasenameOfPath } from "../../common/path/get-basename.injectable"; import getBasenameOfPathInjectable from "../../common/path/get-basename.injectable"; +import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable"; const clusterServerUrl = "https://192.168.64.3:8443"; @@ -45,7 +46,7 @@ describe("kube auth proxy tests", () => { di.override(directoryForTempInjectable, () => "/some-directory-for-temp"); const writeJsonSync = di.inject(writeJsonSyncInjectable); - const ensureDir = di.inject(ensureDirInjectable); + const ensureDirectory = di.inject(ensureDirectoryInjectable); getBasenameOfPath = di.inject(getBasenameOfPathInjectable); @@ -71,7 +72,13 @@ describe("kube auth proxy tests", () => { kind: "Config", preferences: {}, }); - await ensureDir("/tmp"); + await ensureDirectory("/tmp"); + + di.inject(lensProxyCertificateInjectable).set({ + public: "", + private: "", + cert: "", + }); spawnMock = jest.fn(); di.override(spawnInjectable, () => spawnMock); diff --git a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts index 6f3a8e3e0b..d6a12ad65e 100644 --- a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts +++ b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts @@ -34,6 +34,7 @@ import pathExistsSyncInjectable from "../../../common/fs/path-exists-sync.inject import pathExistsInjectable from "../../../common/fs/path-exists.injectable"; import readJsonSyncInjectable from "../../../common/fs/read-json-sync.injectable"; import writeJsonSyncInjectable from "../../../common/fs/write-json-sync.injectable"; +import lensProxyCertificateInjectable from "../../../common/certificate/lens-proxy-certificate.injectable"; describe("kubeconfig-sync.source tests", () => { let computeKubeconfigDiff: ComputeKubeconfigDiff; @@ -52,6 +53,12 @@ describe("kubeconfig-sync.source tests", () => { di.override(readJsonSyncInjectable, () => () => { throw new Error("tried call readJsonSync without override"); }); di.override(writeJsonSyncInjectable, () => () => { throw new Error("tried call writeJsonSync without override"); }); + di.inject(lensProxyCertificateInjectable).set({ + public: "", + private: "", + cert: "", + }); + clusters = new Map(); di.override(getClusterByIdInjectable, () => id => clusters.get(id)); diff --git a/src/renderer/components/+namespaces/namespace-select-filter.test.tsx b/src/renderer/components/+namespaces/namespace-select-filter.test.tsx index 14751c13dd..35b2ccfef8 100644 --- a/src/renderer/components/+namespaces/namespace-select-filter.test.tsx +++ b/src/renderer/components/+namespaces/namespace-select-filter.test.tsx @@ -11,6 +11,7 @@ import { fireEvent } from "@testing-library/react"; import React from "react"; import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import lensProxyCertificateInjectable from "../../../common/certificate/lens-proxy-certificate.injectable"; import type { Fetch } from "../../../common/fetch/fetch.injectable"; import fetchInjectable from "../../../common/fetch/fetch.injectable"; import { Namespace } from "../../../common/k8s-api/endpoints"; @@ -58,6 +59,12 @@ describe("", () => { fetchMock = asyncFn(); di.override(fetchInjectable, () => fetchMock); + di.inject(lensProxyCertificateInjectable).set({ + public: "", + private: "", + cert: "", + }); + const createCluster = di.inject(createClusterInjectable); di.override(hostedClusterInjectable, () => createCluster({