Skip to content

allow to enable PVC feature flag for user via ConfigCat #13341

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 1 commit into from
Oct 4, 2022
Merged

allow to enable PVC feature flag for user via ConfigCat #13341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions components/server/ee/src/workspace/workspace-factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,15 @@ import { UserDB } from "@gitpod/gitpod-db/lib";
import { UserCounter } from "../user/user-counter";
import { increasePrebuildsStartedCounter } from "../../../src/prometheus-metrics";
import { DeepPartial } from "@gitpod/gitpod-protocol/lib/util/deep-partial";
import { EntitlementService } from "../../../src/billing/entitlement-service";
import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";

@injectable()
export class WorkspaceFactoryEE extends WorkspaceFactory {
@inject(LicenseEvaluator) protected readonly licenseEvaluator: LicenseEvaluator;
@inject(HostContextProvider) protected readonly hostContextProvider: HostContextProvider;
@inject(UserCounter) protected readonly userCounter: UserCounter;
@inject(EntitlementService) protected readonly entitlementService: EntitlementService;

@inject(UserDB) protected readonly userDB: UserDB;

Expand Down Expand Up @@ -334,6 +337,18 @@ export class WorkspaceFactoryEE extends WorkspaceFactory {
if (user.featureFlags?.permanentWSFeatureFlags?.includes("persistent_volume_claim")) {
config._featureFlags = (config._featureFlags || []).concat(["persistent_volume_claim"]);
}
const billingTier = await this.entitlementService.getBillingTier(user);
const userTeams = await this.teamDB.findTeamsByUser(user.id);
// this allows to control user`s PVC feature flag via ConfigCat
if (
await getExperimentsClientForBackend().getValueAsync("user_pvc", false, {
user,
teams: userTeams,
billingTier,
})
) {
config._featureFlags = (config._featureFlags || []).concat(["persistent_volume_claim"]);
}

const id = await this.generateWorkspaceID(context);
const newWs: Workspace = {
Expand Down
17 changes: 17 additions & 0 deletions components/server/src/workspace/config-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ import { HostContextProvider } from "../auth/host-context-provider";
import { AuthorizationService } from "../user/authorization-service";
import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
import { Config } from "../config";
import { EntitlementService } from "../billing/entitlement-service";
import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
import { TeamDB } from "@gitpod/gitpod-db/lib";

const POD_PATH_WORKSPACE_BASE = "/workspace";

Expand All @@ -48,6 +51,8 @@ export class ConfigProvider {
@inject(AuthorizationService) protected readonly authService: AuthorizationService;
@inject(Config) protected readonly config: Config;
@inject(ConfigurationService) protected readonly configurationService: ConfigurationService;
@inject(EntitlementService) protected readonly entitlementService: EntitlementService;
@inject(TeamDB) protected readonly teamDB: TeamDB;

public async fetchConfig(
ctx: TraceContext,
Expand Down Expand Up @@ -129,6 +134,18 @@ export class ConfigProvider {
NamedWorkspaceFeatureFlag.isWorkspacePersisted,
);
}
const billingTier = await this.entitlementService.getBillingTier(user);
const userTeams = await this.teamDB.findTeamsByUser(user.id);
// this allows to control user`s PVC feature flag via ConfigCat
if (
await getExperimentsClientForBackend().getValueAsync("user_pvc", false, {
user,
teams: userTeams,
billingTier,
})
) {
config._featureFlags = (config._featureFlags || []).concat(["persistent_volume_claim"]);
}

return { config, literalConfig };
} catch (e) {
Expand Down