From 120a5f757da530b1c2a59b89eabb47acc59ea420 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 10 Jan 2023 08:23:15 -0500 Subject: [PATCH] Fix tests by faking the version detector Signed-off-by: Sebastian Malton --- package.json | 1 + ...ath-mode.global-override-for-injectable.ts | 11 ---------- ...opy-file.global-override-for-injectable.ts | 11 ---------- .../fs/copy.global-override-for-injectable.ts | 11 ---------- ...e-stream.global-override-for-injectable.ts | 11 ---------- ...e-stream.global-override-for-injectable.ts | 11 ---------- ...irectory.global-override-for-injectable.ts | 11 ---------- .../lstat.global-override-for-injectable.ts | 11 ---------- ...irectory.global-override-for-injectable.ts | 11 ---------- ...njectable.ts => remove-path.injectable.ts} | 0 .../remove.global-override-for-injectable.ts | 11 ---------- ...ite-file.global-override-for-injectable.ts | 11 ---------- .../extension-discovery.injectable.ts | 2 +- .../extension-discovery.test.ts | 2 +- .../extension-discovery.ts | 2 +- .../delete-channel-listener.injectable.ts | 2 +- ...ion-to-kubernetes-preferences.test.ts.snap | 3 ++- .../test-utils/application-builder.tsx | 10 +++++++++ src/main/__test__/kubeconfig-manager.test.ts | 4 ++-- .../create-version-detector.injectable.ts | 3 +-- .../cluster-detectors/version-detector.ts | 11 ++++------ .../update-helm-release.injectable.ts | 2 +- .../helm/install-helm-chart.injectable.ts | 2 +- .../create-kubeconfig-manager.injectable.ts | 2 +- .../kubeconfig-manager/kubeconfig-manager.ts | 2 +- src/main/kubectl/create-kubectl.injectable.ts | 2 +- src/main/kubectl/kubectl.ts | 2 +- .../create-resource-applier.injectable.ts | 2 +- src/main/resource-applier/resource-applier.ts | 2 +- .../api/create-terminal-api.injectable.ts | 2 +- .../default-websocket-params.injectable.ts | 22 ------------------- src/renderer/api/websocket-api.ts | 2 +- .../+extensions/__tests__/extensions.test.tsx | 4 ++-- yarn.lock | 2 +- 34 files changed, 37 insertions(+), 161 deletions(-) delete mode 100644 src/common/fs/change-path-mode.global-override-for-injectable.ts delete mode 100644 src/common/fs/copy-file.global-override-for-injectable.ts delete mode 100644 src/common/fs/copy.global-override-for-injectable.ts delete mode 100644 src/common/fs/create-read-file-stream.global-override-for-injectable.ts delete mode 100644 src/common/fs/create-write-stream.global-override-for-injectable.ts delete mode 100644 src/common/fs/ensure-directory.global-override-for-injectable.ts delete mode 100644 src/common/fs/lstat.global-override-for-injectable.ts delete mode 100644 src/common/fs/read-directory.global-override-for-injectable.ts rename src/common/fs/{remove.injectable.ts => remove-path.injectable.ts} (100%) delete mode 100644 src/common/fs/remove.global-override-for-injectable.ts delete mode 100644 src/common/fs/write-file.global-override-for-injectable.ts delete mode 100644 src/renderer/api/default-websocket-params.injectable.ts diff --git a/package.json b/package.json index 89f4056fdc..35478112df 100644 --- a/package.json +++ b/package.json @@ -408,6 +408,7 @@ "jest": "^28.1.3", "jest-environment-jsdom": "^28.1.3", "jest-mock-extended": "^2.0.9", + "jest-watch-suspend": "^1.1.2", "make-plural": "^6.2.2", "memfs": "^3.4.12", "memorystream": "^0.3.1", diff --git a/src/common/fs/change-path-mode.global-override-for-injectable.ts b/src/common/fs/change-path-mode.global-override-for-injectable.ts deleted file mode 100644 index a441c2155e..0000000000 --- a/src/common/fs/change-path-mode.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import changePathModeInjectable from "./change-path-mode.injectable"; - -export default getGlobalOverride(changePathModeInjectable, () => () => { - throw new Error("tried to change path mode without override"); -}); diff --git a/src/common/fs/copy-file.global-override-for-injectable.ts b/src/common/fs/copy-file.global-override-for-injectable.ts deleted file mode 100644 index b58f736537..0000000000 --- a/src/common/fs/copy-file.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import copyFileInjectable from "./copy-file.injectable"; - -export default getGlobalOverride(copyFileInjectable, () => () => { - throw new Error("tried to copy a file without override"); -}); diff --git a/src/common/fs/copy.global-override-for-injectable.ts b/src/common/fs/copy.global-override-for-injectable.ts deleted file mode 100644 index b6d899d2c4..0000000000 --- a/src/common/fs/copy.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import copyInjectable from "./copy.injectable"; - -export default getGlobalOverride(copyInjectable, () => async () => { - throw new Error("tried to copy filepaths without override"); -}); diff --git a/src/common/fs/create-read-file-stream.global-override-for-injectable.ts b/src/common/fs/create-read-file-stream.global-override-for-injectable.ts deleted file mode 100644 index e4048476b0..0000000000 --- a/src/common/fs/create-read-file-stream.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import createReadFileStreamInjectable from "./create-read-file-stream.injectable"; - -export default getGlobalOverride(createReadFileStreamInjectable, () => () => { - throw new Error("tried to create read stream for a file without override"); -}); diff --git a/src/common/fs/create-write-stream.global-override-for-injectable.ts b/src/common/fs/create-write-stream.global-override-for-injectable.ts deleted file mode 100644 index 242bceaa38..0000000000 --- a/src/common/fs/create-write-stream.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import createWriteFileStreamInjectable from "./create-write-file-stream.injectable"; - -export default getGlobalOverride(createWriteFileStreamInjectable, () => () => { - throw new Error("tried to create a file write stream without override"); -}); diff --git a/src/common/fs/ensure-directory.global-override-for-injectable.ts b/src/common/fs/ensure-directory.global-override-for-injectable.ts deleted file mode 100644 index b5a9f73112..0000000000 --- a/src/common/fs/ensure-directory.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import ensureDirectoryInjectable from "./ensure-directory.injectable"; - -export default getGlobalOverride(ensureDirectoryInjectable, () => async () => { - throw new Error("tried to ensure directory without override"); -}); diff --git a/src/common/fs/lstat.global-override-for-injectable.ts b/src/common/fs/lstat.global-override-for-injectable.ts deleted file mode 100644 index 9c9f3d4933..0000000000 --- a/src/common/fs/lstat.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import lstatInjectable from "./lstat.injectable"; - -export default getGlobalOverride(lstatInjectable, () => async () => { - throw new Error("tried to lstat a filepath without override"); -}); diff --git a/src/common/fs/read-directory.global-override-for-injectable.ts b/src/common/fs/read-directory.global-override-for-injectable.ts deleted file mode 100644 index 57c83ceffb..0000000000 --- a/src/common/fs/read-directory.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import readDirectoryInjectable from "./read-directory.injectable"; - -export default getGlobalOverride(readDirectoryInjectable, () => async () => { - throw new Error("tried to read a directory's content without override"); -}); diff --git a/src/common/fs/remove.injectable.ts b/src/common/fs/remove-path.injectable.ts similarity index 100% rename from src/common/fs/remove.injectable.ts rename to src/common/fs/remove-path.injectable.ts diff --git a/src/common/fs/remove.global-override-for-injectable.ts b/src/common/fs/remove.global-override-for-injectable.ts deleted file mode 100644 index 4b92353344..0000000000 --- a/src/common/fs/remove.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import removePathInjectable from "./remove.injectable"; - -export default getGlobalOverride(removePathInjectable, () => async () => { - throw new Error("tried to remove path without override"); -}); diff --git a/src/common/fs/write-file.global-override-for-injectable.ts b/src/common/fs/write-file.global-override-for-injectable.ts deleted file mode 100644 index c8b7ef8e45..0000000000 --- a/src/common/fs/write-file.global-override-for-injectable.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { getGlobalOverride } from "../test-utils/get-global-override"; -import writeFileInjectable from "./write-file.injectable"; - -export default getGlobalOverride(writeFileInjectable, () => async () => { - throw new Error("tried to write file without override"); -}); diff --git a/src/extensions/extension-discovery/extension-discovery.injectable.ts b/src/extensions/extension-discovery/extension-discovery.injectable.ts index d5ef981c64..bde013fabd 100644 --- a/src/extensions/extension-discovery/extension-discovery.injectable.ts +++ b/src/extensions/extension-discovery/extension-discovery.injectable.ts @@ -25,7 +25,7 @@ import getBasenameOfPathInjectable from "../../common/path/get-basename.injectab import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable"; import getRelativePathInjectable from "../../common/path/get-relative-path.injectable"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; -import removePathInjectable from "../../common/fs/remove.injectable"; +import removePathInjectable from "../../common/fs/remove-path.injectable"; import homeDirectoryPathInjectable from "../../common/os/home-directory-path.injectable"; import lensResourcesDirInjectable from "../../common/vars/lens-resources-dir.injectable"; diff --git a/src/extensions/extension-discovery/extension-discovery.test.ts b/src/extensions/extension-discovery/extension-discovery.test.ts index d71f8c5292..e7c7f19a03 100644 --- a/src/extensions/extension-discovery/extension-discovery.test.ts +++ b/src/extensions/extension-discovery/extension-discovery.test.ts @@ -15,7 +15,7 @@ import readJsonFileInjectable from "../../common/fs/read-json-file.injectable"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import watchInjectable from "../../common/fs/watch/watch.injectable"; import extensionApiVersionInjectable from "../../common/vars/extension-api-version.injectable"; -import removePathInjectable from "../../common/fs/remove.injectable"; +import removePathInjectable from "../../common/fs/remove-path.injectable"; import type { JoinPaths } from "../../common/path/join-paths.injectable"; import joinPathsInjectable from "../../common/path/join-paths.injectable"; import homeDirectoryPathInjectable from "../../common/os/home-directory-path.injectable"; diff --git a/src/extensions/extension-discovery/extension-discovery.ts b/src/extensions/extension-discovery/extension-discovery.ts index efac752073..4b554df199 100644 --- a/src/extensions/extension-discovery/extension-discovery.ts +++ b/src/extensions/extension-discovery/extension-discovery.ts @@ -28,7 +28,7 @@ import type { JoinPaths } from "../../common/path/join-paths.injectable"; import type { GetBasenameOfPath } from "../../common/path/get-basename.injectable"; import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable"; import type { GetRelativePath } from "../../common/path/get-relative-path.injectable"; -import type { RemovePath } from "../../common/fs/remove.injectable"; +import type { RemovePath } from "../../common/fs/remove-path.injectable"; import type TypedEventEmitter from "typed-emitter"; interface Dependencies { diff --git a/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts b/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts index b2ac54d5e4..a3bbc02cb3 100644 --- a/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts +++ b/src/features/cluster/delete-dialog/main/delete-channel-listener.injectable.ts @@ -6,7 +6,7 @@ import emitAppEventInjectable from "../../../../common/app-event-bus/emit-event. 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 removePathInjectable from "../../../../common/fs/remove.injectable"; +import removePathInjectable from "../../../../common/fs/remove-path.injectable"; import joinPathsInjectable from "../../../../common/path/join-paths.injectable"; import { noop } from "../../../../common/utils"; import { getRequestChannelListenerInjectable } from "../../../../main/utils/channel/channel-listeners/listener-tokens"; diff --git a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap index ca2cdcef02..93caae4832 100644 --- a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap +++ b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap @@ -790,8 +790,9 @@ exports[`preferences - navigation to kubernetes preferences given in preferences class="preventedDragging" > void | Promise; @@ -368,6 +371,13 @@ export const setupInitializingApplicationBuilder = (init: (builder: ApplicationB .map(([apiName, data]) => ({ apiName, ...data })) )); mainDi.override(requestNamespaceListPermissionsForInjectable, () => () => async () => (resource) => allowedResourcesState.has(formatKubeApiResource(resource))); + mainDi.override(createVersionDetectorInjectable, () => () => ({ + detect: async () => ({ + accuracy: 100, + value: "1.25", + }), + key: ClusterMetadataKey.VERSION, + } as VersionDetector)); runInAction(() => { mainDi.register(getInjectable({ diff --git a/src/main/__test__/kubeconfig-manager.test.ts b/src/main/__test__/kubeconfig-manager.test.ts index 9e29bef5a4..035ec3374d 100644 --- a/src/main/__test__/kubeconfig-manager.test.ts +++ b/src/main/__test__/kubeconfig-manager.test.ts @@ -25,8 +25,8 @@ import type { WriteFile } from "../../common/fs/write-file.injectable"; import writeFileInjectable from "../../common/fs/write-file.injectable"; import type { PathExists } from "../../common/fs/path-exists.injectable"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; -import type { RemovePath } from "../../common/fs/remove.injectable"; -import removePathInjectable from "../../common/fs/remove.injectable"; +import type { RemovePath } from "../../common/fs/remove-path.injectable"; +import removePathInjectable from "../../common/fs/remove-path.injectable"; import pathExistsSyncInjectable from "../../common/fs/path-exists-sync.injectable"; import readJsonSyncInjectable from "../../common/fs/read-json-sync.injectable"; import writeJsonSyncInjectable from "../../common/fs/write-json-sync.injectable"; diff --git a/src/main/cluster-detectors/create-version-detector.injectable.ts b/src/main/cluster-detectors/create-version-detector.injectable.ts index efd59dcfc3..c468da6286 100644 --- a/src/main/cluster-detectors/create-version-detector.injectable.ts +++ b/src/main/cluster-detectors/create-version-detector.injectable.ts @@ -13,8 +13,7 @@ const createVersionDetectorInjectable = getInjectable({ instantiate: (di) => { const k8sRequest = di.inject(k8sRequestInjectable); - return (cluster: Cluster) => - new VersionDetector(cluster, k8sRequest); + return (cluster: Cluster) => new VersionDetector(cluster, k8sRequest); }, }); diff --git a/src/main/cluster-detectors/version-detector.ts b/src/main/cluster-detectors/version-detector.ts index 6c836b851a..00afb8dfd2 100644 --- a/src/main/cluster-detectors/version-detector.ts +++ b/src/main/cluster-detectors/version-detector.ts @@ -10,14 +10,11 @@ export class VersionDetector extends BaseClusterDetector { key = ClusterMetadataKey.VERSION; public async detect() { - const version = await this.getKubernetesVersion(); - - return { value: version, accuracy: 100 }; - } - - public async getKubernetesVersion() { const response = await this.k8sRequest("/version") as { gitVersion: string }; - return response.gitVersion; + return { + value: response.gitVersion, + accuracy: 100, + }; } } diff --git a/src/main/helm/helm-service/update-helm-release.injectable.ts b/src/main/helm/helm-service/update-helm-release.injectable.ts index 274dae8cc4..f428e7a782 100644 --- a/src/main/helm/helm-service/update-helm-release.injectable.ts +++ b/src/main/helm/helm-service/update-helm-release.injectable.ts @@ -8,7 +8,7 @@ import loggerInjectable from "../../../common/logger.injectable"; import tempy from "tempy"; import getHelmReleaseInjectable from "./get-helm-release.injectable"; import writeFileInjectable from "../../../common/fs/write-file.injectable"; -import removePathInjectable from "../../../common/fs/remove.injectable"; +import removePathInjectable from "../../../common/fs/remove-path.injectable"; import execHelmInjectable from "../exec-helm/exec-helm.injectable"; export interface UpdateChartArgs { diff --git a/src/main/helm/install-helm-chart.injectable.ts b/src/main/helm/install-helm-chart.injectable.ts index f566c6a6f1..b63f151aed 100644 --- a/src/main/helm/install-helm-chart.injectable.ts +++ b/src/main/helm/install-helm-chart.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { dump } from "js-yaml"; import tempy from "tempy"; import type { JsonValue } from "type-fest"; -import removePathInjectable from "../../common/fs/remove.injectable"; +import removePathInjectable from "../../common/fs/remove-path.injectable"; import writeFileInjectable from "../../common/fs/write-file.injectable"; import execHelmInjectable from "./exec-helm/exec-helm.injectable"; diff --git a/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts b/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts index 010ec7174e..4abeb312da 100644 --- a/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts +++ b/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.ts @@ -13,7 +13,7 @@ import joinPathsInjectable from "../../common/path/join-paths.injectable"; import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import writeFileInjectable from "../../common/fs/write-file.injectable"; -import removePathInjectable from "../../common/fs/remove.injectable"; +import removePathInjectable from "../../common/fs/remove-path.injectable"; import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable"; export interface KubeConfigManagerInstantiationParameter { diff --git a/src/main/kubeconfig-manager/kubeconfig-manager.ts b/src/main/kubeconfig-manager/kubeconfig-manager.ts index c9c3a9b862..32ed156677 100644 --- a/src/main/kubeconfig-manager/kubeconfig-manager.ts +++ b/src/main/kubeconfig-manager/kubeconfig-manager.ts @@ -13,7 +13,7 @@ import type { Logger } from "../../common/logger"; import type { JoinPaths } from "../../common/path/join-paths.injectable"; import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable"; import type { PathExists } from "../../common/fs/path-exists.injectable"; -import type { RemovePath } from "../../common/fs/remove.injectable"; +import type { RemovePath } from "../../common/fs/remove-path.injectable"; import type { WriteFile } from "../../common/fs/write-file.injectable"; import type { SelfSignedCert } from "selfsigned"; diff --git a/src/main/kubectl/create-kubectl.injectable.ts b/src/main/kubectl/create-kubectl.injectable.ts index 09d3e0cae0..2e49b62e61 100644 --- a/src/main/kubectl/create-kubectl.injectable.ts +++ b/src/main/kubectl/create-kubectl.injectable.ts @@ -23,7 +23,7 @@ import copyFileInjectable from "../../common/fs/copy-file.injectable"; import createWriteFileStreamInjectable from "../../common/fs/create-write-file-stream.injectable"; import execFileInjectable from "../../common/fs/exec-file.injectable"; import pathExistsInjectable from "../../common/fs/path-exists.injectable"; -import removePathInjectable from "../../common/fs/remove.injectable"; +import removePathInjectable from "../../common/fs/remove-path.injectable"; import writeFileInjectable from "../../common/fs/write-file.injectable"; import ensureDirectoryInjectable from "../../common/fs/ensure-directory.injectable"; import fetchInjectable from "../../common/fetch/fetch.injectable"; diff --git a/src/main/kubectl/kubectl.ts b/src/main/kubectl/kubectl.ts index 0e75a39eac..92c73d4c55 100644 --- a/src/main/kubectl/kubectl.ts +++ b/src/main/kubectl/kubectl.ts @@ -21,7 +21,7 @@ import type { WriteFile } from "../../common/fs/write-file.injectable"; import type { CopyFile } from "../../common/fs/copy-file.injectable"; import type { CreateWriteFileStream } from "../../common/fs/create-write-file-stream.injectable"; import type { Fetch } from "../../common/fetch/fetch.injectable"; -import type { RemovePath } from "../../common/fs/remove.injectable"; +import type { RemovePath } from "../../common/fs/remove-path.injectable"; const initScriptVersionString = "# lens-initscript v3"; const pipeline = promisify(stream.pipeline); diff --git a/src/main/resource-applier/create-resource-applier.injectable.ts b/src/main/resource-applier/create-resource-applier.injectable.ts index 509dce086c..682cb491e5 100644 --- a/src/main/resource-applier/create-resource-applier.injectable.ts +++ b/src/main/resource-applier/create-resource-applier.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import emitAppEventInjectable from "../../common/app-event-bus/emit-event.injectable"; import type { Cluster } from "../../common/cluster/cluster"; -import removePathInjectable from "../../common/fs/remove.injectable"; +import removePathInjectable from "../../common/fs/remove-path.injectable"; import execFileInjectable from "../../common/fs/exec-file.injectable"; import writeFileInjectable from "../../common/fs/write-file.injectable"; import loggerInjectable from "../../common/logger.injectable"; diff --git a/src/main/resource-applier/resource-applier.ts b/src/main/resource-applier/resource-applier.ts index a604781fce..43d1be2689 100644 --- a/src/main/resource-applier/resource-applier.ts +++ b/src/main/resource-applier/resource-applier.ts @@ -11,7 +11,7 @@ import type { KubernetesObject } from "@kubernetes/client-node"; import type { EmitAppEvent } from "../../common/app-event-bus/emit-event.injectable"; import type { Logger } from "../../common/logger"; import type { WriteFile } from "../../common/fs/write-file.injectable"; -import type { RemovePath } from "../../common/fs/remove.injectable"; +import type { RemovePath } from "../../common/fs/remove-path.injectable"; import type { ExecFile } from "../../common/fs/exec-file.injectable"; import type { JoinPaths } from "../../common/path/join-paths.injectable"; import type { AsyncResult } from "../../common/utils/async-result"; diff --git a/src/renderer/api/create-terminal-api.injectable.ts b/src/renderer/api/create-terminal-api.injectable.ts index 2c1ff53afb..59af749968 100644 --- a/src/renderer/api/create-terminal-api.injectable.ts +++ b/src/renderer/api/create-terminal-api.injectable.ts @@ -8,7 +8,7 @@ import loggerInjectable from "../../common/logger.injectable"; import requestShellApiTokenInjectable from "../../features/terminal/renderer/request-shell-api-token.injectable"; import hostedClusterIdInjectable from "../cluster-frame-context/hosted-cluster-id.injectable"; import currentLocationInjectable from "./current-location.injectable"; -import defaultWebsocketApiParamsInjectable from "./default-websocket-params.injectable"; +import defaultWebsocketApiParamsInjectable from "./default-websocket-api-params.injectable"; import type { TerminalApiDependencies, TerminalApiQuery } from "./terminal-api"; import { TerminalApi } from "./terminal-api"; diff --git a/src/renderer/api/default-websocket-params.injectable.ts b/src/renderer/api/default-websocket-params.injectable.ts deleted file mode 100644 index e22d7176dc..0000000000 --- a/src/renderer/api/default-websocket-params.injectable.ts +++ /dev/null @@ -1,22 +0,0 @@ -/** - * 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 { TerminalMessage } from "../../common/terminal/channels"; -import { TerminalChannels } from "../../common/terminal/channels"; -import isDevelopmentInjectable from "../../common/vars/is-development.injectable"; - -export type DefaultWebsocketApiParams = ReturnType<(typeof defaultWebsocketApiParamsInjectable)["instantiate"]>; - -const defaultWebsocketApiParamsInjectable = getInjectable({ - id: "default-websocket-api-params", - instantiate: (di) => ({ - logging: di.inject(isDevelopmentInjectable), - reconnectDelay: 10, - flushOnOpen: true, - pingMessage: JSON.stringify({ type: TerminalChannels.PING } as TerminalMessage), - }), -}); - -export default defaultWebsocketApiParamsInjectable; diff --git a/src/renderer/api/websocket-api.ts b/src/renderer/api/websocket-api.ts index 2abcdfd92c..611e0b7e67 100644 --- a/src/renderer/api/websocket-api.ts +++ b/src/renderer/api/websocket-api.ts @@ -7,7 +7,7 @@ import { observable, makeObservable } from "mobx"; import EventEmitter from "events"; import type TypedEventEmitter from "typed-emitter"; import type { Defaulted } from "../utils"; -import type { DefaultWebsocketApiParams } from "./default-websocket-params.injectable"; +import type { DefaultWebsocketApiParams } from "./default-websocket-api-params.injectable"; import type { Logger } from "../../common/logger"; interface WebsocketApiParams { diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx index 751c1a38cc..b8ad5f4e8a 100644 --- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx +++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx @@ -23,8 +23,8 @@ import installExtensionFromInputInjectable from "../install-extension-from-input import type { ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store"; import extensionInstallationStateStoreInjectable from "../../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable"; import { observable, when } from "mobx"; -import type { RemovePath } from "../../../../common/fs/remove.injectable"; -import removePathInjectable from "../../../../common/fs/remove.injectable"; +import type { RemovePath } from "../../../../common/fs/remove-path.injectable"; +import removePathInjectable from "../../../../common/fs/remove-path.injectable"; import type { DownloadBinary } from "../../../../common/fetch/download-binary.injectable"; import downloadBinaryInjectable from "../../../../common/fetch/download-binary.injectable"; import currentlyInClusterFrameInjectable from "../../../routes/currently-in-cluster-frame.injectable"; diff --git a/yarn.lock b/yarn.lock index ba0bd19f74..8dcd67358b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2749,7 +2749,7 @@ dependencies: "@types/node" "*" -"@types/ws@^8.5.1", "@types/ws@^8.5.3": +"@types/ws@^8.5.1": version "8.5.3" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==