[server] allow user custom global timeout

gitpod-io · Feb 24, 2023 · 5737f15 · 5737f15
1 parent 831189f
commit 5737f15
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/components/server/ee/src/billing/entitlement-service.ts b/components/server/ee/src/billing/entitlement-service.ts
@@ -10,6 +10,7 @@ import {
     WorkspaceInstance,
     WorkspaceTimeoutDuration,
     WORKSPACE_TIMEOUT_DEFAULT_LONG,
+    WORKSPACE_TIMEOUT_DEFAULT_SHORT,
 } from "@gitpod/gitpod-protocol";
 import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 import { inject, injectable } from "inversify";
@@ -83,20 +84,28 @@ export class EntitlementServiceImpl implements EntitlementService {
     }
 
     async getDefaultWorkspaceTimeout(user: User, date: Date = new Date()): Promise<WorkspaceTimeoutDuration> {
+        let userWorkspaceTimeout: WorkspaceTimeoutDuration | undefined;
+        try {
+            userWorkspaceTimeout = WorkspaceTimeoutDuration.validate(user.additionalData?.workspaceTimeout || "");
+        } catch (e) {}
+        let defaultWorkspaceTimeout: WorkspaceTimeoutDuration = WORKSPACE_TIMEOUT_DEFAULT_SHORT;
         try {
             const billingMode = await this.billingModes.getBillingModeForUser(user, date);
             switch (billingMode.mode) {
                 case "none":
-                    return this.license.getDefaultWorkspaceTimeout(user, date);
+                    defaultWorkspaceTimeout = await this.license.getDefaultWorkspaceTimeout(user, date);
                 case "chargebee":
-                    return this.chargebee.getDefaultWorkspaceTimeout(user, date);
+                    defaultWorkspaceTimeout = await this.chargebee.getDefaultWorkspaceTimeout(user, date);
                 case "usage-based":
-                    return this.ubp.getDefaultWorkspaceTimeout(user, date);
+                    defaultWorkspaceTimeout = await this.ubp.getDefaultWorkspaceTimeout(user, date);
             }
         } catch (err) {
             log.error({ userId: user.id }, "EntitlementService error: getDefaultWorkspaceTimeout", err);
-            return WORKSPACE_TIMEOUT_DEFAULT_LONG;
+            defaultWorkspaceTimeout = WORKSPACE_TIMEOUT_DEFAULT_LONG;
         }
+        return userWorkspaceTimeout && defaultWorkspaceTimeout == WORKSPACE_TIMEOUT_DEFAULT_LONG
+            ? userWorkspaceTimeout
+            : defaultWorkspaceTimeout;
     }
 
     async userGetsMoreResources(user: User, date: Date = new Date()): Promise<boolean> {

diff --git a/components/server/src/workspace/workspace-starter.ts b/components/server/src/workspace/workspace-starter.ts
@@ -1476,6 +1476,7 @@ export class WorkspaceStarter {
             lastValidWorkspaceInstanceId,
         );
         const userTimeoutPromise = this.entitlementService.getDefaultWorkspaceTimeout(user, new Date());
+        const allowSetTimeout = this.entitlementService.maySetTimeout(user, new Date());
 
         let featureFlags = instance.configuration!.featureFlags || [];
 
@@ -1507,6 +1508,9 @@ export class WorkspaceStarter {
 
         if (workspace.type === "regular") {
             spec.setTimeout(await userTimeoutPromise);
+            if ((await allowSetTimeout) && user.additionalData?.disabledClosedTimeout === true) {
+                spec.setClosedTimeout("0");
+            }
         }
         spec.setAdmission(admissionLevel);
         const sshKeys = await this.userDB.trace(traceCtx).getSSHPublicKeys(user.id);