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 type errors

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-03-10 15:44:51 -05:00
parent b491a5c875
commit 3aed8370a9
5 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/common/cluster-env.injectable.ts
View File

@ -5,7 +5,7 @@
import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
import { computed } from "mobx"; import { computed } from "mobx";
import type { Cluster } from "./cluster/cluster"; import type { Cluster } from "./cluster/cluster";
import { object } from "./utils"; import { object } from "@k8slens/utilities";
function isDefinedEntry<T>(entry: readonly [T, string | undefined]): entry is [T, string] { function isDefinedEntry<T>(entry: readonly [T, string | undefined]): entry is [T, string] {
return Boolean(entry[1]); return Boolean(entry[1]);

25
packages/core/src/main/resource-applier/create-resource-applier.injectable.ts
View File

@ -13,22 +13,21 @@ import { ResourceApplier } from "./resource-applier";
import createKubectlInjectable from "../kubectl/create-kubectl.injectable"; import createKubectlInjectable from "../kubectl/create-kubectl.injectable";
import kubeconfigManagerInjectable from "../kubeconfig-manager/kubeconfig-manager.injectable"; import kubeconfigManagerInjectable from "../kubeconfig-manager/kubeconfig-manager.injectable";
import type { Cluster } from "../../common/cluster/cluster"; import type { Cluster } from "../../common/cluster/cluster";
import clusterEnvironmentInjectable from "../../common/cluster-env.injectable";
const resourceApplierInjectable = getInjectable({ const resourceApplierInjectable = getInjectable({
id: "resource-applier", id: "resource-applier",
instantiate: (di, cluster) => new ResourceApplier( instantiate: (di, cluster) => new ResourceApplier({
{ deleteFile: di.inject(removePathInjectable),
deleteFile: di.inject(removePathInjectable), emitAppEvent: di.inject(emitAppEventInjectable),
emitAppEvent: di.inject(emitAppEventInjectable), execFile: di.inject(execFileInjectable),
execFile: di.inject(execFileInjectable), joinPaths: di.inject(joinPathsInjectable),
joinPaths: di.inject(joinPathsInjectable), logger: di.inject(loggerInjectable),
logger: di.inject(loggerInjectable), writeFile: di.inject(writeFileInjectable),
writeFile: di.inject(writeFileInjectable), kubectl: di.inject(createKubectlInjectable)(cluster.version.get()),
createKubectl: di.inject(createKubectlInjectable), proxyKubeconfigManager: di.inject(kubeconfigManagerInjectable, cluster),
proxyKubeconfigManager: di.inject(kubeconfigManagerInjectable, cluster), clusterEnvironment: di.inject(clusterEnvironmentInjectable, cluster),
}, }),
cluster,
),
lifecycle: lifecycleEnum.keyedSingleton({ lifecycle: lifecycleEnum.keyedSingleton({
getInstanceKey: (di, cluster: Cluster) => cluster.id, getInstanceKey: (di, cluster: Cluster) => cluster.id,
}), }),

16
packages/core/src/main/resource-applier/resource-applier.ts
View File

@ -3,7 +3,6 @@
* 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 type { Cluster } from "../../common/cluster/cluster";
import * as yaml from "js-yaml"; import * as yaml from "js-yaml";
import tempy from "tempy"; import tempy from "tempy";
import type { Patch } from "rfc6902"; import type { Patch } from "rfc6902";
@ -14,11 +13,11 @@ import type { WriteFile } from "../../common/fs/write-file.injectable";
import type { RemovePath } from "../../common/fs/remove.injectable"; import type { RemovePath } from "../../common/fs/remove.injectable";
import type { ExecFile } from "../../common/fs/exec-file.injectable"; import type { ExecFile } from "../../common/fs/exec-file.injectable";
import type { JoinPaths } from "../../common/path/join-paths.injectable"; import type { JoinPaths } from "../../common/path/join-paths.injectable";
import type { CreateKubectl } from "../kubectl/create-kubectl.injectable";
import type { KubeconfigManager } from "../kubeconfig-manager/kubeconfig-manager"; import type { KubeconfigManager } from "../kubeconfig-manager/kubeconfig-manager";
import type { AsyncResult } from "@k8slens/utilities"; import type { AsyncResult } from "@k8slens/utilities";
import type { IComputedValue } from "mobx"; import type { IComputedValue } from "mobx";
import type { ClusterEnvironment } from "../../common/cluster-env.injectable"; import type { ClusterEnvironment } from "../../common/cluster-env.injectable";
import type { Kubectl } from "../kubectl/kubectl";
export interface ResourceApplierDependencies { export interface ResourceApplierDependencies {
emitAppEvent: EmitAppEvent; emitAppEvent: EmitAppEvent;
@ -26,24 +25,19 @@ export interface ResourceApplierDependencies {
deleteFile: RemovePath; deleteFile: RemovePath;
execFile: ExecFile; execFile: ExecFile;
joinPaths: JoinPaths; joinPaths: JoinPaths;
createKubectl: CreateKubectl; readonly kubectl: Kubectl;
readonly proxyKubeconfigManager: KubeconfigManager; readonly proxyKubeconfigManager: KubeconfigManager;
readonly logger: Logger; readonly logger: Logger;
readonly clusterEnvironment: IComputedValue<ClusterEnvironment>; readonly clusterEnvironment: IComputedValue<ClusterEnvironment>;
} }
export class ResourceApplier { export class ResourceApplier {
constructor( constructor(protected readonly dependencies: ResourceApplierDependencies) {}
protected readonly dependencies: ResourceApplierDependencies,
protected readonly cluster: Cluster,
) {}
private async getKubectlPath() { private async getKubectlPath() {
const kubectl = this.dependencies.createKubectl(this.cluster.version.get()); await this.dependencies.kubectl.ensureKubectl();
await kubectl.ensureKubectl(); return this.dependencies.kubectl.getPath();
return kubectl.getPath();
} }
/** /**

10
packages/core/src/main/shell-session/local-shell-session/open.injectable.ts
View File

@ -25,6 +25,7 @@ import buildVersionInjectable from "../../vars/build-version/build-version.injec
import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable"; import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
import statInjectable from "../../../common/fs/stat.injectable"; import statInjectable from "../../../common/fs/stat.injectable";
import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable";
import clusterEnvironmentInjectable from "../../../common/cluster-env.injectable";
export interface OpenLocalShellSessionArgs { export interface OpenLocalShellSessionArgs {
websocket: WebSocket; websocket: WebSocket;
@ -39,7 +40,7 @@ const openLocalShellSessionInjectable = getInjectable({
instantiate: (di): OpenLocalShellSession => { instantiate: (di): OpenLocalShellSession => {
const createKubectl = di.inject(createKubectlInjectable); const createKubectl = di.inject(createKubectlInjectable);
const dependencies: Omit<LocalShellSessionDependencies, "proxyKubeconfigPath" | "directoryContainingKubectl"> = { const dependencies: Omit<LocalShellSessionDependencies, "proxyKubeconfigPath" | "directoryContainingKubectl" | "clusterEnvironment"> = {
directoryForBinaries: di.inject(directoryForBinariesInjectable), directoryForBinaries: di.inject(directoryForBinariesInjectable),
isMac: di.inject(isMacInjectable), isMac: di.inject(isMacInjectable),
isWindows: di.inject(isWindowsInjectable), isWindows: di.inject(isWindowsInjectable),
@ -61,13 +62,12 @@ const openLocalShellSessionInjectable = getInjectable({
return async (args) => { return async (args) => {
const kubectl = createKubectl(args.cluster.version.get()); const kubectl = createKubectl(args.cluster.version.get());
const kubeconfigManager = di.inject(kubeconfigManagerInjectable, args.cluster); const kubeconfigManager = di.inject(kubeconfigManagerInjectable, args.cluster);
const proxyKubeconfigPath = await kubeconfigManager.ensurePath();
const directoryContainingKubectl = await kubectl.binDir();
const session = new LocalShellSession({ const session = new LocalShellSession({
...dependencies, ...dependencies,
proxyKubeconfigPath, proxyKubeconfigPath: await kubeconfigManager.ensurePath(),
directoryContainingKubectl, directoryContainingKubectl: await kubectl.binDir(),
clusterEnvironment: di.inject(clusterEnvironmentInjectable, args.cluster),
}, { kubectl, ...args }); }, { kubectl, ...args });
return session.open(); return session.open();

13
packages/core/src/main/shell-session/node-shell-session/open.injectable.ts
View File

@ -22,6 +22,7 @@ import statInjectable from "../../../common/fs/stat.injectable";
import createKubeApiInjectable from "../../../common/k8s-api/create-kube-api.injectable"; import createKubeApiInjectable from "../../../common/k8s-api/create-kube-api.injectable";
import loadProxyKubeconfigInjectable from "../../cluster/load-proxy-kubeconfig.injectable"; import loadProxyKubeconfigInjectable from "../../cluster/load-proxy-kubeconfig.injectable";
import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable"; import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable";
import clusterEnvironmentInjectable from "../../../common/cluster-env.injectable";
export interface NodeShellSessionArgs { export interface NodeShellSessionArgs {
websocket: WebSocket; websocket: WebSocket;
@ -36,7 +37,7 @@ const openNodeShellSessionInjectable = getInjectable({
id: "open-node-shell-session", id: "open-node-shell-session",
instantiate: (di): OpenNodeShellSession => { instantiate: (di): OpenNodeShellSession => {
const createKubectl = di.inject(createKubectlInjectable); const createKubectl = di.inject(createKubectlInjectable);
const dependencies: Omit<NodeShellSessionDependencies, "proxyKubeconfigPath" | "loadProxyKubeconfig" | "directoryContainingKubectl"> = { const dependencies: Omit<NodeShellSessionDependencies, "proxyKubeconfigPath" | "loadProxyKubeconfig" | "directoryContainingKubectl" | "clusterEnvironment"> = {
isMac: di.inject(isMacInjectable), isMac: di.inject(isMacInjectable),
isWindows: di.inject(isWindowsInjectable), isWindows: di.inject(isWindowsInjectable),
logger: di.inject(loggerInjectable), logger: di.inject(loggerInjectable),
@ -54,15 +55,13 @@ const openNodeShellSessionInjectable = getInjectable({
return async (args) => { return async (args) => {
const kubectl = createKubectl(args.cluster.version.get()); const kubectl = createKubectl(args.cluster.version.get());
const kubeconfigManager = di.inject(kubeconfigManagerInjectable, args.cluster); const kubeconfigManager = di.inject(kubeconfigManagerInjectable, args.cluster);
const loadProxyKubeconfig = di.inject(loadProxyKubeconfigInjectable, args.cluster);
const proxyKubeconfigPath = await kubeconfigManager.ensurePath();
const directoryContainingKubectl = await kubectl.binDir();
const session = new NodeShellSession({ const session = new NodeShellSession({
...dependencies, ...dependencies,
loadProxyKubeconfig, loadProxyKubeconfig: di.inject(loadProxyKubeconfigInjectable, args.cluster),
proxyKubeconfigPath, proxyKubeconfigPath: await kubeconfigManager.ensurePath(),
directoryContainingKubectl, directoryContainingKubectl: await kubectl.binDir(),
clusterEnvironment: di.inject(clusterEnvironmentInjectable, args.cluster),
}, { kubectl, ...args }); }, { kubectl, ...args });
return session.open(); return session.open();