sandbox - lift remoteAuthorityService to electron-sandbox

src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts → src/vs/platform/remote/electron-sandbox/remoteAuthorityResolverService.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
+//
 import { ResolvedAuthority, IRemoteAuthorityResolverService, ResolverResult, ResolvedOptions, IRemoteConnectionData } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import * as errors from 'vs/base/common/errors';
 import { RemoteAuthorities } from 'vs/base/common/network';

src/vs/workbench/electron-browser/desktop.main.ts

@@ -30,7 +30,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { registerWindowDriver } from 'vs/platform/driver/electron-browser/driver';
 import { IMainProcessService, MainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
-import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-browser/remoteAuthorityResolverService';
+import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-sandbox/remoteAuthorityResolverService';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';

src/vs/workbench/electron-sandbox/desktop.main.ts

@@ -31,8 +31,9 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import product from 'vs/platform/product/common/product';
 import { IResourceIdentityService } from 'vs/platform/resource/common/resourceIdentityService';
 import { IElectronService, ElectronService } from 'vs/platform/electron/electron-sandbox/electron';
-import { SimpleConfigurationService, simpleFileSystemProvider, SimpleLogService, SimpleRemoteAgentService, SimpleRemoteAuthorityResolverService, SimpleResourceIdentityService, SimpleSignService, SimpleStorageService, SimpleWorkbenchEnvironmentService, SimpleWorkspaceService } from 'vs/workbench/electron-sandbox/sandbox.simpleservices';
+import { SimpleConfigurationService, simpleFileSystemProvider, SimpleLogService, SimpleRemoteAgentService, SimpleResourceIdentityService, SimpleSignService, SimpleStorageService, SimpleWorkbenchEnvironmentService, SimpleWorkspaceService } from 'vs/workbench/electron-sandbox/sandbox.simpleservices';
 import { INativeWorkbenchConfiguration } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
+import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-sandbox/remoteAuthorityResolverService';
 
 class DesktopMain extends Disposable {
 
@@ -159,7 +160,7 @@ class DesktopMain extends Disposable {
 		serviceCollection.set(ILogService, logService);
 
 		// Remote
-		const remoteAuthorityResolverService = new SimpleRemoteAuthorityResolverService();
+		const remoteAuthorityResolverService = new RemoteAuthorityResolverService();
 		serviceCollection.set(IRemoteAuthorityResolverService, remoteAuthorityResolverService);
 
 		// Sign

src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts

@@ -12,7 +12,6 @@ import { ISignService } from 'vs/platform/sign/common/sign';
 import { hash } from 'vs/base/common/hash';
 import { URI } from 'vs/base/common/uri';
 import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { IRemoteAuthorityResolverService, IRemoteConnectionData, ResolvedAuthority, ResolvedOptions, ResolverResult } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { Event } from 'vs/base/common/event';
 import { IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
@@ -437,19 +436,6 @@ export class SimpleResourceIdentityService implements IResourceIdentityService {
 
 //#region Remote
 
-export class SimpleRemoteAuthorityResolverService implements IRemoteAuthorityResolverService {
-
-	declare readonly _serviceBrand: undefined;
-
-	onDidChangeConnectionData: Event<void> = Event.None;
-	resolveAuthority(authority: string): Promise<ResolverResult> { throw new Error('Method not implemented.'); }
-	getConnectionData(authority: string): IRemoteConnectionData | null { return null; }
-	_clearResolvedAuthority(authority: string): void { }
-	_setResolvedAuthority(resolvedAuthority: ResolvedAuthority, resolvedOptions?: ResolvedOptions): void { }
-	_setResolvedAuthorityError(authority: string, err: any): void { }
-	_setAuthorityConnectionToken(authority: string, connectionToken: string): void { }
-}
-
 export class SimpleRemoteAgentService implements IRemoteAgentService {
 
 	declare readonly _serviceBrand: undefined;

src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts

@@ -33,7 +33,7 @@ import { Schemas } from 'vs/base/common/network';
 import { originalFSPath, joinPath } from 'vs/base/common/resources';
 import { isLinux, isMacintosh } from 'vs/base/common/platform';
 import { RemoteAgentService } from 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
-import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-browser/remoteAuthorityResolverService';
+import { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-sandbox/remoteAuthorityResolverService';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { FileService } from 'vs/platform/files/common/fileService';
 import { NullLogService } from 'vs/platform/log/common/log';