Merge branch 'master' into enhancement-namespace-tree-view

packages/core/src/common/library.ts

@@ -8,4 +8,4 @@ export { applicationInformationToken } from "./vars/application-information-toke
 export type { ApplicationInformation } from "./vars/application-information-token";
 export { bundledExtensionInjectionToken } from "../extensions/extension-discovery/bundled-extension-token";
 
-export * as CommonApi from "../extensions/common-api";
+export * as extensionApi from "../extensions/common-api";

packages/core/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts

@@ -12,6 +12,7 @@ import loggerInjectable from "../../common/logger.injectable";
 import waitUntilPortIsUsedInjectable from "./wait-until-port-is-used/wait-until-port-is-used.injectable";
 import lensK8sProxyPathInjectable from "./lens-k8s-proxy-path.injectable";
 import getPortFromStreamInjectable from "../utils/get-port-from-stream.injectable";
+import getDirnameOfPathInjectable from "../../common/path/get-dirname.injectable";
 
 export type CreateKubeAuthProxy = (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => KubeAuthProxy;
 
@@ -25,6 +26,7 @@ const createKubeAuthProxyInjectable = getInjectable({
       logger: di.inject(loggerInjectable),
       waitUntilPortIsUsed: di.inject(waitUntilPortIsUsedInjectable),
       getPortFromStream: di.inject(getPortFromStreamInjectable),
+      dirname: di.inject(getDirnameOfPathInjectable),
     };
 
     return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => {

packages/core/src/main/kube-auth-proxy/kube-auth-proxy.ts

@@ -14,6 +14,7 @@ import { TypedRegEx } from "typed-regex";
 import type { Spawn } from "../child-process/spawn.injectable";
 import type { Logger } from "../../common/logger";
 import type { WaitUntilPortIsUsed } from "./wait-until-port-is-used/wait-until-port-is-used.injectable";
+import type { GetDirnameOfPath } from "../../common/path/get-dirname.injectable";
 
 const startingServeMatcher = "starting to serve on (?<address>.+)";
 const startingServeRegex = Object.assign(TypedRegEx(startingServeMatcher, "i"), {
@@ -27,6 +28,7 @@ export interface KubeAuthProxyDependencies {
   spawn: Spawn;
   waitUntilPortIsUsed: WaitUntilPortIsUsed;
   getPortFromStream: GetPortFromStream;
+  dirname: GetDirnameOfPath;
 }
 
 export class KubeAuthProxy {
@@ -69,6 +71,7 @@ export class KubeAuthProxy {
         PROXY_KEY: cert.private,
         PROXY_CERT: cert.cert,
       },
+      cwd: this.dependencies.dirname(this.cluster.kubeConfigPath),
     });
     this.proxyProcess.on("error", (error) => {
       this.cluster.broadcastConnectUpdate(error.message, "error");

packages/core/src/main/library.ts

@@ -2,7 +2,6 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { spawn } from "node-pty";
 
 // @experimental
 export { afterApplicationIsLoadedInjectionToken } from "./start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
@@ -11,8 +10,5 @@ export { beforeElectronIsReadyInjectionToken } from "./start-main-application/ru
 export { onLoadOfApplicationInjectionToken } from "./start-main-application/runnable-tokens/on-load-of-application-injection-token";
 export { createApp } from "./create-app";
 export * as Mobx from "mobx";
-export * as MainApi from "../extensions/main-api";
-
-export const Pty = {
-  spawn,
-};
+export * as extensionApi from "../extensions/main-api";
+export * as Pty from "node-pty";

packages/core/src/renderer/library.ts

@@ -12,5 +12,5 @@ export * as Mobx from "mobx";
 export * as MobxReact from "mobx-react";
 export * as ReactRouter from "react-router";
 export * as ReactRouterDom from "react-router-dom";
-export * as RendererApi from "../extensions/renderer-api";
+export * as extensionApi from "../extensions/renderer-api";
 export { createApp } from "./create-app";