Make findByName take an applicationCluster

Finding a workspace cluster by name only makes sense in the context of a
particular workspace cluster.

Author: Andrew Farries

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

@@ -37,9 +37,9 @@ export class WorkspaceClusterDBImpl implements WorkspaceClusterDB {
         await repo.delete(name);
     }
 
-    async findByName(name: string): Promise<WorkspaceCluster | undefined> {
+    async findByName(name: string, applicationCluster: string): Promise<WorkspaceCluster | undefined> {
         const repo = await this.getRepo();
-        return repo.findOne(name);
+        return repo.findOne({ name, applicationCluster });
     }
 
     async findFiltered(predicate: WorkspaceClusterFilter): Promise<WorkspaceClusterWoTLS[]> {

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

@@ -8,7 +8,7 @@ import * as chai from "chai";
 import { suite, test, timeout } from "mocha-typescript";
 import { testContainer } from "./test-container";
 import { TypeORM } from "./typeorm/typeorm";
-import { WorkspaceClusterDB } from "@gitpod/gitpod-protocol/lib/workspace-cluster";
+import { WorkspaceCluster, WorkspaceClusterDB } from "@gitpod/gitpod-protocol/lib/workspace-cluster";
 import { DBWorkspaceCluster } from "./typeorm/entity/db-workspace-cluster";
 const expect = chai.expect;
 
@@ -32,6 +32,34 @@ export class WorkspaceClusterDBSpec {
         await manager.clear(DBWorkspaceCluster);
     }
 
+    @test public async findByName() {
+        const wsc1: DBWorkspaceCluster = {
+            name: "eu71",
+            applicationCluster: "eu02",
+            url: "some-url",
+            state: "available",
+            score: 100,
+            maxScore: 100,
+            govern: true,
+        };
+        const wsc2: DBWorkspaceCluster = {
+            name: "us71",
+            applicationCluster: "eu02",
+            url: "some-url",
+            state: "cordoned",
+            score: 0,
+            maxScore: 0,
+            govern: false,
+        };
+
+        await this.db.save(wsc1);
+        await this.db.save(wsc2);
+
+        const wsc = await this.db.findByName("eu71", "eu02");
+        expect(wsc).not.to.be.undefined;
+        expect((wsc as WorkspaceCluster).name).to.equal("eu71");
+    }
+
     @test public async testFindFilteredByName() {
         const wsc1: DBWorkspaceCluster = {
             name: "eu71",

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

@@ -96,7 +96,7 @@ export interface WorkspaceClusterDB {
      * Finds a WorkspaceCluster with the given name. If there is none, `undefined` is returned.
      * @param name
      */
-    findByName(name: string): Promise<WorkspaceCluster | undefined>;
+    findByName(name: string, applicationCluster: string): Promise<WorkspaceCluster | undefined>;
 
     /**
      * Lists all WorkspaceClusterWoTls for which the given predicate is true (does not return TLS for size/speed concerns)

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

@@ -87,7 +87,7 @@ export class ClusterService implements IClusterServiceServer {
                 // check if the name or URL are already registered/in use
                 const req = call.request.toObject();
 
-                const clusterByNamePromise = this.clusterDB.findByName(req.name);
+                const clusterByNamePromise = this.clusterDB.findByName(req.name, this.config.installation);
                 const clusterByUrlPromise = this.clusterDB.findFiltered({
                     url: req.url,
                     applicationCluster: this.config.installation,
@@ -211,7 +211,7 @@ export class ClusterService implements IClusterServiceServer {
         this.queue.enqueue(async () => {
             try {
                 const req = call.request.toObject();
-                const cluster = await this.clusterDB.findByName(req.name);
+                const cluster = await this.clusterDB.findByName(req.name, this.config.installation);
                 if (!cluster) {
                     throw new GRPCError(
                         grpc.status.NOT_FOUND,