[server] Test RTT for available workspace cluster only

Author: csweichel

components/server/src/workspace/gitpod-server-impl.ts

@@ -56,7 +56,7 @@ import { IDEConfigService } from '../ide-config';
 import { PartialProject } from '@gitpod/gitpod-protocol/src/teams-projects-protocol';
 import { ClientMetadata } from '../websocket/websocket-connection-manager';
 import { ConfigurationService } from '../config/configuration-service';
-import { AdmissionPreferenceRegion, WorkspaceClusterDB } from '@gitpod/gitpod-protocol/lib/workspace-cluster';
+import { AdmissionPreferenceRegion } from '@gitpod/gitpod-protocol/lib/workspace-cluster';
 
 // shortcut
 export const traceWI = (ctx: TraceContext, wi: Omit<LogContext, "userId">) => TraceContext.setOWI(ctx, wi);    // userId is already taken care of in WebsocketConnectionManager
@@ -114,8 +114,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
     @inject(IDEConfigService) protected readonly ideConfigService: IDEConfigService;
 
-    @inject(WorkspaceClusterDB) protected readonly workspaceClusterDB: WorkspaceClusterDB;
-
     /** Id the uniquely identifies this server instance */
     public readonly uuid: string = uuidv4();
     public readonly clientMetadata: ClientMetadata;
@@ -2188,7 +2186,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     async listWorkspaceClusterRTTEndpoints(ctx: TraceContext): Promise<WorkspaceClusterRTTEndpoints> {
         const user = this.checkUser("listWorkspaceClusterRTTEndpoints");
 
-        const candidates = await this.workspaceClusterDB.findFiltered({state: 'available'});
+        const candidates = await this.workspaceManagerClientProvider.getAvailableStartCluster(user);
         const allEndpoints = candidates.flatMap(c => (c.admissionPreferences || []).filter(ap => ap.type === 'region')).map(ap => {
             const rap = ap as AdmissionPreferenceRegion;
             return {

components/ws-manager-api/typescript/src/client-provider.spec.ts

@@ -54,13 +54,13 @@ class TestClientProvider {
 
     @test
     public async testGetStarterWorkspaceCluster() {
-        this.expectInstallations(["a1", "a2", "a3"], await this.provider.getAvailableStartCluster({} as User, {} as Workspace, {} as WorkspaceInstance));
+        this.expectInstallations(["a1", "a2", "a3"], await this.provider.getAvailableStartCluster({} as User));
         this.expectInstallations(["a1", "a2", "a3", "con1"], await this.provider.getAvailableStartCluster({
             additionalData: {featurePreview: true}
-        } as User, {} as Workspace, {} as WorkspaceInstance));
+        } as User));
         this.expectInstallations(["a1", "a2", "a3", "con2"], await this.provider.getAvailableStartCluster({
             rolesOrPermissions: ["new-workspace-cluster"]
-        } as User, {} as Workspace, {} as WorkspaceInstance));
+        } as User));
     }
 
     public async getStartManager() {

components/ws-manager-api/typescript/src/client-provider.ts

@@ -44,7 +44,7 @@ export class WorkspaceManagerClientProvider implements Disposable {
      * @returns The WorkspaceManagerClient that was chosen to start the next workspace with.
      */
     public async getStartManager(user: ExtendedUser, workspace: Workspace, instance: WorkspaceInstance, exceptInstallations?: string[]): Promise<{ manager: PromisifiedWorkspaceManagerClient, installation: string }> {
-        let availableCluster = await this.getAvailableStartCluster(user, workspace, instance);
+        let availableCluster = await this.getAvailableStartCluster(user);
         if (!!exceptInstallations) {
             availableCluster = availableCluster.filter(c => !exceptInstallations?.includes(c.name));
         }
@@ -70,9 +70,9 @@ export class WorkspaceManagerClientProvider implements Disposable {
         };
     }
 
-    public async getAvailableStartCluster(user: User, workspace: Workspace, instance: WorkspaceInstance): Promise<WorkspaceClusterWoTLS[]> {
+    public async getAvailableStartCluster(user: User): Promise<WorkspaceClusterWoTLS[]> {
         const allClusters = await this.source.getAllWorkspaceClusters();
-        const availableClusters = allClusters.filter(c => c.score >= 0 && c.state === "available").filter(admissionConstraintsFilter(user, workspace, instance));
+        const availableClusters = allClusters.filter(c => c.score >= 0 && c.state === "available").filter(admissionConstraintsFilter(user));
         return availableClusters;
     }
 
@@ -176,7 +176,7 @@ function chooseCluster(availableCluster: WorkspaceClusterWoTLS[]): WorkspaceClus
     return availableCluster[availableCluster.length - 1];
 }
 
-function admissionConstraintsFilter(user: User, workspace: Workspace, instance: WorkspaceInstance): (c: WorkspaceClusterWoTLS) => boolean {
+function admissionConstraintsFilter(user: User, workspace?: Workspace, instance?: WorkspaceInstance): (c: WorkspaceClusterWoTLS) => boolean {
     return (c: WorkspaceClusterWoTLS) => {
         if (!c.admissionConstraints) {
             return true;