Skip to content

Commit d5e2cf5

Browse files
jeanp413jeanp413
authored
Rename Gitpod to Gitpod Classic (#123)
* Rename Gitpod to Gitpod Classic * 🆙 bump version
1 parent 281b506 commit d5e2cf5

File tree

10 files changed

+53
-53
lines changed

10 files changed

+53
-53
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Gitpod Classic
22

3-
> **Note**: If you’re looking for the [Gitpod Flex](https://app.gitpod.io) experience, please install the [Gitpod Flex extension](https://marketplace.visualstudio.com/items?itemName=gitpod.gitpod-flex). For [Gitpod Classic](https://gitpod.io/workspaces) workspaces, this is the extension you need.
3+
> **Note**: If you’re looking for the [Gitpod](https://app.gitpod.io) experience, please install the [Gitpod extension](https://marketplace.visualstudio.com/items?itemName=gitpod.gitpod-flex). For [Gitpod Classic](https://gitpod.io/workspaces) workspaces, this is the extension you need.
44
5-
Gitpod is an open-source Kubernetes application for automated and ready-to-code development environments that blends in your existing workflow. It enables you to describe your dev environment as code and start instant and fresh development environments for each new task directly from your browser.
5+
Gitpod Classic is an open-source Kubernetes application for automated and ready-to-code development environments that blends in your existing workflow. It enables you to describe your dev environment as code and start instant and fresh development environments for each new task directly from your browser.
66

77
Tightly integrated with GitLab, GitHub, and Bitbucket, Gitpod automatically and continuously prebuilds dev environments for all your branches. As a result, team members can instantly start coding with fresh, ephemeral and fully-compiled dev environments - no matter if you are building a new feature, want to fix a bug or do a code review.
88

99
![image](https://user-images.githubusercontent.com/120486/116072013-40a8aa00-a697-11eb-846b-89e6f5e1a82e.png)
1010

1111
## Getting Started
1212

13-
You can open a Gitpod workspace with VS Code Desktop in two different ways:
13+
You can open a Gitpod Classic workspace with VS Code Desktop in two different ways:
1414
- From your [user preferences](https://gitpod.io/preferences), you can select `VS Code Desktop` as your preferred IDE and you will always start your workspaces automatically with it.
1515
- Ad hoc, from within VS Code Browser, by opening the Command Pallete (<kbd>F1</kbd>) and searching for <kbd>Open in VS Code</kbd> if you already have a running workspace already.
1616

@@ -32,6 +32,6 @@ You can also follow [`@gitpod`](https://twitter.com/gitpod) for announcements an
3232

3333
## Issues
3434

35-
The issue tracker is used for tracking **bug reports** and **feature requests** for the Gitpod open source project as well as planning current and future development efforts. 🗺️
35+
The issue tracker is used for tracking **bug reports** and **feature requests** for the Gitpod Classic open source project as well as planning current and future development efforts. 🗺️
3636

3737
You can upvote [popular feature requests](https://github.com/gitpod-io/gitpod/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc) or [create a new one](https://github.com/gitpod-io/gitpod/issues/new?template=feature_request.md).

‎package.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "gitpod-desktop",
3-
"displayName": "Gitpod",
3+
"displayName": "Gitpod Classic",
44
"description": "Required to connect to Classic workspaces",
55
"publisher": "gitpod",
6-
"version": "0.0.183",
6+
"version": "0.0.184",
77
"license": "MIT",
88
"icon": "resources/gitpod.png",
99
"repository": {
@@ -42,17 +42,17 @@
4242
"contributes": {
4343
"authentication": [
4444
{
45-
"label": "Gitpod",
45+
"label": "Gitpod Classic",
4646
"id": "gitpod"
4747
}
4848
],
4949
"configuration": [
5050
{
51-
"title": "Gitpod",
51+
"title": "Gitpod Classic",
5252
"properties": {
5353
"gitpod.host": {
5454
"type": "string",
55-
"description": "Gitpod Service URL. Update this if you are using a Gitpod self-hosted installation.",
55+
"description": "Gitpod Classic Service URL. Update this if you are using a Gitpod Classic self-hosted installation.",
5656
"default": "https://gitpod.io/",
5757
"scope": "application"
5858
},
@@ -77,116 +77,116 @@
7777
"commands": [
7878
{
7979
"command": "gitpod.exportLogs",
80-
"category": "Gitpod",
80+
"category": "Gitpod Classic",
8181
"title": "Export all logs"
8282
},
8383
{
8484
"command": "gitpod.installLocalExtensions",
8585
"title": "Install Local Extensions...",
86-
"category": "Gitpod",
86+
"category": "Gitpod Classic",
8787
"enablement": "gitpod.inWorkspace == true"
8888
},
8989
{
9090
"command": "gitpod.signIn",
91-
"category": "Gitpod",
91+
"category": "Gitpod Classic",
9292
"title": "Sign In"
9393
},
9494
{
9595
"command": "gitpod.workspaces.refresh",
96-
"category": "Gitpod",
96+
"category": "Gitpod Classic",
9797
"title": "Refresh",
9898
"icon": "$(refresh)"
9999
},
100100
{
101101
"command": "gitpod.workspaces.connectInNewWindow",
102-
"category": "Gitpod",
102+
"category": "Gitpod Classic",
103103
"title": "Open Workspace in New Window"
104104
},
105105
{
106106
"command": "gitpod.workspaces.connectInNewWindow_context",
107-
"category": "Gitpod",
107+
"category": "Gitpod Classic",
108108
"title": "Open in New Window"
109109
},
110110
{
111111
"command": "gitpod.workspaces.connectInCurrentWindow",
112-
"category": "Gitpod",
112+
"category": "Gitpod Classic",
113113
"title": "Connect to Workspace"
114114
},
115115
{
116116
"command": "gitpod.workspaces.connectInCurrentWindow_context",
117-
"category": "Gitpod",
117+
"category": "Gitpod Classic",
118118
"title": "Start and Connect"
119119
},
120120
{
121121
"command": "gitpod.workspaces.connectInCurrentWindow_context@1",
122-
"category": "Gitpod",
122+
"category": "Gitpod Classic",
123123
"title": "Connect"
124124
},
125125
{
126126
"command": "gitpod.workspaces.connectInCurrentWindow_inline",
127-
"category": "Gitpod",
127+
"category": "Gitpod Classic",
128128
"title": "Start and Connect",
129129
"icon": "$(arrow-right)"
130130
},
131131
{
132132
"command": "gitpod.workspaces.connectInCurrentWindow_inline@1",
133-
"category": "Gitpod",
133+
"category": "Gitpod Classic",
134134
"title": "Connect",
135135
"icon": "$(arrow-right)"
136136
},
137137
{
138138
"command": "gitpod.workspaces.stopWorkspace",
139-
"category": "Gitpod",
139+
"category": "Gitpod Classic",
140140
"title": "Stop Workspace",
141141
"icon": "$(primitive-square)"
142142
},
143143
{
144144
"command": "gitpod.workspaces.stopWorkspace_context",
145-
"category": "Gitpod",
145+
"category": "Gitpod Classic",
146146
"title": "Stop",
147147
"icon": "$(primitive-square)"
148148
},
149149
{
150150
"command": "gitpod.workspaces.stopWorkspace_inline",
151-
"category": "Gitpod",
151+
"category": "Gitpod Classic",
152152
"title": "Stop",
153153
"icon": "$(primitive-square)"
154154
},
155155
{
156156
"command": "gitpod.workspaces.stopCurrentWorkspace_inline",
157-
"category": "Gitpod",
157+
"category": "Gitpod Classic",
158158
"title": "Disconnect and Stop",
159159
"icon": "$(primitive-square)"
160160
},
161161
{
162162
"command": "gitpod.workspaces.stopCurrentWorkspace",
163-
"category": "Gitpod",
163+
"category": "Gitpod Classic",
164164
"title": "Stop Current Workspace",
165165
"icon": "$(primitive-square)"
166166
},
167167
{
168168
"command": "gitpod.workspaces.openInBrowser",
169-
"category": "Gitpod",
169+
"category": "Gitpod Classic",
170170
"title": "Open in Browser"
171171
},
172172
{
173173
"command": "gitpod.workspaces.openContext",
174-
"category": "Gitpod",
174+
"category": "Gitpod Classic",
175175
"title": "Open Context"
176176
},
177177
{
178178
"command": "gitpod.workspaces.deleteWorkspace",
179-
"category": "Gitpod",
179+
"category": "Gitpod Classic",
180180
"title": "Delete Workspace"
181181
},
182182
{
183183
"command": "gitpod.workspaces.deleteWorkspace_context",
184-
"category": "Gitpod",
184+
"category": "Gitpod Classic",
185185
"title": "Delete"
186186
},
187187
{
188188
"command": "gitpod.workspaces.disconnect",
189-
"category": "Gitpod",
189+
"category": "Gitpod Classic",
190190
"title": "Disconnect",
191191
"icon": "$(debug-disconnect)"
192192
}
@@ -355,7 +355,7 @@
355355
"activitybar": [
356356
{
357357
"id": "gitpod-view",
358-
"title": "Gitpod",
358+
"title": "Gitpod Classic",
359359
"icon": "resources/explorer.svg"
360360
}
361361
]
@@ -382,7 +382,7 @@
382382
},
383383
{
384384
"id": "gitpod-flex-help",
385-
"name": "Looking for Gitpod Flex?",
385+
"name": "Looking for Gitpod?",
386386
"icon": "$(squirrel)",
387387
"when": "gitpod.host === 'https://gitpod.io'"
388388
}
@@ -392,11 +392,11 @@
392392
{
393393
"view": "gitpod-login",
394394
"when": "gitpod.authenticated != true && !gitpod.inGitpodFlexRemoteWindow",
395-
"contents": "You have not yet signed in with Gitpod\n[Sign in](command:gitpod.signIn)"
395+
"contents": "You have not yet signed in with Gitpod Classic\n[Sign in](command:gitpod.signIn)"
396396
},
397397
{
398398
"view": "gitpod-flex-help",
399-
"contents": "Connecting to Gitpod Flex environments requires installing the [Gitpod Flex extension](https://marketplace.visualstudio.com/items?itemName=gitpod.gitpod-flex) and opening them through the [Gitpod Flex](https://app.gitpod.io/).\nThis view is only to manage [Gitpod Classic](https://gitpod.io/workspaces) workspaces."
399+
"contents": "Connecting to Gitpod environments requires installing the [Gitpod extension](https://marketplace.visualstudio.com/items?itemName=gitpod.gitpod-flex) and opening them through the [Gitpod](https://app.gitpod.io/).\nThis view is only to manage [Gitpod Classic](https://gitpod.io/workspaces) workspaces."
400400
}
401401
]
402402
},

‎src/authentication/authentication.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default class GitpodAuthenticationProvider extends Disposable implements
5656
// Contains the current state of the sessions we have available.
5757
this._sessionsPromise = this.readSessions();
5858

59-
this._register(vscode.authentication.registerAuthenticationProvider('gitpod', 'Gitpod', this, { supportsMultipleAccounts: false }));
59+
this._register(vscode.authentication.registerAuthenticationProvider('gitpod', 'Gitpod Classic', this, { supportsMultipleAccounts: false }));
6060
this._register(this.context.secrets.onDidChange(() => this.checkForUpdates()));
6161
}
6262

‎src/extension.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export async function activate(context: vscode.ExtensionContext) {
5252
try {
5353
const params: SSHConnectionParams = JSON.parse(uri.query);
5454
const openNewWindow = 'Use New Window';
55-
vscode.window.showWarningMessage(`We cannot open Gitpod workspace on ${params.gitpodHost} from a Gitpod Flex environment window.`, { modal: true }, openNewWindow)
55+
vscode.window.showWarningMessage(`We cannot open a Gitpod Classic workspace on ${params.gitpodHost} from a Gitpod environment window.`, { modal: true }, openNewWindow)
5656
.then(action => {
5757
if (action === openNewWindow) {
5858
vscode.commands.executeCommand('vscode.newWindow', { remoteAuthority: null });
@@ -68,7 +68,7 @@ export async function activate(context: vscode.ExtensionContext) {
6868
let remoteConnectionInfo: { connectionInfo: SSHConnectionParams; remoteUri: vscode.Uri; sshDestStr: string } | undefined;
6969
let success = false;
7070
try {
71-
logger = vscode.window.createOutputChannel('Gitpod', { log: true });
71+
logger = vscode.window.createOutputChannel('Gitpod Classic', { log: true });
7272
context.subscriptions.push(logger);
7373

7474
// always try to create extension globalStorage folder

‎src/remoteConnector.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export class RemoteConnector extends Disposable {
130130
const parsedKey = parsedResult as ParsedKey;
131131
return { name: k.name, fingerprint: crypto.createHash('sha256').update(parsedKey.getPublicSSH()).digest('base64') };
132132
});
133-
this.logService.trace(`Registered public keys in Gitpod account:`, registeredKeys.length ? registeredKeys.map(k => `${k.name} SHA256:${k.fingerprint}`).join('\n') : 'None');
133+
this.logService.trace(`Registered public keys in Gitpod Classic account:`, registeredKeys.length ? registeredKeys.map(k => `${k.name} SHA256:${k.fingerprint}`).join('\n') : 'None');
134134

135135
identityKeys = identityKeys.filter(k => !!registeredKeys.find(regKey => regKey.fingerprint === k.fingerprint));
136136
} else {
@@ -187,7 +187,7 @@ export class RemoteConnector extends Disposable {
187187
const install = 'Install';
188188
const cancel = 'Cancel';
189189

190-
const action = await this.notificationService.showInformationMessage('Please install "Remote - SSH" extension to connect to a Gitpod workspace.', { id: 'install_remote_ssh', flow }, install, cancel);
190+
const action = await this.notificationService.showInformationMessage('Please install "Remote - SSH" extension to connect to a Gitpod Classic workspace.', { id: 'install_remote_ssh', flow }, install, cancel);
191191
if (action === cancel) {
192192
return false;
193193
}
@@ -209,7 +209,7 @@ export class RemoteConnector extends Disposable {
209209
const configureSSH: vscode.MessageItem = { title: 'Configure SSH' };
210210
const showLogs: vscode.MessageItem = { title: 'Show logs', isCloseAffordance: true };
211211
const message = sshKeysSupported
212-
? `You don't have registered any SSH public key for this machine in your Gitpod account.\nAlternatively, copy and use this temporary password until workspace restart: ${maskedPassword}`
212+
? `You don't have registered any SSH public key for this machine in your Gitpod Classic account.\nAlternatively, copy and use this temporary password until workspace restart: ${maskedPassword}`
213213
: `An SSH key is required for passwordless authentication.\nAlternatively, copy and use this password: ${maskedPassword}`;
214214
const action = await this.notificationService.showWarningMessage(message, { flow, modal: true, id: 'ssh_gateway_modal' }, copy, configureSSH, showLogs);
215215

@@ -255,7 +255,7 @@ export class RemoteConnector extends Disposable {
255255
sshFlow.userId = this.sessionService.getUserId();
256256
sshFlow.useLocalSSH = useLocalSSH;
257257

258-
this.logService.info('Opening Gitpod workspace', uri.toString());
258+
this.logService.info('Opening Gitpod Classic workspace', uri.toString());
259259

260260
const sshDestination = await vscode.window.withProgress(
261261
{
@@ -291,7 +291,7 @@ export class RemoteConnector extends Disposable {
291291
const reason = e?.code ?? (e?.name && e.name !== 'Error' ? e.name : 'Unknown');
292292
this.telemetryService.sendTelemetryException(new WrapError('Local SSH: failed to connect to workspace', e), { ...localSSHFlow });
293293
this.telemetryService.sendUserFlowStatus('failed', { ...localSSHFlow, reason });
294-
this.logService.error(`Local SSH: failed to connect to ${params.workspaceId} Gitpod workspace:`, e);
294+
this.logService.error(`Local SSH: failed to connect to ${params.workspaceId} Gitpod Classic workspace:`, e);
295295
}
296296

297297
let sshDestination: SSHDestination | undefined;
@@ -329,19 +329,19 @@ export class RemoteConnector extends Disposable {
329329
this.logService.error('No Running instance:');
330330
this.logService.error(e);
331331
gatewayFlow['phase'] = e.phase;
332-
this.notificationService.showErrorMessage(`Failed to connect to ${e.workspaceId} Gitpod workspace: workspace not running`, { flow: gatewayFlow, id: 'no_running_instance' });
332+
this.notificationService.showErrorMessage(`Failed to connect to ${e.workspaceId} Gitpod Classic workspace: workspace not running`, { flow: gatewayFlow, id: 'no_running_instance' });
333333
return undefined;
334334
} else {
335335
if (e instanceof SSHError) {
336336
this.logService.error('SSH test connection error:');
337337
} else {
338-
this.logService.error(`Failed to connect to ${params.workspaceId} Gitpod workspace:`);
338+
this.logService.error(`Failed to connect to ${params.workspaceId} Gitpod Classic workspace:`);
339339
}
340340
this.logService.error(e);
341341

342342
const seeLogs = 'See Logs';
343343
const showTroubleshooting = 'Show Troubleshooting';
344-
this.notificationService.showErrorMessage(`Failed to connect to ${params.workspaceId} Gitpod workspace`, { flow: gatewayFlow, id: 'failed_to_connect' }, seeLogs, showTroubleshooting)
344+
this.notificationService.showErrorMessage(`Failed to connect to ${params.workspaceId} Gitpod Classic workspace`, { flow: gatewayFlow, id: 'failed_to_connect' }, seeLogs, showTroubleshooting)
345345
.then(action => {
346346
if (action === seeLogs) {
347347
this.logService.show();

‎src/remoteSession.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export class RemoteSession extends Disposable {
104104

105105
this.logService.show();
106106
const retry = 'Retry';
107-
const action = await this.notificationService.showErrorMessage(`Failed to resolve connection to Gitpod workspace: workspace could stop unexpectedly`, { flow: remoteFlow, id: 'unexpected_error' }, retry);
107+
const action = await this.notificationService.showErrorMessage(`Failed to resolve connection to Gitpod Classic workspace: workspace could stop unexpectedly`, { flow: remoteFlow, id: 'unexpected_error' }, retry);
108108
if (action === retry) {
109109
this.initialize();
110110
}
@@ -124,7 +124,7 @@ export class RemoteSession extends Disposable {
124124
}
125125

126126
private showSignInDialog() {
127-
this.notificationService.showErrorMessage(`You are not signed in with a Gitpod account, please sign in first.`, { flow: { flow: 'remote_window', gitpodHost: this.connectionInfo.gitpodHost }, id: 'not_signed_in', modal: true });
127+
this.notificationService.showErrorMessage(`You are not signed in with a Gitpod Classic account, please sign in first.`, { flow: { flow: 'remote_window', gitpodHost: this.connectionInfo.gitpodHost }, id: 'not_signed_in', modal: true });
128128
}
129129

130130
public override async dispose(): Promise<void> {

‎src/services/hostService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class HostService extends Disposable implements IHostService {
7979

8080
const yes = 'Yes';
8181
const cancel = 'Cancel';
82-
const action = await this.notificationService.showInformationMessage(`Would you like to change your Gitpod host from '${this._gitpodHost}' to '${newHost}' and continue?`, { id: 'switch_gitpod_host', flow }, yes, cancel);
82+
const action = await this.notificationService.showInformationMessage(`Would you like to change your Gitpod Classic host from '${this._gitpodHost}' to '${newHost}' and continue?`, { id: 'switch_gitpod_host', flow }, yes, cancel);
8383
if (action === cancel) {
8484
return false;
8585
}

‎src/services/remoteService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ export class RemoteService extends Disposable implements IRemoteService {
299299
const parsedKey = parsedResult as ParsedKey;
300300
return { name: k.name, fingerprint: crypto.createHash('sha256').update(parsedKey.getPublicSSH()).digest('base64') };
301301
});
302-
this.logService.trace(`Registered public keys in Gitpod account:`, registeredKeys.length ? registeredKeys.map(k => `${k.name} SHA256:${k.fingerprint}`).join('\n') : 'None');
302+
this.logService.trace(`Registered public keys in Gitpod Classic account:`, registeredKeys.length ? registeredKeys.map(k => `${k.name} SHA256:${k.fingerprint}`).join('\n') : 'None');
303303

304304
identityKeys = identityKeys.filter(k => !!registeredKeys.find(regKey => regKey.fingerprint === k.fingerprint));
305305

@@ -315,7 +315,7 @@ export class RemoteService extends Disposable implements IRemoteService {
315315
const copy: vscode.MessageItem = { title: 'Copy' };
316316
const configureSSH: vscode.MessageItem = { title: 'Configure SSH' };
317317
const showLogs: vscode.MessageItem = { title: 'Show logs', isCloseAffordance: true };
318-
const message = `You don't have registered any SSH public key for this machine in your Gitpod account.\nAlternatively, copy and use this temporary password until workspace restart: ${maskedPassword}`;
318+
const message = `You don't have registered any SSH public key for this machine in your Gitpod Classic account.\nAlternatively, copy and use this temporary password until workspace restart: ${maskedPassword}`;
319319
const flow = { flow: 'ssh', gitpodHost: this.hostService.gitpodHost, kind: 'gateway', workspaceId, openSSHVersion: await getOpenSSHVersion(), userId: this.sessionService.getUserId() };
320320
const action = await this.notificationService.showWarningMessage(message, { flow, modal: true, id: 'ssh_gateway_modal' }, copy, configureSSH, showLogs);
321321

‎src/services/sessionService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { arrayEquals } from '../common/utils';
1313

1414
export class NoSignedInError extends Error {
1515
constructor() {
16-
super(`You are not signed in with your Gitpod account`);
16+
super(`You are not signed in with your Gitpod Classic account`);
1717
}
1818
}
1919

0 commit comments

Comments
 (0)