Skip to content

[db] Add a deleted column to the d_b_workspace_cluster table #14340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 2, 2022
Merged

[db] Add a deleted column to the d_b_workspace_cluster table #14340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b83f56c
Add `deleted` col to `d_b_workspace_cluster` table
Nov 2, 2022
0de695b
Amend tests to use new `deleted` field
Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions components/gitpod-db/src/typeorm/entity/db-workspace-cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,8 @@ export class DBWorkspaceCluster implements WorkspaceCluster {
length: 60,
})
applicationCluster: string;

// This column triggers the db-sync deletion mechanism. It's not intended for public consumption.
@Column()
deleted: boolean;
}
17 changes: 17 additions & 0 deletions .../gitpod-db/src/typeorm/migration/1667375160684-AddDeletedColumnToWorkspaceClusterTable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
* Copyright (c) 2022 Gitpod GmbH. All rights reserved.
* Licensed under the GNU Affero General Public License (AGPL).
* See License-AGPL.txt in the project root for license information.
*/

import { MigrationInterface, QueryRunner } from "typeorm";

export class AddDeletedColumnToWorkspaceClusterTable1667375160684 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
"ALTER TABLE d_b_workspace_cluster ADD COLUMN `deleted` tinyint(4) NOT NULL DEFAULT '0'",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

);
}

public async down(queryRunner: QueryRunner): Promise<void> {}
}
52 changes: 28 additions & 24 deletions components/gitpod-db/src/workspace-cluster-db.spec.db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,33 +37,33 @@ export class WorkspaceClusterDBSpec {
}

@test public async findByName() {
const wsc1: DBWorkspaceCluster = {
const wsc1: DBWorkspaceCluster = dbWorkspaceCluster({
name: "eu71",
applicationCluster: "eu02",
url: "some-url",
state: "available",
score: 100,
maxScore: 100,
govern: true,
};
const wsc1a: DBWorkspaceCluster = {
});
const wsc1a: DBWorkspaceCluster = dbWorkspaceCluster({
name: "eu71",
applicationCluster: "us02",
url: "some-url",
state: "cordoned",
score: 0,
maxScore: 0,
govern: false,
};
const wsc2: DBWorkspaceCluster = {
});
const wsc2: DBWorkspaceCluster = 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(wsc1a);
Expand All @@ -89,33 +89,33 @@ export class WorkspaceClusterDBSpec {
}

@test public async deleteByName() {
const wsc1: DBWorkspaceCluster = {
const wsc1: DBWorkspaceCluster = dbWorkspaceCluster({
name: "eu71",
applicationCluster: "eu02",
url: "some-url",
state: "available",
score: 100,
maxScore: 100,
govern: true,
};
const wsc1a: DBWorkspaceCluster = {
});
const wsc1a: DBWorkspaceCluster = dbWorkspaceCluster({
name: "eu71",
applicationCluster: "us02",
url: "some-url",
state: "cordoned",
score: 0,
maxScore: 0,
govern: false,
};
const wsc2: DBWorkspaceCluster = {
});
const wsc2: DBWorkspaceCluster = 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(wsc1a);
Expand All @@ -129,33 +129,33 @@ export class WorkspaceClusterDBSpec {
}

@test public async testFindFilteredByName() {
const wsc1: DBWorkspaceCluster = {
const wsc1: DBWorkspaceCluster = dbWorkspaceCluster({
name: "eu71",
applicationCluster: "eu02",
url: "some-url",
state: "available",
score: 100,
maxScore: 100,
govern: true,
};
const wsc1a: DBWorkspaceCluster = {
});
const wsc1a: DBWorkspaceCluster = dbWorkspaceCluster({
name: "eu71",
applicationCluster: "us02",
url: "some-url",
state: "cordoned",
score: 0,
maxScore: 0,
govern: false,
};
const wsc2: DBWorkspaceCluster = {
});
const wsc2: DBWorkspaceCluster = 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(wsc1a);
Expand All @@ -168,33 +168,33 @@ export class WorkspaceClusterDBSpec {
}

@test public async testFindFilteredByApplicationCluster() {
const wsc1: DBWorkspaceCluster = {
const wsc1: DBWorkspaceCluster = dbWorkspaceCluster({
name: "eu71",
applicationCluster: "eu02",
url: "some-url",
state: "available",
score: 100,
maxScore: 100,
govern: true,
};
const wsc1a: DBWorkspaceCluster = {
});
const wsc1a: DBWorkspaceCluster = dbWorkspaceCluster({
name: "eu71",
applicationCluster: "us02",
url: "some-url",
state: "cordoned",
score: 0,
maxScore: 0,
govern: false,
};
const wsc2: DBWorkspaceCluster = {
});
const wsc2: DBWorkspaceCluster = dbWorkspaceCluster({
name: "us71",
applicationCluster: "us02",
url: "some-url",
state: "available",
score: 100,
maxScore: 100,
govern: true,
};
});

await this.db.save(wsc1);
await this.db.save(wsc1a);
Expand Down Expand Up @@ -244,4 +244,8 @@ export class WorkspaceClusterDBSpec {
}
}

function dbWorkspaceCluster(cluster: Omit<DBWorkspaceCluster, "deleted">): DBWorkspaceCluster {
return { ...cluster, deleted: false };
}

module.exports = WorkspaceClusterDBSpec;