Skip to content

Commit

Permalink
Remove local app
Browse files Browse the repository at this point in the history
  • Loading branch information
jeanp413 committed Sep 27, 2023
1 parent fcc9b6e commit d364417
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 536 deletions.
7 changes: 0 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"activationEvents": [
"onResolveRemoteAuthority:ssh-remote",
"onCommand:gitpod.exportLogs",
"onCommand:gitpod.api.autoTunnel",
"onCommand:gitpod.installLocalExtensions",
"onAuthenticationRequest:gitpod",
"onUri",
Expand All @@ -57,12 +56,6 @@
"default": "https://gitpod.io/",
"scope": "application"
},
"gitpod.remote.useLocalApp": {
"type": "boolean",
"description": "Use the local companion app to connect to a remote workspace.\nWarning: Connecting to a remote workspace using local companion app will be removed in the near future.",
"default": false,
"scope": "application"
},
"gitpod.lsshExtensionIpcPort": {
"type": "number",
"description": "The port to use for the local SSH ipc server.",
Expand Down
5 changes: 0 additions & 5 deletions src/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ function getGitpodHost() {
return vscode.workspace.getConfiguration('gitpod').get<string>('host') || 'https://gitpod.io/';
}

function getUseLocalApp() {
return vscode.workspace.getConfiguration('gitpod').get<boolean>('remote.useLocalApp') || false;
}

function getLocalSshExtensionIpcPort() {
let defaultPort = 43025;
if (vscode.env.appName.includes('Insiders')) {
Expand All @@ -31,7 +27,6 @@ function getSSHProxyLogLevel() {

export const Configuration = {
getGitpodHost,
getUseLocalApp,
getLocalSshExtensionIpcPort,
getSSHProxyLogLevel
};
5 changes: 2 additions & 3 deletions src/experiments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ import { ILogService } from './services/logService';
import { IHostService } from './services/hostService';
import { Disposable } from './common/dispose';

const EXPERIMENTAL_SETTINGS = [
'gitpod.remote.useLocalApp',
const EXPERIMENTAL_SETTINGS: string[] = [
// 'gitpod.remote.useLocalSSHServer',
];

export interface IExperimentsService {
getUseLocalSSHProxy(): Promise<boolean>;
getUsePublicAPI(gitpodHost: string): Promise<boolean>
getUsePublicAPI(gitpodHost: string): Promise<boolean>;
}

export class ExperimentalSettings extends Disposable implements IExperimentsService {
Expand Down
2 changes: 0 additions & 2 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ export async function activate(context: vscode.ExtensionContext) {
// Because auth provider implementation is in the same extension, we need to wait for it to activate first
sessionService.didFirstLoad.then(async () => {
if (remoteConnectionInfo) {
commandManager.register({ id: 'gitpod.api.autoTunnel', execute: () => remoteConnector.autoTunnelCommand });

remoteSession = new RemoteSession(remoteConnectionInfo.connectionInfo, context, remoteService, hostService, sessionService, experiments, logger!, telemetryService!, notificationService);
await remoteSession.initialize();
} else if (sessionService.isSignedIn()) {
Expand Down
Loading

0 comments on commit d364417

Please sign in to comment.