Minor kernel picker fixes (for #13424)

microsoft · May 15, 2023 · b2415bb · b2415bb
1 parent e0ff042
commit b2415bb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/src/kernels/jupyter/finder/remoteKernelFinderController.ts b/src/kernels/jupyter/finder/remoteKernelFinderController.ts
@@ -18,7 +18,6 @@ import { KernelFinder } from '../../kernelFinder';
 import { IExtensionSyncActivationService } from '../../../platform/activation/types';
 import { RemoteKernelFinder } from './remoteKernelFinder';
 import { ContributedKernelFinderKind } from '../../internalTypes';
-import * as localize from '../../../platform/common/utils/localize';
 import { RemoteKernelSpecsCacheKey } from '../../common/commonFinder';
 import { Settings } from '../../../platform/common/constants';
 import { JupyterConnection } from '../connection/jupyterConnection';
@@ -73,7 +72,7 @@ export class RemoteKernelFinderController implements IExtensionSyncActivationSer
         if (!this.serverFinderMapping.has(serverUri.serverId)) {
             const finder = new RemoteKernelFinder(
                 `${ContributedKernelFinderKind.Remote}-${serverUri.serverId}`,
-                localize.DataScience.universalRemoteKernelFinderDisplayName(serverUri.displayName || serverUri.uri),
+                serverUri.displayName || serverUri.uri,
                 `${RemoteKernelSpecsCacheKey}-${serverUri.serverId}`,
                 this.jupyterSessionManagerFactory,
                 this.extensionChecker,

diff --git a/src/kernels/jupyter/jupyterUtils.ts b/src/kernels/jupyter/jupyterUtils.ts
@@ -132,7 +132,10 @@ export function createRemoteConnectionInfo(
         workingDirectory: serverUri?.workingDirectory,
         // For remote jupyter servers that are managed by us, we can provide the auth header.
         // Its crucial this is set to undefined, else password retrieval will not be attempted.
-        getAuthHeader: serverUri && !serverId.startsWith('_builtin') ? () => serverUri?.authorizationHeader : undefined,
+        getAuthHeader:
+            serverUri && !serverId.startsWith('_builtin') && !serverUri?.authorizationHeader
+                ? () => serverUri?.authorizationHeader
+                : undefined,
         getWebsocketProtocols:
             serverUri && !serverId.startsWith('_builtin') ? () => serverUri?.webSocketProtocols || [] : () => [],
         url: uri

diff --git a/src/kernels/jupyter/session/jupyterRequestCreator.node.ts b/src/kernels/jupyter/session/jupyterRequestCreator.node.ts
@@ -42,7 +42,9 @@ export class JupyterRequestCreator implements IJupyterRequestCreator {
             }
         }
 
-        return (getAuthHeader ? AuthorizingRequest : nodeFetch.Request) as any;
+        return (
+            getAuthHeader && Object.keys(getAuthHeader() || {}).length ? AuthorizingRequest : nodeFetch.Request
+        ) as any;
     }
 
     public getWebsocketCtor(

diff --git a/src/notebooks/controllers/kernelSource/notebookKernelSourceSelector.ts b/src/notebooks/controllers/kernelSource/notebookKernelSourceSelector.ts
@@ -231,8 +231,7 @@ export class NotebookKernelSourceSelector implements INotebookKernelSourceSelect
                         provider: provider,
                         type: KernelFinderEntityQuickPickType.UriProviderQuickPick,
                         description: undefined,
-                        originalItem: i,
-                        detail: provider.displayName
+                        originalItem: i
                     };
                 }
             );

diff --git a/src/platform/common/utils/localize.ts b/src/platform/common/utils/localize.ts
@@ -712,7 +712,6 @@ export namespace DataScience {
     export const UserJupyterServerUrlProviderDisplayName = l10n.t('Existing Jupyter Server...');
     export const UserJupyterServerUrlProviderDetail = l10n.t('Connect to an existing Jupyter Server');
     export const UserJupyterServerUrlAlreadyExistError = l10n.t('A Jupyter Server with this URL already exists');
-    export const universalRemoteKernelFinderDisplayName = (serverName: string) => l10n.t('Remote - {0}', serverName);
     export const remoteKernelFinderDisplayName = l10n.t('Current Remote');
     export const kernelPickerSelectKernelTitle = l10n.t('Select Kernel');
     export const kernelPickerSelectLocalKernelSpecTitle = l10n.t('Select a Jupyter Kernel');