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

Use new ordering to make openNodeShellSession non-special

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-12-16 09:45:17 -05:00
parent c850fb6211
commit 534e86c3f5
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/k8s-api/create-kube-json-api-for-cluster.injectable.ts
View File

@ -5,7 +5,7 @@
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { apiKubePrefix } from "../vars"; import { apiKubePrefix } from "../vars";
import isDebuggingInjectable from "../vars/is-debugging.injectable"; import isDebuggingInjectable from "../vars/is-debugging.injectable";
import apiBaseInjectable from "./api-base.injectable"; import { apiBaseHostHeaderInjectionToken, apiBaseServerAddressInjectionToken } from "./api-base-configs";
import createKubeJsonApiInjectable from "./create-kube-json-api.injectable"; import createKubeJsonApiInjectable from "./create-kube-json-api.injectable";
import type { KubeJsonApi } from "./kube-json-api"; import type { KubeJsonApi } from "./kube-json-api";
@ -14,19 +14,18 @@ export type CreateKubeJsonApiForCluster = (clusterId: string) => KubeJsonApi;
const createKubeJsonApiForClusterInjectable = getInjectable({ const createKubeJsonApiForClusterInjectable = getInjectable({
id: "create-kube-json-api-for-cluster", id: "create-kube-json-api-for-cluster",
instantiate: (di): CreateKubeJsonApiForCluster => { instantiate: (di): CreateKubeJsonApiForCluster => {
const apiBase = di.inject(apiBaseInjectable);
const createKubeJsonApi = di.inject(createKubeJsonApiInjectable); const createKubeJsonApi = di.inject(createKubeJsonApiInjectable);
const isDebugging = di.inject(isDebuggingInjectable); const isDebugging = di.inject(isDebuggingInjectable);
return (clusterId) => createKubeJsonApi( return (clusterId) => createKubeJsonApi(
{ {
serverAddress: apiBase.config.serverAddress, serverAddress: di.inject(apiBaseServerAddressInjectionToken),
apiBase: apiKubePrefix, apiBase: apiKubePrefix,
debug: isDebugging, debug: isDebugging,
}, },
{ {
headers: { headers: {
"Host": `${clusterId}.localhost:${new URL(apiBase.config.serverAddress).port}`, "Host": `${clusterId}.${di.inject(apiBaseHostHeaderInjectionToken)}`,
}, },
}, },
); );

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

@ -22,10 +22,11 @@ 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
? di.inject(openNodeShellSessionInjectable, { nodeName, ...args }) ? openNodeShellSession({ 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, lifecycleEnum } from "@ogre-tools/injectable"; import { getInjectable } 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";
@ -27,9 +27,11 @@ 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, params: NodeShellSessionArgs) => { instantiate: (di): OpenNodeShellSession => {
const createKubectl = di.inject(createKubectlInjectable); const createKubectl = di.inject(createKubectlInjectable);
const dependencies: NodeShellSessionDependencies = { const dependencies: NodeShellSessionDependencies = {
isMac: di.inject(isMacInjectable), isMac: di.inject(isMacInjectable),
@ -44,13 +46,14 @@ const openNodeShellSessionInjectable = getInjectable({
emitAppEvent: di.inject(emitAppEventInjectable), emitAppEvent: di.inject(emitAppEventInjectable),
stat: di.inject(statInjectable), stat: di.inject(statInjectable),
}; };
const kubectl = createKubectl(params.cluster.version);
const session = new NodeShellSession(dependencies, { kubectl, ...params });
return session.open(); return async (args) => {
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;