Skip to content

Commit 3115684

Browse files
authored
[server] Remove license db model - WEB-171 (#17264)
* [server] Remove license db model * fix
1 parent b371e25 commit 3115684

File tree

9 files changed

+0
-79
lines changed

9 files changed

+0
-79
lines changed

components/gitpod-db/src/container-module.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ import { TeamSubscriptionDB } from "./team-subscription-db";
3939
import { AccountingDB, TransactionalAccountingDBFactory } from "./accounting-db";
4040
import { EmailDomainFilterDB } from "./email-domain-filter-db";
4141
import { EduEmailDomainDB } from "./edu-email-domain-db";
42-
import { LicenseDB } from "./license-db";
43-
import { LicenseDBImpl } from "./typeorm/license-db-impl";
4442
import { EduEmailDomainDBImpl } from "./typeorm/edu-email-domain-db-impl";
4543
import { EmailDomainFilterDBImpl } from "./typeorm/email-domain-filter-db-impl";
4644
import { TeamSubscriptionDBImpl } from "./typeorm/team-subscription-db-impl";
@@ -149,7 +147,6 @@ export const dbContainerModule = new ContainerModule((bind, unbind, isBound, reb
149147
bind(TeamSubscription2DB).to(TeamSubscription2DBImpl).inSingletonScope();
150148
bind(EmailDomainFilterDB).to(EmailDomainFilterDBImpl).inSingletonScope();
151149
bind(EduEmailDomainDB).to(EduEmailDomainDBImpl).inSingletonScope();
152-
bind(LicenseDB).to(LicenseDBImpl).inSingletonScope();
153150
bind(UserToTeamMigrationService).toSelf().inSingletonScope();
154151
bind(WorkspaceOrganizationIdMigration).toSelf().inSingletonScope();
155152
bind(Synchronizer).toSelf().inSingletonScope();

components/gitpod-db/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export * from "./app-installation-db";
2323
export * from "./user-storage-resources-db";
2424
export * from "./one-time-secret-db";
2525
export * from "./auth-provider-entry-db";
26-
export * from "./license-db";
2726
export * from "./pending-github-event-db";
2827
export * from "./typeorm/typeorm";
2928
export * from "./accounting-db";

components/gitpod-db/src/license-db.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

components/gitpod-db/src/traced-db.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,4 @@ export function bindDbWithTracing<T>(traceKey: string | symbol, bind: interfaces
5454

5555
export const TracedWorkspaceDB = Symbol("TracedWorkspaceDB");
5656
export const TracedUserDB = Symbol("TracedUserDB");
57-
export const TracedLicenseDB = Symbol("TracedLicenseDB");
5857
export const TracedOneTimeSecretDB = Symbol("TracedOneTimeSecretDB");

components/gitpod-db/src/typeorm/license-db-impl.ts

Lines changed: 0 additions & 45 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export interface AdminServer {
4343
adminGetProjectById(id: string): Promise<Project | undefined>;
4444

4545
adminFindPrebuilds(params: FindPrebuildsParams): Promise<PrebuildWithStatus[]>;
46-
adminSetLicense(key: string): Promise<void>;
4746

4847
adminIsStudent(userId: string): Promise<boolean>;
4948
adminAddStudentEmailDomain(userId: string, domain: string): Promise<void>;

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ import {
5656
SetTimeoutRequest,
5757
} from "@gitpod/ws-manager/lib";
5858
import { ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
59-
import { v4 as uuidv4 } from "uuid";
6059
import { log, LogContext } from "@gitpod/gitpod-protocol/lib/util/logging";
6160
import { LicenseValidationResult } from "@gitpod/gitpod-protocol/lib/license-protocol";
6261
import { PrebuildManager } from "../prebuilds/prebuild-manager";
63-
import { LicenseDB } from "@gitpod/gitpod-db/lib";
6462
import { GuardedCostCenter, ResourceAccessGuard, ResourceAccessOp } from "../../../src/auth/resource-access";
6563
import { BlockedRepository } from "@gitpod/gitpod-protocol/lib/blocked-repositories-protocol";
6664
import { EligibilityService } from "../user/eligibility-service";
@@ -102,7 +100,6 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
102100
@inject(PrebuildManager) protected readonly prebuildManager: PrebuildManager;
103101
@inject(IncrementalPrebuildsService) protected readonly incrementalPrebuildsService: IncrementalPrebuildsService;
104102
@inject(ConfigProvider) protected readonly configProvider: ConfigProvider;
105-
@inject(LicenseDB) protected readonly licenseDB: LicenseDB;
106103

107104
// per-user state
108105
@inject(EligibilityService) protected readonly eligibilityService: EligibilityService;
@@ -977,14 +974,6 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
977974
}
978975
}
979976

980-
async adminSetLicense(ctx: TraceContext, key: string): Promise<void> {
981-
traceAPIParams(ctx, {}); // don't trace the actual key
982-
983-
await this.guardAdminAccess("adminGetWorkspaces", { key }, Permission.ADMIN_API);
984-
985-
await this.licenseDB.store(uuidv4(), key);
986-
}
987-
988977
public async isStudent(ctx: TraceContext): Promise<boolean> {
989978
const user = this.checkUser("isStudent");
990979
return this.eligibilityService.isStudent(user);

components/server/src/auth/rate-limiter.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ const defaultFunctions: FunctionsConfig = {
159159
adminGetProjectById: { group: "default", points: 1 },
160160
adminFindPrebuilds: { group: "default", points: 1 },
161161
adminGetLicense: { group: "default", points: 1 },
162-
adminSetLicense: { group: "default", points: 1 },
163162
adminGetSettings: { group: "default", points: 1 },
164163
adminUpdateSettings: { group: "default", points: 1 },
165164
adminGetTelemetryData: { group: "default", points: 1 },

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2878,10 +2878,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
28782878
throw new ResponseError(ErrorCodes.EE_FEATURE, `Admin support is implemented in Gitpod's Enterprise Edition`);
28792879
}
28802880

2881-
async adminSetLicense(ctx: TraceContext, key: string): Promise<void> {
2882-
throw new ResponseError(ErrorCodes.EE_FEATURE, `Admin support is implemented in Gitpod's Enterprise Edition`);
2883-
}
2884-
28852881
async adminGetSettings(ctx: TraceContext): Promise<InstallationAdminSettings> {
28862882
traceAPIParams(ctx, {});
28872883

0 commit comments

Comments
 (0)