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

address some review comments

Browse Source 
Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
This commit is contained in:
Jim Ehrismann 2022-02-03 12:56:43 -05:00
parent 4b51c22610
commit f3d009d216
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/extensions/common-api/registrations.ts
View File

@ -11,4 +11,4 @@ export type { PageRegistration, RegisteredPage, PageParams, PageComponentProps,
export type { ClusterPageMenuRegistration, ClusterPageMenuComponents } from "../registries/page-menu-registry"; export type { ClusterPageMenuRegistration, ClusterPageMenuComponents } from "../registries/page-menu-registry";
export type { ProtocolHandlerRegistration, RouteParams as ProtocolRouteParams, RouteHandler as ProtocolRouteHandler } from "../registries/protocol-handler"; export type { ProtocolHandlerRegistration, RouteParams as ProtocolRouteParams, RouteHandler as ProtocolRouteHandler } from "../registries/protocol-handler";
export type { CustomCategoryViewProps, CustomCategoryViewComponents, CustomCategoryViewRegistration } from "../../renderer/components/+catalog/custom-views"; export type { CustomCategoryViewProps, CustomCategoryViewComponents, CustomCategoryViewRegistration } from "../../renderer/components/+catalog/custom-views";
export type { ShellEnvModifier, ShellEnvClusterData } from "../../main/shell-session/shell-env-modifier/shell-env-modifier-registration"; export type { ShellEnvModifier, ShellEnvContext } from "../../main/shell-session/shell-env-modifier/shell-env-modifier-registration";

3
src/extensions/lens-main-extension.ts
View File

@ -11,13 +11,12 @@ import type { IObservableArray } from "mobx";
import type { MenuRegistration } from "../main/menu/menu-registration"; import type { MenuRegistration } from "../main/menu/menu-registration";
import type { TrayMenuRegistration } from "../main/tray/tray-menu-registration"; import type { TrayMenuRegistration } from "../main/tray/tray-menu-registration";
import type { ShellEnvModifier } from "../main/shell-session/shell-env-modifier/shell-env-modifier-registration"; import type { ShellEnvModifier } from "../main/shell-session/shell-env-modifier/shell-env-modifier-registration";
import { noop } from "../common/utils";
export class LensMainExtension extends LensExtension { export class LensMainExtension extends LensExtension {
appMenus: MenuRegistration[] = []; appMenus: MenuRegistration[] = [];
trayMenus: TrayMenuRegistration[] = []; trayMenus: TrayMenuRegistration[] = [];
shellEnvModifier: ShellEnvModifier = noop; shellEnvModifier?: ShellEnvModifier;
async navigate(pageId?: string, params?: Record<string, any>, frameId?: number) { async navigate(pageId?: string, params?: Record<string, any>, frameId?: number) {
return WindowManager.getInstance().navigateExtension(this.id, pageId, params, frameId); return WindowManager.getInstance().navigateExtension(this.id, pageId, params, frameId);

6
src/main/shell-session/shell-env-modifier/shell-env-modifier-registration.ts
View File

@ -3,12 +3,10 @@
* 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 { noop } from "../../../common/utils"; export interface ShellEnvContext {
export interface ShellEnvClusterData {
context: string; context: string;
kubeconfigPath: string; kubeconfigPath: string;
id: string; id: string;
} }
export type ShellEnvModifier = ((cluster: ShellEnvClusterData, env: Record<string, string | undefined>) => Record<string, string | undefined>) | typeof noop; export type ShellEnvModifier = (cluster: ShellEnvContext, env: Record<string, string | undefined>) => Record<string, string | undefined>;

3
src/main/shell-session/shell-env-modifier/shell-env-modifiers.ts
View File

@ -13,6 +13,7 @@ interface Dependencies {
export const shellEnvModifiers = ({ extensions }: Dependencies) => { export const shellEnvModifiers = ({ extensions }: Dependencies) => {
return computed(() => ( return computed(() => (
extensions.get() extensions.get()
.flatMap((extension) => extension.shellEnvModifier) .map((extension) => extension.shellEnvModifier)
.filter(Boolean)
)); ));
}; };

8
src/main/shell-session/shell-session.ts
View File

@ -312,7 +312,7 @@ export abstract class ShellSession {
} }
protected async getShellEnv() { protected async getShellEnv() {
let env = clearKubeconfigEnvVars(JSON.parse(JSON.stringify(await shellEnv()))); const env = clearKubeconfigEnvVars(JSON.parse(JSON.stringify(await shellEnv())));
const pathStr = [...this.getPathEntries(), await this.kubectlBinDirP, process.env.PATH].join(path.delimiter); const pathStr = [...this.getPathEntries(), await this.kubectlBinDirP, process.env.PATH].join(path.delimiter);
const shell = UserStore.getInstance().resolvedShell; const shell = UserStore.getInstance().resolvedShell;
@ -361,9 +361,11 @@ export abstract class ShellSession {
.filter(Boolean) .filter(Boolean)
.join(); .join();
this.shellEnvModifiers.map(modifier => env = { ...env, ...modifier({ context: this.cluster.contextName, kubeconfigPath, id: this.cluster.id }, env) }); const ctx = { context: this.cluster.contextName, kubeconfigPath, id: this.cluster.id };
return env; const modifiedEnv = this.shellEnvModifiers.reduce((env, modifier) => modifier(ctx, env), env);
return modifiedEnv;
} }
protected exit(code = WebSocketCloseEvent.NormalClosure) { protected exit(code = WebSocketCloseEvent.NormalClosure) {