remove hardcoded remote tunnels extension (microsoft#167071)

Author: aeschli

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.74.0",
-  "distro": "bb29bde154b2858044ba263f32d63d3fe38b35e7",
+  "distro": "221540098c17ef4e6f2f2bf40dfcf234a2e83c44",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -237,4 +237,4 @@
     "elliptic": "^6.5.3",
     "nwmatcher": "^1.4.4"
   }
-}
+}

src/vs/base/common/product.ts

@@ -133,10 +133,7 @@ export interface IProductConfiguration {
 	readonly serverDataFolderName?: string;
 
 	readonly tunnelApplicationName?: string;
-	readonly tunnelApplicationConfig?: {
-		authenticationProviders: IStringDictionary<{ scopes: string[] }>;
-		editorWebUrl: string;
-	};
+	readonly tunnelApplicationConfig?: ITunnelApplicationConfig;
 
 	readonly npsSurveyUrl?: string;
 	readonly cesSurveyUrl?: string;
@@ -169,6 +166,12 @@ export interface IProductConfiguration {
 	readonly enableSyncingProfiles?: boolean;
 }
 
+export interface ITunnelApplicationConfig {
+	authenticationProviders: IStringDictionary<{ scopes: string[] }>;
+	editorWebUrl: string;
+	extension: IRemoteExtensionTip;
+}
+
 export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean; whenNotInstalled?: string[] };
 
 export interface IAppCenterConfiguration {

src/vs/platform/remoteTunnel/common/remoteTunnel.ts

@@ -56,7 +56,6 @@ export interface ConnectionInfo {
 	link: string;
 	domain: string;
 	hostName: string;
-	extensionId: string;
 }
 
 export const CONFIGURATION_KEY_PREFIX = 'remote.tunnels.access';

src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts

@@ -191,7 +191,7 @@ export class RemoteTunnelService extends Disposable implements IRemoteTunnelServ
 			}
 			const m = message.match(/^\s*Open this link in your browser (https:\/\/([^\/\s]+)\/([^\/\s]+)\/([^\/\s]+))/);
 			if (m) {
-				const info: ConnectionInfo = { link: m[1], domain: m[2], extensionId: 'ms-vscode.remote-server', hostName: m[4] };
+				const info: ConnectionInfo = { link: m[1], domain: m[2], hostName: m[4] };
 				this.setTunnelStatus(TunnelStates.connected(info));
 			} else if (message.match(/error refreshing token/)) {
 				serveCommand.cancel();

src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts

@@ -19,7 +19,6 @@ import { IStorageService, IStorageValueChangeEvent, StorageScope, StorageTarget
 import { ILogger, ILoggerService, ILogService } from 'vs/platform/log/common/log';
 import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IStringDictionary } from 'vs/base/common/collections';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { IOutputService, registerLogChannel } from 'vs/workbench/services/output/common/output';
 import { IFileService } from 'vs/platform/files/common/files';
@@ -37,6 +36,7 @@ import { Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { joinPath } from 'vs/base/common/resources';
 import { join } from 'vs/base/common/path';
+import { ITunnelApplicationConfig } from 'vs/base/common/product';
 
 export const REMOTE_TUNNEL_CATEGORY: ILocalizedString = {
 	original: 'Remote Tunnels',
@@ -80,7 +80,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 
 	private readonly connectionStateContext: IContextKey<CONTEXT_KEY_STATES>;
 
-	private readonly serverConfiguration: { authenticationProviders: IStringDictionary<{ scopes: string[] }> };
+	private readonly serverConfiguration: ITunnelApplicationConfig;
 
 	#authenticationSessionId: string | undefined;
 	private connectionInfo: ConnectionInfo | undefined;
@@ -115,7 +115,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 		const serverConfiguration = productService.tunnelApplicationConfig;
 		if (!serverConfiguration || !productService.tunnelApplicationName) {
 			this.logger.error('Missing \'tunnelApplicationConfig\' or \'tunnelApplicationName\' in product.json. Remote tunneling is not available.');
-			this.serverConfiguration = { authenticationProviders: {} };
+			this.serverConfiguration = { authenticationProviders: {}, editorWebUrl: '', extension: { extensionId: '', friendlyName: '' } };
 			return;
 		}
 		this.serverConfiguration = serverConfiguration;
@@ -422,16 +422,23 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 				const connectionInfo = await that.startTunnel(false);
 				if (connectionInfo) {
 					const linkToOpen = that.getLinkToOpen(connectionInfo);
+					const remoteExtension = that.serverConfiguration.extension;
 					await notificationService.notify({
 						severity: Severity.Info,
-						message: localize({ key: 'progress.turnOn.final', comment: ['{0} will be a host name, {1} will the link address to the web UI. [label](command:commandId) is a markdown lionk. Only translate label, never change the format'] },
-							"Remote tunnel access is enabled for [{0}](command:{4}). To access from a different machine, open [{1}]({2}) or use the Remote - Tunnels extension. Use the Account menu to [configure](command:{3}) or [turn off](command:{5}).",
-							connectionInfo.hostName, connectionInfo.domain, linkToOpen, RemoteTunnelCommandIds.manage, RemoteTunnelCommandIds.configure, RemoteTunnelCommandIds.turnOff),
+						message:
+							localize(
+								{
+									key: 'progress.turnOn.final',
+									comment: ['{0} will be a host name, {1} will the link address to the web UI, {6} an extesnion name. [label](command:commandId) is a markdown link. Only translate the label, do not modify the format']
+								},
+								"Remote tunnel access is enabled for [{0}](command:{4}). To access from a different machine, open [{1}]({2}) or use the {6} extension. Use the Account menu to [configure](command:{3}) or [turn off](command:{5}).",
+								connectionInfo.hostName, connectionInfo.domain, linkToOpen, RemoteTunnelCommandIds.manage, RemoteTunnelCommandIds.configure, RemoteTunnelCommandIds.turnOff, remoteExtension.friendlyName
+							),
 						actions: {
 							primary: [
 								new Action('copyToClipboard', localize('action.copyToClipboard', "Copy Browser Link to Clipboard"), undefined, true, () => clipboardService.writeText(linkToOpen)),
 								new Action('showExtension', localize('action.showExtension', "Show Extension"), undefined, true, () => {
-									return commandService.executeCommand('workbench.extensions.action.showExtensionsWithIds', ['ms-vscode.remote-server']);
+									return commandService.executeCommand('workbench.extensions.action.showExtensionsWithIds', [remoteExtension.extensionId]);
 								})
 							]
 						}
@@ -440,7 +447,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 					await notificationService.notify({
 						severity: Severity.Info,
 						message: localize('progress.turnOn.failed',
-							"Unable to turn on the remote tunnel access. Check the Remote Tunnel log for details."),
+							"Unable to turn on the remote tunnel access. Check the Remote Tunnel Service log for details."),
 					});
 					await commandService.executeCommand(RemoteTunnelCommandIds.showLog);
 				}
@@ -622,7 +629,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 			items.push({ id: RemoteTunnelCommandIds.learnMore, label: RemoteTunnelCommandLabels.learnMore });
 			if (this.connectionInfo && account) {
 				quickPick.title = localize(
-					{ key: 'manage.title.on', comment: ['{0} will be a user account name, {1} the provider name (e.g. Github), {2} is the machine name'] },
+					{ key: 'manage.title.on', comment: ['{0} will be a user account name, {1} the provider name (e.g. Github), {2} is the host name'] },
 					'Remote Machine Access enabled for {0}({1}) as {2}', account.label, account.description, this.connectionInfo.hostName);
 				items.push({ id: RemoteTunnelCommandIds.copyToClipboard, label: RemoteTunnelCommandLabels.copyToClipboard, description: this.connectionInfo.domain });
 			} else {