Cleanup old sync extension logic

Author: jeanp413

package.json

@@ -14,7 +14,7 @@
 		"url": "https://github.com/gitpod-io/gitpod/issues"
 	},
 	"engines": {
-		"vscode": "^1.75.0"
+		"vscode": "^1.81.0"
 	},
 	"categories": [
 		"Other"
@@ -33,8 +33,6 @@
 	},
 	"activationEvents": [
 		"onResolveRemoteAuthority:ssh-remote",
-		"onCommand:gitpod.syncProvider.add",
-		"onCommand:gitpod.syncProvider.remove",
 		"onCommand:gitpod.exportLogs",
 		"onCommand:gitpod.api.autoTunnel",
 		"onCommand:gitpod.installLocalExtensions",
@@ -76,31 +74,9 @@
 						"scope": "application"
 					}
 				}
-			},
-			{
-				"title": "Settings sync",
-				"properties": {
-					"configurationSync.store": {
-						"type": "object",
-						"description": "Settings Sync Provider configuration.",
-						"scope": "application"
-					}
-				}
 			}
 		],
 		"commands": [
-			{
-				"command": "gitpod.syncProvider.add",
-				"category": "Settings Sync",
-				"enablement": "!gitpod.addedSyncProvider",
-				"title": "Enable Sign In with Gitpod"
-			},
-			{
-				"command": "gitpod.syncProvider.remove",
-				"category": "Settings Sync",
-				"enablement": "gitpod.addedSyncProvider",
-				"title": "Disable Sign In with Gitpod"
-			},
 			{
 				"command": "gitpod.exportLogs",
 				"category": "Gitpod",

src/commands/extensions.ts

@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Gitpod. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Command } from '../commandManager';
+import { IRemoteService } from '../services/remoteService';
+
+export class InstallLocalExtensionsOnRemote implements Command {
+	readonly id = 'gitpod.installLocalExtensions';
+
+	constructor(private readonly remoteService: IRemoteService) { }
+
+	async execute() {
+		await this.remoteService.initializeRemoteExtensions();
+	}
+}

src/extension.ts

@@ -11,7 +11,6 @@ import { ExperimentalSettings } from './experiments';
 import GitpodServer from './authentication/gitpodServer';
 import { NotificationService } from './services/notificationService';
 import { RemoteConnector } from './remoteConnector';
-import { SettingsSync } from './settingsSync';
 import { TelemetryService } from './services/telemetryService';
 import { RemoteSession } from './remoteSession';
 import { SSHConnectionParams, getGitpodRemoteWindowConnectionInfo } from './remote';
@@ -24,6 +23,7 @@ import { Configuration } from './configuration';
 import { RemoteService } from './services/remoteService';
 import { WorkspacesExplorerView } from './workspacesExplorerView';
 import { WorkspaceView } from './workspaceView';
+import { InstallLocalExtensionsOnRemote } from './commands/extensions';
 
 // connect-web uses fetch api, so we need to polyfill it
 if (!global.fetch) {
@@ -89,9 +89,6 @@ export async function activate(context: vscode.ExtensionContext) {
 		const experiments = new ExperimentalSettings(packageJSON.configcatKey, packageJSON.version, context, sessionService, hostService, logger);
 		context.subscriptions.push(experiments);
 
-		const settingsSync = new SettingsSync(commandManager, logger, telemetryService, notificationService);
-		context.subscriptions.push(settingsSync);
-
 		const remoteConnector = new RemoteConnector(context, sessionService, hostService, experiments, logger, telemetryService, notificationService, remoteService);
 		context.subscriptions.push(remoteConnector);
 
@@ -119,6 +116,7 @@ export async function activate(context: vscode.ExtensionContext) {
 
 		// Register global commands
 		commandManager.register(new SignInCommand(sessionService));
+		commandManager.register(new InstallLocalExtensionsOnRemote(remoteService));
 		commandManager.register(new ExportLogsCommand(context.logUri, notificationService, telemetryService, logger, hostService));
 
 		if (!context.globalState.get<boolean>(FIRST_INSTALL_KEY, false)) {

src/profileExtensions.ts

@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Gitpod. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// From https://github.com/microsoft/vscode/blob/5413247e57fb7e3d29cd36f08266005fe72bbde4/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts#L24-L30
+
+export interface IStoredProfileExtension {
+	identifier: IExtensionIdentifier;
+	location: UriComponents | string;
+	relativeLocation: string | undefined;
+	version: string;
+	metadata?: Metadata;
+}
+
+interface IExtensionIdentifier {
+	id: string;
+	uuid?: string;
+}
+
+interface UriComponents {
+	scheme: string;
+	authority?: string;
+	path?: string;
+	query?: string;
+	fragment?: string;
+}
+
+interface IGalleryMetadata {
+	id: string;
+	publisherId: string;
+	publisherDisplayName: string;
+	isPreReleaseVersion: boolean;
+	targetPlatform?: string;
+}
+
+type Metadata = Partial<IGalleryMetadata & {
+	isApplicationScoped: boolean;
+	isMachineScoped: boolean;
+	isBuiltin: boolean;
+	isSystem: boolean;
+	updated: boolean;
+	preRelease: boolean;
+	installedTimestamp: number;
+	pinned: boolean;
+}>;

src/remoteSession.ts

@@ -98,9 +98,6 @@ export class RemoteSession extends Disposable {
 			this.heartbeatManager = new HeartbeatManager(this.connectionInfo, this.workspaceState, this.sessionService, this.logService, this.telemetryService);
 
 			this.remoteService.initializeRemoteExtensions();
-			this._register(vscode.commands.registerCommand('gitpod.installLocalExtensions', () => {
-				this.remoteService.initializeRemoteExtensions();
-			}));
 
 			vscode.commands.executeCommand('setContext', 'gitpod.inWorkspace', true);
 		} catch (e) {

src/services/remoteService.ts

@@ -30,7 +30,7 @@ import { utils as sshUtils } from 'ssh2';
 import { INotificationService } from './notificationService';
 import { getOpenSSHVersion } from '../ssh/nativeSSH';
 import { retry } from '../common/async';
-import { IStoredProfileExtension } from '../settingsSync';
+import { IStoredProfileExtension } from '../profileExtensions';
 
 export interface IRemoteService {
     flow?: UserFlowTelemetryProperties;