Make applicationCluster mandatory when filtering

Author: Andrew Farries

components/gitpod-db/src/typeorm/workspace-cluster-db-impl.ts

@@ -4,7 +4,7 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import { Repository, EntityManager, DeepPartial } from "typeorm";
+import { Repository, EntityManager } from "typeorm";
 import { injectable, inject } from "inversify";
 import { TypeORM } from "./typeorm";
 import { WorkspaceClusterDB } from "../workspace-cluster-db";
@@ -42,7 +42,7 @@ export class WorkspaceClusterDBImpl implements WorkspaceClusterDB {
         return repo.findOne(name);
     }
 
-    async findFiltered(predicate: DeepPartial<WorkspaceClusterFilter>): Promise<WorkspaceClusterWoTLS[]> {
+    async findFiltered(predicate: WorkspaceClusterFilter): Promise<WorkspaceClusterWoTLS[]> {
         const prototype: WorkspaceClusterWoTLS = {
             name: "",
             url: "",

components/gitpod-db/src/workspace-cluster-db.spec.db.ts

@@ -55,7 +55,7 @@ export class WorkspaceClusterDBSpec {
         await this.db.save(wsc1);
         await this.db.save(wsc2);
 
-        const wscs = await this.db.findFiltered({ name: "eu71" });
+        const wscs = await this.db.findFiltered({ name: "eu71", applicationCluster: "eu02" });
         expect(wscs.length).to.equal(1);
         expect(wscs[0].name).to.equal("eu71");
     }

components/gitpod-protocol/src/workspace-cluster.ts

@@ -102,9 +102,9 @@ export interface WorkspaceClusterDB {
      * Lists all WorkspaceClusterWoTls for which the given predicate is true (does not return TLS for size/speed concerns)
      * @param predicate
      */
-    findFiltered(predicate: DeepPartial<WorkspaceClusterFilter>): Promise<WorkspaceClusterWoTLS[]>;
-}
-export interface WorkspaceClusterFilter
-    extends Pick<WorkspaceCluster, "name" | "state" | "govern" | "url" | "applicationCluster"> {
-    minScore: number;
+    findFiltered(predicate: WorkspaceClusterFilter): Promise<WorkspaceClusterWoTLS[]>;
 }
+
+export type WorkspaceClusterFilter = Pick<WorkspaceCluster, "applicationCluster"> &
+    DeepPartial<Pick<WorkspaceCluster, "name" | "state" | "govern" | "url">> &
+    Partial<{ minScore: number }>;

components/ws-manager-bridge/src/cluster-service-server.ts

@@ -88,7 +88,10 @@ export class ClusterService implements IClusterServiceServer {
                 const req = call.request.toObject();
 
                 const clusterByNamePromise = this.clusterDB.findByName(req.name);
-                const clusterByUrlPromise = this.clusterDB.findFiltered({ url: req.url });
+                const clusterByUrlPromise = this.clusterDB.findFiltered({
+                    url: req.url,
+                    applicationCluster: this.config.installation,
+                });
 
                 const [clusterByName, clusterByUrl] = await Promise.all([clusterByNamePromise, clusterByUrlPromise]);
 
@@ -303,7 +306,9 @@ export class ClusterService implements IClusterServiceServer {
                 const response = new ListResponse();
 
                 const dbClusterIdx = new Map<string, boolean>();
-                const allDBClusters = await this.clusterDB.findFiltered({});
+                const allDBClusters = await this.clusterDB.findFiltered({
+                    applicationCluster: this.config.installation,
+                });
                 for (const cluster of allDBClusters) {
                     const clusterStatus = convertToGRPC(cluster);
                     response.addStatus(clusterStatus);

components/ws-manager-bridge/src/cluster-sync-service.ts

@@ -48,7 +48,7 @@ export class ClusterSyncService {
         }
 
         log.debug("reconciling workspace classes...");
-        let allClusters = await this.clusterDB.findFiltered({});
+        let allClusters = await this.clusterDB.findFiltered({ applicationCluster: this.config.installation });
         for (const cluster of allClusters) {
             try {
                 let supportedClasses = await getSupportedWorkspaceClasses(