Skip to content

Commit 17531ae

Browse files
author
Andrew Farries
committed
Revert "Make client providers filter by app cluster"
This reverts commit 83a33cb.
1 parent bc74fb6 commit 17531ae

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Diff for: components/ws-manager-api/typescript/src/client-provider-source.ts

+6-7
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ export interface WorkspaceManagerClientProviderSource {
1414
getAllWorkspaceClusters(): Promise<WorkspaceClusterWoTLS[]>;
1515
}
1616

17+
1718
@injectable()
1819
export class WorkspaceManagerClientProviderEnvSource implements WorkspaceManagerClientProviderSource {
1920
protected _clusters: WorkspaceCluster[] | undefined = undefined;
20-
readonly applicationCluster = process.env.GITPOD_INSTALLATION_SHORTNAME ?? "";
2121

2222
public async getWorkspaceCluster(name: string): Promise<WorkspaceCluster | undefined> {
23-
return this.clusters.find((m) => m.name === name && m.applicationCluster === this.applicationCluster);
23+
return this.clusters.find(m => m.name === name);
2424
}
2525

2626
public async getAllWorkspaceClusters(): Promise<WorkspaceClusterWoTLS[]> {
27-
return this.clusters.filter((m) => m.applicationCluster === this.applicationCluster) ?? [];
27+
return this.clusters;
2828
}
2929

3030
protected get clusters(): WorkspaceCluster[] {
@@ -63,14 +63,13 @@ export class WorkspaceManagerClientProviderEnvSource implements WorkspaceManager
6363
export class WorkspaceManagerClientProviderDBSource implements WorkspaceManagerClientProviderSource {
6464
@inject(WorkspaceClusterDB)
6565
protected readonly db: WorkspaceClusterDB;
66-
readonly applicationCluster = process.env.GITPOD_INSTALLATION_SHORTNAME ?? "";
6766

6867
public async getWorkspaceCluster(name: string): Promise<WorkspaceCluster | undefined> {
69-
return (await this.db.findFiltered({ name, applicationCluster: this.applicationCluster }))[0];
68+
return await this.db.findByName(name);
7069
}
7170

7271
public async getAllWorkspaceClusters(): Promise<WorkspaceClusterWoTLS[]> {
73-
return await this.db.findFiltered({ applicationCluster: this.applicationCluster });
72+
return await this.db.findFiltered({});
7473
}
7574
}
7675

@@ -106,4 +105,4 @@ export class WorkspaceManagerClientProviderCompositeSource implements WorkspaceM
106105
}
107106
return result;
108107
}
109-
}
108+
}

0 commit comments

Comments
 (0)