Make deleteByName take an applicationCluster

Deleting 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

@@ -32,9 +32,9 @@ export class WorkspaceClusterDBImpl implements WorkspaceClusterDB {
         await repo.save(cluster);
     }
 
-    async deleteByName(name: string): Promise<void> {
+    async deleteByName(name: string, applicationCluster: string): Promise<void> {
         const repo = await this.getRepo();
-        await repo.delete(name);
+        await repo.delete({ name, applicationCluster });
     }
 
     async findByName(name: string, applicationCluster: string): Promise<WorkspaceCluster | undefined> {

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

@@ -55,9 +55,49 @@ export class WorkspaceClusterDBSpec {
         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");
+        // Can find the eu71 cluster as seen by the eu02 application cluster.
+        const result = await this.db.findByName("eu71", "eu02");
+        expect(result).not.to.be.undefined;
+        expect((result as WorkspaceCluster).name).to.equal("eu71");
+
+        // Can't find the eu71 cluster as seen by the us02 application cluster.
+        // (no record in the db for that (ws-cluster, app-cluster) combination).
+        const result2 = await this.db.findByName("eu71", "us02");
+        expect(result2).to.be.undefined;
+
+        // Can find the us71 cluster as seen by the eu02 application cluster.
+        const result3 = await this.db.findByName("us71", "eu02");
+        expect(result3).not.to.be.undefined;
+        expect((result3 as WorkspaceCluster).name).to.equal("us71");
+    }
+
+    @test public async deleteByName() {
+        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);
+
+        // Can delete the eu71 cluster as seen by the eu02 application cluster.
+        await this.db.deleteByName("eu71", "eu02");
+        expect(await this.db.findByName("eu71", "eu02")).to.be.undefined;
+        expect(await this.db.findByName("us71", "eu02")).not.to.be.undefined;
     }
 
     @test public async testFindFilteredByName() {

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

@@ -90,7 +90,7 @@ export interface WorkspaceClusterDB {
      * Deletes the cluster identified by this name, if any.
      * @param name
      */
-    deleteByName(name: string): Promise<void>;
+    deleteByName(name: string, applicationCluster: string): Promise<void>;
 
     /**
      * Finds a WorkspaceCluster with the given name. If there is none, `undefined` is returned.

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

@@ -288,7 +288,7 @@ export class ClusterService implements IClusterServiceServer {
                     );
                 }
 
-                await this.clusterDB.deleteByName(req.name);
+                await this.clusterDB.deleteByName(req.name, this.config.installation);
                 log.info({}, "cluster deregistered", { cluster: req.name });
                 this.triggerReconcile("deregister", req.name);