Skip to content

Commit 3b85bf1

Browse files
authored
[server] remove unused getFeaturedRepositories (#19100)
1 parent 9be1fec commit 3b85bf1

File tree

10 files changed

+0
-157
lines changed

10 files changed

+0
-157
lines changed

components/dashboard/src/service/service-mock.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ const gitpodServiceMock = createServiceMock({
157157
getWorkspaces: async () => {
158158
return [];
159159
},
160-
getFeaturedRepositories: async () => {
161-
return [];
162-
},
163160
getAuthProviders: async () => {
164161
return [
165162
{

components/gitpod-db/src/typeorm/entity/db-repository-whitelist.ts

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

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

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
RunningWorkspaceInfo,
1515
Snapshot,
1616
SnapshotState,
17-
WhitelistedRepository,
1817
Workspace,
1918
WorkspaceAndInstance,
2019
WorkspaceInfo,
@@ -44,7 +43,6 @@ import {
4443
import { DBPrebuildInfo } from "./entity/db-prebuild-info-entry";
4544
import { DBPrebuiltWorkspace } from "./entity/db-prebuilt-workspace";
4645
import { DBPrebuiltWorkspaceUpdatable } from "./entity/db-prebuilt-workspace-updatable";
47-
import { DBRepositoryWhiteList } from "./entity/db-repository-whitelist";
4846
import { DBSnapshot } from "./entity/db-snapshot";
4947
import { DBWorkspace } from "./entity/db-workspace";
5048
import { DBWorkspaceInstance } from "./entity/db-workspace-instance";
@@ -88,10 +86,6 @@ export class TypeORMWorkspaceDBImpl extends TransactionalDBImpl<WorkspaceDB> imp
8886
return (await this.getEntityManager()).getRepository<DBWorkspaceInstanceUser>(DBWorkspaceInstanceUser);
8987
}
9088

91-
private async getRepositoryWhitelist(): Promise<Repository<DBRepositoryWhiteList>> {
92-
return (await this.getEntityManager()).getRepository<DBRepositoryWhiteList>(DBRepositoryWhiteList);
93-
}
94-
9589
private async getSnapshotRepo(): Promise<Repository<DBSnapshot>> {
9690
return (await this.getEntityManager()).getRepository<DBSnapshot>(DBSnapshot);
9791
}
@@ -629,31 +623,6 @@ export class TypeORMWorkspaceDBImpl extends TransactionalDBImpl<WorkspaceDB> imp
629623
});
630624
}
631625

632-
public async isWhitelisted(repositoryUrl: string): Promise<boolean> {
633-
const whitelist = await this.getRepositoryWhitelist();
634-
const repoCount = await whitelist
635-
.createQueryBuilder("rwl")
636-
.select("1")
637-
.where("rwl.url = :url", { url: repositoryUrl })
638-
.getCount();
639-
return repoCount > 0;
640-
}
641-
642-
public async getFeaturedRepositories(): Promise<Partial<WhitelistedRepository>[]> {
643-
const whitelist = await this.getRepositoryWhitelist();
644-
const allRepos = await whitelist
645-
.createQueryBuilder("rwl")
646-
.where("rwl.priority >= :minPrio", { minPrio: DBRepositoryWhiteList.MIN_FEATURED_REPOSITORY_PRIO })
647-
.orderBy("priority", "DESC")
648-
.getMany();
649-
return allRepos.map((repo) => {
650-
return {
651-
url: repo.url,
652-
description: repo.description,
653-
};
654-
});
655-
}
656-
657626
public async findSnapshotById(snapshotId: string): Promise<Snapshot | undefined> {
658627
const snapshots = await this.getSnapshotRepo();
659628
return snapshots.findOne(snapshotId);

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
WorkspaceInfo,
1212
WorkspaceInstance,
1313
WorkspaceInstanceUser,
14-
WhitelistedRepository,
1514
Snapshot,
1615
PrebuiltWorkspace,
1716
PrebuiltWorkspaceUpdatable,
@@ -142,9 +141,6 @@ export interface WorkspaceDB {
142141
includeStopping?: boolean,
143142
): Promise<RunningWorkspaceInfo[]>;
144143

145-
isWhitelisted(repositoryUrl: string): Promise<boolean>;
146-
getFeaturedRepositories(): Promise<Partial<WhitelistedRepository>[]>;
147-
148144
findSnapshotById(snapshotId: string): Promise<Snapshot | undefined>;
149145
findSnapshotsWithState(
150146
state: SnapshotState,

components/gitpod-protocol/go/gitpod-service.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ type APIInterface interface {
4141
GetWorkspaces(ctx context.Context, options *GetWorkspacesOptions) (res []*WorkspaceInfo, err error)
4242
GetWorkspaceOwner(ctx context.Context, workspaceID string) (res *UserInfo, err error)
4343
GetWorkspaceUsers(ctx context.Context, workspaceID string) (res []*WorkspaceInstanceUser, err error)
44-
GetFeaturedRepositories(ctx context.Context) (res []*WhitelistedRepository, err error)
4544
GetWorkspace(ctx context.Context, id string) (res *WorkspaceInfo, err error)
4645
GetIDEOptions(ctx context.Context) (res *IDEOptions, err error)
4746
IsWorkspaceOwner(ctx context.Context, workspaceID string) (res bool, err error)
@@ -144,8 +143,6 @@ const (
144143
FunctionGetWorkspaceOwner FunctionName = "getWorkspaceOwner"
145144
// FunctionGetWorkspaceUsers is the name of the getWorkspaceUsers function
146145
FunctionGetWorkspaceUsers FunctionName = "getWorkspaceUsers"
147-
// FunctionGetFeaturedRepositories is the name of the getFeaturedRepositories function
148-
FunctionGetFeaturedRepositories FunctionName = "getFeaturedRepositories"
149146
// FunctionGetWorkspace is the name of the getWorkspace function
150147
FunctionGetWorkspace FunctionName = "getWorkspace"
151148
// FunctionGetIDEOptions is the name of the getIDEOptions function
@@ -686,24 +683,6 @@ func (gp *APIoverJSONRPC) GetWorkspaceUsers(ctx context.Context, workspaceID str
686683
return
687684
}
688685

689-
// GetFeaturedRepositories calls getFeaturedRepositories on the server
690-
func (gp *APIoverJSONRPC) GetFeaturedRepositories(ctx context.Context) (res []*WhitelistedRepository, err error) {
691-
if gp == nil {
692-
err = errNotConnected
693-
return
694-
}
695-
var _params []interface{}
696-
697-
var result []*WhitelistedRepository
698-
err = gp.C.Call(ctx, "getFeaturedRepositories", _params, &result)
699-
if err != nil {
700-
return
701-
}
702-
res = result
703-
704-
return
705-
}
706-
707686
// GetWorkspace calls getWorkspace on the server
708687
func (gp *APIoverJSONRPC) GetWorkspace(ctx context.Context, id string) (res *WorkspaceInfo, err error) {
709688
if gp == nil {
@@ -1907,14 +1886,6 @@ type Configuration struct {
19071886
GarbageCollectionStartDate float64 `json:"garbageCollectionStartDate,omitempty"`
19081887
}
19091888

1910-
// WhitelistedRepository is the WhitelistedRepository message type
1911-
type WhitelistedRepository struct {
1912-
Avatar string `json:"avatar,omitempty"`
1913-
Description string `json:"description,omitempty"`
1914-
Name string `json:"name,omitempty"`
1915-
URL string `json:"url,omitempty"`
1916-
}
1917-
19181889
// EnvVar is the EnvVar message type
19191890
type EnvVar struct {
19201891
ID string `json:"id,omitempty"`

components/gitpod-protocol/go/mock.go

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
WorkspaceInfo,
1010
WorkspaceCreationResult,
1111
WorkspaceInstanceUser,
12-
WhitelistedRepository,
1312
WorkspaceImageBuild,
1413
AuthProviderInfo,
1514
Token,
@@ -109,7 +108,6 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
109108
getWorkspaces(options: GitpodServer.GetWorkspacesOptions): Promise<WorkspaceInfo[]>;
110109
getWorkspaceOwner(workspaceId: string): Promise<UserInfo | undefined>;
111110
getWorkspaceUsers(workspaceId: string): Promise<WorkspaceInstanceUser[]>;
112-
getFeaturedRepositories(): Promise<WhitelistedRepository[]>;
113111
getSuggestedRepositories(organizationId: string): Promise<SuggestedRepository[]>;
114112
searchRepositories(params: SearchRepositoriesParams): Promise<SuggestedRepository[]>;
115113
/**

components/gitpod-protocol/src/protocol.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,13 +1072,6 @@ export interface PrebuiltWorkspaceUpdatable {
10721072
contextUrl?: string;
10731073
}
10741074

1075-
export interface WhitelistedRepository {
1076-
url: string;
1077-
name: string;
1078-
description?: string;
1079-
avatar?: string;
1080-
}
1081-
10821075
export type PortOnOpen = "open-browser" | "open-preview" | "notify" | "ignore";
10831076

10841077
export interface PortConfig {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ const defaultFunctions: FunctionsConfig = {
6363
getWorkspaces: { group: "default", points: 1 },
6464
getWorkspaceOwner: { group: "default", points: 1 },
6565
getWorkspaceUsers: { group: "default", points: 1 },
66-
getFeaturedRepositories: { group: "default", points: 1 },
6766
getSuggestedRepositories: { group: "default", points: 1 },
6867
searchRepositories: { group: "default", points: 1 },
6968
getWorkspace: { group: "default", points: 1 },

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

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
User,
3636
UserEnvVarValue,
3737
UserInfo,
38-
WhitelistedRepository,
3938
Workspace,
4039
WorkspaceContext,
4140
WorkspaceCreationResult,
@@ -106,7 +105,6 @@ import { HostContextProvider } from "../auth/host-context-provider";
106105
import { GuardedResource, ResourceAccessGuard, ResourceAccessOp } from "../auth/resource-access";
107106
import { Config } from "../config";
108107
import { NotFoundError, UnauthorizedError } from "../errors";
109-
import { RepoURL } from "../repohost/repo-url";
110108
import { AuthorizationService } from "../user/authorization-service";
111109
import { TokenProvider } from "../user/token-provider";
112110
import { UserAuthentication } from "../user/user-authentication";
@@ -1327,41 +1325,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
13271325
return prebuild;
13281326
}
13291327

1330-
public async getFeaturedRepositories(ctx: TraceContext): Promise<WhitelistedRepository[]> {
1331-
const user = await this.checkAndBlockUser("getFeaturedRepositories");
1332-
const repositories = await this.workspaceDb.trace(ctx).getFeaturedRepositories();
1333-
if (repositories.length === 0) return [];
1334-
1335-
return (
1336-
await Promise.all(
1337-
repositories
1338-
.filter((repo) => repo.url != undefined)
1339-
.map(async (whitelistedRepo) => {
1340-
const repoUrl = RepoURL.parseRepoUrl(whitelistedRepo.url!);
1341-
if (!repoUrl) return undefined;
1342-
1343-
const { host, owner, repo } = repoUrl;
1344-
const hostContext = this.hostContextProvider.get(host);
1345-
if (!hostContext || !hostContext.services) {
1346-
return undefined;
1347-
}
1348-
const repoProvider = hostContext.services.repositoryProvider;
1349-
try {
1350-
const repository = await repoProvider.getRepo(user, owner, repo);
1351-
return {
1352-
url: repository.webUrl,
1353-
name: repository.name,
1354-
description: whitelistedRepo.description || repository.description,
1355-
avatar: repository.avatarUrl,
1356-
};
1357-
} catch {
1358-
// this happens quite often if only GitLab is enabled
1359-
}
1360-
}),
1361-
)
1362-
).filter((e) => e !== undefined) as WhitelistedRepository[];
1363-
}
1364-
13651328
public async getSuggestedRepositories(ctx: TraceContext, organizationId: string): Promise<SuggestedRepository[]> {
13661329
traceAPIParams(ctx, { organizationId });
13671330

0 commit comments

Comments
 (0)