Always update remotePlatform for gitpodHost's wildcard

Author: mustard-mh

src/extension.ts

@@ -79,6 +79,7 @@ export async function activate(context: vscode.ExtensionContext) {
 
 		const hostService = new HostService(context, notificationService, logger);
 		context.subscriptions.push(hostService);
+		await hostService.updateSSHRemotePlatform();
 
 		const sessionService = new SessionService(hostService, logger);
 		context.subscriptions.push(sessionService);

src/remoteConnector.ts

@@ -21,7 +21,6 @@ import { INotificationService } from './services/notificationService';
 import { SSHKey } from '@gitpod/public-api/lib/gitpod/experimental/v1/user_pb';
 import { getAgentSock, SSHError, testSSHConnection as testSSHGatewayConnection } from './sshTestConnection';
 import { gatherIdentityFiles } from './ssh/identityFiles';
-import { isWindows } from './common/platform';
 import SSHDestination from './ssh/sshDestination';
 import { NoRunningInstanceError, NoSSHGatewayError, SSHConnectionParams, SSH_DEST_KEY, getLocalSSHDomain } from './remote';
 import { ISessionService } from './services/sessionService';
@@ -361,14 +360,6 @@ export class RemoteConnector extends Disposable {
 
 				await this.context.globalState.update(`${SSH_DEST_KEY}${sshDestination!.toRemoteSSHString()}`, { ...params } as SSHConnectionParams);
 
-				// Force Linux as host platform (https://github.com/gitpod-io/gitpod/issues/16058)
-				if (isWindows) {
-					const existingSSHHostPlatforms = vscode.workspace.getConfiguration('remote.SSH').get<{ [host: string]: string }>('remotePlatform', {});
-					if (!existingSSHHostPlatforms[sshDestination!.hostname]) {
-						await vscode.workspace.getConfiguration('remote.SSH').update('remotePlatform', { ...existingSSHHostPlatforms, [sshDestination!.hostname]: 'linux' }, vscode.ConfigurationTarget.Global);
-					}
-				}
-
 				return sshDestination;
 			}
 		);

src/services/hostService.ts

@@ -17,6 +17,7 @@ export interface IHostService {
     onDidChangeHost: vscode.Event<void>;
 
     changeHost(newHost: string, force?: boolean): Promise<boolean>;
+    updateSSHRemotePlatform(): Promise<void>;
 }
 
 export class HostService extends Disposable implements IHostService {
@@ -51,6 +52,7 @@ export class HostService extends Disposable implements IHostService {
                 if (new URL(this._gitpodHost).host !== new URL(newGitpodHost).host) {
                     this._gitpodHost = newGitpodHost;
                     this._onDidChangeHost.fire();
+                    this.updateSSHRemotePlatform().then(() => {});
                 }
             }
         }));
@@ -78,4 +80,18 @@ export class HostService extends Disposable implements IHostService {
         }
         return true;
     }
+
+    // Force Linux as host platform (https://github.com/gitpod-io/gitpod/issues/16058)
+    async updateSSHRemotePlatform() {
+        try {
+            const hostname = '*.' + (new URL(this.gitpodHost)).hostname;
+            const existingSSHHostPlatforms = vscode.workspace.getConfiguration('remote.SSH').get<{ [host: string]: string }>('remotePlatform', {});
+            const targetPlatform = 'linux';
+            if (!existingSSHHostPlatforms[hostname] || existingSSHHostPlatforms[hostname] !== targetPlatform) {
+                await vscode.workspace.getConfiguration('remote.SSH').update('remotePlatform', { ...existingSSHHostPlatforms, [hostname]: targetPlatform }, vscode.ConfigurationTarget.Global);
+            }
+        } catch (error) {
+            this.logService.error('Error updating remotePlatform configuration', error);
+        }
+    }
 }