hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash on load due to circular dependency

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-08-11 08:37:43 -04:00
parent 6a359e8ddb
commit 0591c27b3c
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/shell-session/create-shell-session.injectable.ts
View File

@ -22,11 +22,10 @@ const openShellSessionInjectable = getInjectable({
instantiate: (di): OpenShellSession => { instantiate: (di): OpenShellSession => {
const openLocalShellSession = di.inject(openLocalShellSessionInjectable); const openLocalShellSession = di.inject(openLocalShellSessionInjectable);
const openNodeShellSession = di.inject(openNodeShellSessionInjectable);
return ({ nodeName, ...args }) => ( return ({ nodeName, ...args }) => (
nodeName nodeName
? openNodeShellSession({ nodeName, ...args }) ? di.inject(openNodeShellSessionInjectable, { nodeName, ...args })
: openLocalShellSession(args) : openLocalShellSession(args)
); );
}, },

17
src/main/shell-session/node-shell-session/open.injectable.ts
View File

@ -2,7 +2,7 @@
* Copyright (c) OpenLens Authors. All rights reserved. * Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import type { Cluster } from "../../../common/cluster/cluster"; import type { Cluster } from "../../../common/cluster/cluster";
import type WebSocket from "ws"; import type WebSocket from "ws";
import createKubectlInjectable from "../../kubectl/create-kubectl.injectable"; import createKubectlInjectable from "../../kubectl/create-kubectl.injectable";
@ -20,11 +20,9 @@ export interface NodeShellSessionArgs {
nodeName: string; nodeName: string;
} }
export type OpenNodeShellSession = (args: NodeShellSessionArgs) => Promise<void>;
const openNodeShellSessionInjectable = getInjectable({ const openNodeShellSessionInjectable = getInjectable({
id: "open-node-shell-session", id: "open-node-shell-session",
instantiate: (di): OpenNodeShellSession => { instantiate: (di, params: NodeShellSessionArgs) => {
const createKubectl = di.inject(createKubectlInjectable); const createKubectl = di.inject(createKubectlInjectable);
const dependencies: NodeShellSessionDependencies = { const dependencies: NodeShellSessionDependencies = {
isMac: di.inject(isMacInjectable), isMac: di.inject(isMacInjectable),
@ -32,14 +30,13 @@ const openNodeShellSessionInjectable = getInjectable({
logger: di.inject(loggerInjectable), logger: di.inject(loggerInjectable),
createKubeJsonApiForCluster: di.inject(createKubeJsonApiForClusterInjectable), createKubeJsonApiForCluster: di.inject(createKubeJsonApiForClusterInjectable),
}; };
const kubectl = createKubectl(params.cluster.version);
const session = new NodeShellSession(dependencies, { kubectl, ...params });
return (args) => { return session.open();
const kubectl = createKubectl(args.cluster.version);
const session = new NodeShellSession(dependencies, { kubectl, ...args });
return session.open();
};
}, },
// NOTE: this must be transient to bypass the circular dependency of `createKubeJsonApiForClusterInjectable` on the lens proxy port
lifecycle: lifecycleEnum.transient,
}); });
export default openNodeShellSessionInjectable; export default openNodeShellSessionInjectable;

9
src/renderer/k8s/api-kube.injectable.ts
View File

@ -5,17 +5,20 @@
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import assert from "assert"; import assert from "assert";
import { onApiError } from "../api/on-api-error"; import { onApiError } from "../api/on-api-error";
import { apiKubePrefix, isDevelopment } from "../../common/vars"; import { apiKubePrefix } from "../../common/vars";
import { apiKubeInjectionToken } from "../../common/k8s-api/api-kube"; import { apiKubeInjectionToken } from "../../common/k8s-api/api-kube";
import { storesAndApisCanBeCreatedInjectionToken } from "../../common/k8s-api/stores-apis-can-be-created.token"; import { storesAndApisCanBeCreatedInjectionToken } from "../../common/k8s-api/stores-apis-can-be-created.token";
import { KubeJsonApi } from "../../common/k8s-api/kube-json-api"; import createKubeJsonApiInjectable from "../../common/k8s-api/create-kube-json-api.injectable";
import isDevelopmentInjectable from "../../common/vars/is-development.injectable";
const apiKubeInjectable = getInjectable({ const apiKubeInjectable = getInjectable({
id: "api-kube", id: "api-kube",
instantiate: (di) => { instantiate: (di) => {
assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "apiKube is only available in certain environments"); assert(di.inject(storesAndApisCanBeCreatedInjectionToken), "apiKube is only available in certain environments");
const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);
const isDevelopment = di.inject(isDevelopmentInjectable);
const apiKube = new KubeJsonApi({ const apiKube = createKubeJsonApi({
serverAddress: `http://127.0.0.1:${window.location.port}`, serverAddress: `http://127.0.0.1:${window.location.port}`,
apiBase: apiKubePrefix, apiBase: apiKubePrefix,
debug: isDevelopment, debug: isDevelopment,