[server, db] Fix BlockedRepository.delete

Author: geropl

components/gitpod-db/src/blocked-repository-db.spec.db.ts

@@ -35,26 +35,6 @@ class BlockedRepositoryDBSpec {
         expect(blockedRepository.blockUser).eq(true);
     }
 
-    @test(timeout(10000))
-    public async canDeleteABlockedRepository() {
-        const blockedRepository = await this.blockedRepositoryDb.createBlockedRepository("github.com/bob/*/", true);
-
-        const result = await this.blockedRepositoryDb.deleteBlockedRepository(blockedRepository.id);
-
-        expect(result).eq(true);
-        expect(await this.blockedRepositoryDb.findBlockedRepositoryByURL("github.com/bob/some-repo")).undefined;
-    }
-
-    @test(timeout(10000))
-    public async canNotDeleteABlockedRepositoryWithAnIdThatDoesNotExist() {
-        await this.blockedRepositoryDb.createBlockedRepository("github.com/bob/*/", true);
-
-        const result = await this.blockedRepositoryDb.deleteBlockedRepository(9999);
-
-        expect(result).eq(false);
-        expect(await this.blockedRepositoryDb.findBlockedRepositoryByURL("github.com/bob/some-repo")).not.undefined;
-    }
-
     @test(timeout(10000))
     public async checkRepositoryIsBlocked() {
         await this.blockedRepositoryDb.createBlockedRepository("github.com/bob/.*", true);

components/gitpod-db/src/blocked-repository-db.ts

@@ -23,5 +23,5 @@ export interface BlockedRepositoryDB {
 
     createBlockedRepository(urlRegexp: string, blockUser: boolean): Promise<BlockedRepository>;
 
-    deleteBlockedRepository(id: number): Promise<boolean>;
+    deleteBlockedRepository(id: number): Promise<void>;
 }

components/gitpod-db/src/typeorm/blocked-repository-db-impl.ts

@@ -29,11 +29,10 @@ export class TypeORMBlockedRepositoryDBImpl implements BlockedRepositoryDB {
         return await blockedRepositoryRepo.save({ urlRegexp: urlRegexp, blockUser: blockUser, deleted: false });
     }
 
-    public async deleteBlockedRepository(id: number): Promise<boolean> {
+    public async deleteBlockedRepository(id: number): Promise<void> {
         const blockedRepositoryRepo = await this.getBlockedRepositoryRepo();
 
-        const result = await blockedRepositoryRepo.delete(id);
-        return !!result.affected;
+        await blockedRepositoryRepo.update(id, { deleted: true });
     }
 
     public async findAllBlockedRepositories(

components/gitpod-protocol/src/admin-protocol.ts

@@ -22,7 +22,7 @@ export interface AdminServer {
     adminModifyPermanentWorkspaceFeatureFlag(req: AdminModifyPermanentWorkspaceFeatureFlagRequest): Promise<User>;
 
     adminCreateBlockedRepository(urlRegexp: string, blockUser: boolean): Promise<BlockedRepository>;
-    adminDeleteBlockedRepository(id: number): Promise<boolean>;
+    adminDeleteBlockedRepository(id: number): Promise<void>;
     adminGetBlockedRepositories(
         req: AdminGetListRequest<BlockedRepository>,
     ): Promise<AdminGetListResult<BlockedRepository>>;

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

@@ -662,24 +662,16 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
 
         await this.guardAdminAccess("adminCreateBlockedRepository", { urlRegexp, blockUser }, Permission.ADMIN_USERS);
 
-        try {
-            return await this.blockedRepostoryDB.createBlockedRepository(urlRegexp, blockUser);
-        } catch (e) {
-            throw new ResponseError(ErrorCodes.INTERNAL_SERVER_ERROR, e.toString());
-        }
+        return await this.blockedRepostoryDB.createBlockedRepository(urlRegexp, blockUser);
     }
 
-    async adminDeleteBlockedRepository(ctx: TraceContext, id: number): Promise<boolean> {
+    async adminDeleteBlockedRepository(ctx: TraceContext, id: number): Promise<void> {
         traceAPIParams(ctx, { id });
         await this.requireEELicense(Feature.FeatureAdminDashboard);
 
         await this.guardAdminAccess("adminDeleteBlockedRepository", { id }, Permission.ADMIN_USERS);
 
-        try {
-            return await this.blockedRepostoryDB.deleteBlockedRepository(id);
-        } catch (e) {
-            throw new ResponseError(ErrorCodes.INTERNAL_SERVER_ERROR, e.toString());
-        }
+        await this.blockedRepostoryDB.markDeleted(id);
     }
 
     async adminModifyRoleOrPermission(ctx: TraceContext, req: AdminModifyRoleOrPermissionRequest): Promise<User> {

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

@@ -2665,7 +2665,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         throw new ResponseError(ErrorCodes.EE_FEATURE, `Admin support is implemented in Gitpod's Enterprise Edition`);
     }
 
-    adminDeleteBlockedRepository(ctx: TraceContext, id: number): Promise<boolean> {
+    adminDeleteBlockedRepository(ctx: TraceContext, id: number): Promise<void> {
         throw new ResponseError(ErrorCodes.EE_FEATURE, `Admin support is implemented in Gitpod's Enterprise Edition`);
     }