make raw kernel launch respect launching resource environment (#11463)

Co-authored-by: Ian Huff <[email protected]>

Author: IanMatthewHuff

news/2 Fixes/11451.md

@@ -0,0 +1 @@
+Make raw kernel launch respect launched resource environment.

src/client/datascience/kernel-launcher/kernelLauncher.ts

@@ -8,6 +8,7 @@ import { promisify } from 'util';
 import * as uuid from 'uuid/v4';
 import { IFileSystem } from '../../common/platform/types';
 import { IProcessServiceFactory, IPythonExecutionFactory } from '../../common/process/types';
+import { Resource } from '../../common/types';
 import { captureTelemetry } from '../../telemetry';
 import { Telemetry } from '../constants';
 import { IJupyterKernelSpec } from '../types';
@@ -29,14 +30,15 @@ export class KernelLauncher implements IKernelLauncher {
     ) {}
 
     @captureTelemetry(Telemetry.KernelLauncherPerf)
-    public async launch(kernelSpec: IJupyterKernelSpec): Promise<IKernelProcess> {
+    public async launch(kernelSpec: IJupyterKernelSpec, resource: Resource): Promise<IKernelProcess> {
         const connection = await this.getKernelConnection();
         const kernelProcess = new KernelProcess(
             this.pythonExecutionFactory,
             this.processExecutionFactory,
             this.file,
             connection,
-            kernelSpec
+            kernelSpec,
+            resource
         );
         await kernelProcess.launch();
         return kernelProcess;

src/client/datascience/kernel-launcher/kernelProcess.ts

@@ -53,7 +53,8 @@ export class KernelProcess implements IKernelProcess {
         private readonly processExecutionFactory: IProcessServiceFactory,
         private readonly file: IFileSystem,
         private readonly _connection: IKernelConnection,
-        kernelSpec: IJupyterKernelSpec
+        kernelSpec: IJupyterKernelSpec,
+        private readonly resource: Resource
     ) {
         this.originalKernelSpec = kernelSpec;
         this._kernelSpec = cloneDeep(kernelSpec);
@@ -148,16 +149,18 @@ export class KernelProcess implements IKernelProcess {
 
     private async launchAsObservable() {
         let exeObs: ObservableExecutionResult<string>;
-        const resource: Resource = undefined;
         if (this.isPythonKernel) {
             this.pythonKernelLauncher = new PythonKernelLauncherDaemon(this.pythonExecutionFactory);
-            const { observableResult, daemon } = await this.pythonKernelLauncher.launch(resource, this._kernelSpec);
+            const { observableResult, daemon } = await this.pythonKernelLauncher.launch(
+                this.resource,
+                this._kernelSpec
+            );
             this.kernelDaemon = daemon;
             exeObs = observableResult;
         } else {
             // First part of argument is always the executable.
             const executable = this._kernelSpec.argv[0];
-            const executionService = await this.processExecutionFactory.create(resource);
+            const executionService = await this.processExecutionFactory.create(this.resource);
             exeObs = executionService.execObservable(executable, this._kernelSpec.argv.slice(1), {
                 env: this._kernelSpec.env
             });

src/client/datascience/kernel-launcher/types.ts

@@ -6,12 +6,12 @@ import { SpawnOptions } from 'child_process';
 import { CancellationToken, Event } from 'vscode';
 import { InterpreterUri } from '../../common/installer/types';
 import { ObservableExecutionResult } from '../../common/process/types';
-import { IAsyncDisposable, IDisposable } from '../../common/types';
+import { IAsyncDisposable, IDisposable, Resource } from '../../common/types';
 import { IJupyterKernelSpec } from '../types';
 
 export const IKernelLauncher = Symbol('IKernelLauncher');
 export interface IKernelLauncher {
-    launch(kernelSpec: IJupyterKernelSpec): Promise<IKernelProcess>;
+    launch(kernelSpec: IJupyterKernelSpec, resource: Resource): Promise<IKernelProcess>;
 }
 
 export interface IKernelConnection {

src/client/datascience/raw-kernel/liveshare/hostRawNotebookProvider.ts

@@ -101,7 +101,12 @@ export class HostRawNotebookProvider
             ? this.progressReporter.createProgressIndicator(localize.DataScience.connectingIPyKernel())
             : undefined;
 
-        const rawSession = new RawJupyterSession(this.kernelLauncher, this.kernelSelector, this.outputChannel);
+        const rawSession = new RawJupyterSession(
+            this.kernelLauncher,
+            this.kernelSelector,
+            resource,
+            this.outputChannel
+        );
         try {
             const launchTimeout = this.configService.getSettings().datascience.jupyterLaunchTimeout;
 

src/client/datascience/raw-kernel/rawJupyterSession.ts

@@ -6,7 +6,7 @@ import type { Slot } from '@phosphor/signaling';
 import { CancellationToken } from 'vscode-jsonrpc';
 import { CancellationError, createPromiseFromCancellation } from '../../common/cancellation';
 import { traceError, traceInfo } from '../../common/logger';
-import { IDisposable, IOutputChannel } from '../../common/types';
+import { IDisposable, IOutputChannel, Resource } from '../../common/types';
 import { waitForPromise } from '../../common/utils/async';
 import * as localize from '../../common/utils/localize';
 import { noop } from '../../common/utils/misc';
@@ -34,6 +34,7 @@ export class RawJupyterSession extends BaseJupyterSession {
     constructor(
         private readonly kernelLauncher: IKernelLauncher,
         kernelSelector: KernelSelector,
+        private readonly resource: Resource,
         private readonly outputChannel: IOutputChannel
     ) {
         super(kernelSelector);
@@ -180,7 +181,7 @@ export class RawJupyterSession extends BaseJupyterSession {
         kernelSpec: IJupyterKernelSpec,
         _cancelToken?: CancellationToken
     ): Promise<RawSession> {
-        const process = await this.kernelLauncher.launch(kernelSpec);
+        const process = await this.kernelLauncher.launch(kernelSpec, this.resource);
 
         // Wait for the process to actually be ready to connect to
         await process.ready;

src/test/datascience/kernelLauncher.functional.test.ts

@@ -51,7 +51,7 @@ suite('DataScience - Kernel Launcher', () => {
             // tslint:disable-next-line: no-invalid-this
             this.skip();
         } else {
-            const kernel = await kernelLauncher.launch(kernelSpec);
+            const kernel = await kernelLauncher.launch(kernelSpec, undefined);
             const exited = new Promise<boolean>((resolve) => kernel.exited(() => resolve(true)));
 
             assert.isOk<IKernelConnection | undefined>(kernel.connection, 'Connection not found');
@@ -159,7 +159,7 @@ suite('DataScience - Kernel Launcher', () => {
             };
             kernelFinder.addKernelSpec(pythonInterpreter.path, spec);
 
-            const kernel = await kernelLauncher.launch(spec);
+            const kernel = await kernelLauncher.launch(spec, undefined);
             const exited = new Promise<boolean>((resolve) => kernel.exited(() => resolve(true)));
 
             // It should not exit.
@@ -203,7 +203,7 @@ suite('DataScience - Kernel Launcher', () => {
             // tslint:disable-next-line: no-invalid-this
             this.skip();
         } else {
-            const kernel = await kernelLauncher.launch(kernelSpec);
+            const kernel = await kernelLauncher.launch(kernelSpec, undefined);
 
             try {
                 const zmq = await import('zeromq');

src/test/datascience/raw-kernel/rawKernel.functional.test.ts

@@ -90,7 +90,8 @@ suite('DataScience raw kernel tests', () => {
             ioc.get<IProcessServiceFactory>(IProcessServiceFactory),
             ioc.get<IFileSystem>(IFileSystem),
             connectionInfo as any,
-            kernelSpec
+            kernelSpec,
+            undefined
         );
         await kernelProcess.launch();