@gitpod/gitpod-protocol 0.1.5-pavel-fixlog.0 → 0.1.5-pavel-vswithtype.0

package/src/util/timeutil.spec.ts

@@ -7,10 +7,16 @@
 import * as chai from "chai";
 const expect = chai.expect;
 import { suite, test } from "mocha-typescript";
-import { oneMonthLater } from "./timeutil";
+import { daysBefore, hoursBefore, oneMonthLater } from "./timeutil";
 
 @suite()
 export class TimeutilSpec {
+    @test
+    testDaysBefore() {
+        const now = new Date().toISOString();
+        expect(daysBefore(now, 2)).to.be.eq(hoursBefore(now, 48));
+    }
+
     @test
     testTimeutil() {
         // targeting a 1st, 1th of Jan => 1st of Feb
@@ -39,4 +45,25 @@ export class TimeutilSpec {
         const later = oneMonthLater(from.toISOString(), day);
         expect(later, `expected ${later} to be equal ${expectation}`).to.be.equal(expectation.toISOString());
     }
+
+    @test
+    testDaysBefore2() {
+        const tests: { date: Date; daysEarlier: number; expectation: string }[] = [
+            {
+                date: new Date("2021-07-13T00:00:00.000Z"),
+                daysEarlier: 365,
+                expectation: "2020-07-13T00:00:00.000Z",
+            },
+            {
+                date: new Date("2019-02-01T00:00:00.000Z"),
+                daysEarlier: 365,
+                expectation: "2018-02-01T00:00:00.000Z",
+            },
+        ];
+
+        for (const t of tests) {
+            const actual = daysBefore(t.date.toISOString(), t.daysEarlier);
+            expect(actual).to.equal(t.expectation, `expected ${actual} to be equal ${t.expectation}`);
+        }
+    }
 }

package/src/util/timeutil.ts

@@ -47,6 +47,12 @@ export const orderAsc = (d1: string, d2: string): number => liftDate(d1, d2, (d1
 export const liftDate1 = <T>(d1: string, f: (d1: Date) => T): T => f(new Date(d1));
 export const liftDate = <T>(d1: string, d2: string, f: (d1: Date, d2: Date) => T): T => f(new Date(d1), new Date(d2));
 
+export function daysBefore(date: string, days: number): string {
+    const result = new Date(date);
+    result.setDate(result.getDate() - days);
+    return result.toISOString();
+}
+
 export function hoursBefore(date: string, hours: number): string {
     const result = new Date(date);
     result.setHours(result.getHours() - hours);

package/src/workspace-class.ts

@@ -10,5 +10,5 @@ export interface SupportedWorkspaceClass {
     displayName: string;
     description: string;
     powerups: number;
-    isDefault: boolean;
+    isSelected: boolean;
 }

package/src/workspace-cluster.ts

@@ -15,6 +15,10 @@ export interface WorkspaceCluster {
     // Must be identical to the installationShortname of the cluster it represents!
     name: string;
 
+    // The name of the application cluster to which this cluster should be registered.
+    // The name can be at most 60 characters.
+    applicationCluster: string;
+
     // URL of the cluster's ws-manager API
     url: string;
 
@@ -86,20 +90,21 @@ export interface WorkspaceClusterDB {
      * Deletes the cluster identified by this name, if any.
      * @param name
      */
-    deleteByName(name: string): Promise<void>;
+    deleteByName(name: string, applicationCluster: string): Promise<void>;
 
     /**
      * Finds a WorkspaceCluster with the given name. If there is none, `undefined` is returned.
      * @param name
      */
-    findByName(name: string): Promise<WorkspaceCluster | undefined>;
+    findByName(name: string, applicationCluster: string): Promise<WorkspaceCluster | undefined>;
 
     /**
      * Lists all WorkspaceClusterWoTls for which the given predicate is true (does not return TLS for size/speed concerns)
      * @param predicate
      */
-    findFiltered(predicate: DeepPartial<WorkspaceClusterFilter>): Promise<WorkspaceClusterWoTLS[]>;
-}
-export interface WorkspaceClusterFilter extends Pick<WorkspaceCluster, "state" | "govern" | "url"> {
-    minScore: number;
+    findFiltered(predicate: WorkspaceClusterFilter): Promise<WorkspaceClusterWoTLS[]>;
 }
+
+export type WorkspaceClusterFilter = Pick<WorkspaceCluster, "applicationCluster"> &
+    DeepPartial<Pick<WorkspaceCluster, "name" | "state" | "govern" | "url">> &
+    Partial<{ minScore: number }>;

package/src/workspace-instance.ts

@@ -246,6 +246,9 @@ export interface WorkspaceInstanceConfiguration {
     // desktopIdeImage is the ref of the desktop IDE image this instance uses.
     desktopIdeImage?: string;
 
+    // desktopIdePluginImage is the ref of the desktop IDE plugin image this instance uses.
+    desktopIdePluginImage?: string;
+
     // supervisorImage is the ref of the supervisor image this instance uses.
     supervisorImage?: string;
 

package/src/wsready.ts

@@ -4,15 +4,14 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-// generated using github.com/32leaves/bel on 2022-07-21 07:41:48.081573085 +0000 UTC m=+0.009109470
+// generated using github.com/32leaves/bel on 2022-10-10 21:41:56.018177383 +0000 UTC m=+0.010324839
 // DO NOT MODIFY
 
-export interface WorkspaceReadyMessage {
-    source: WorkspaceInitSource;
-}
-
 export enum WorkspaceInitSource {
     WorkspaceInitFromBackup = "from-backup",
     WorkspaceInitFromPrebuild = "from-prebuild",
     WorkspaceInitFromOther = "from-other",
 }
+export interface WorkspaceReadyMessage {
+    source: WorkspaceInitSource;
+}

package/lib/email-protocol.d.ts

@@ -1,49 +0,0 @@
-/**
- * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
- * Licensed under the GNU Affero General Public License (AGPL).
- * See License-AGPL.txt in the project root for license information.
- */
-export declare type EMailState = "scheduledInternal" | "scheduledSendgrid";
-export interface EMailStatus {
-    /** The time the email entry was inserted into the DB */
-    scheduledInternalTime: string;
-    /** The time the email state transitioned to "scheduledSendgrid" */
-    scheduledSendgridTime?: string;
-    /** In case of any errors during sending with Sendgrid it gets noted here */
-    error?: string;
-}
-export declare namespace EMailStatus {
-    function getState(status: EMailStatus): EMailState;
-}
-export interface EmailAddress {
-    name?: string;
-    email: string;
-}
-export interface EMailParameters {
-    /** undefined means default from template */
-    subject?: string;
-    /** The sender address */
-    senderAddress: string | EmailAddress;
-    /** The replyTo address */
-    replyToAddress?: string | EmailAddress;
-    /** The SendGrid template id */
-    templateId: string;
-    /** The parameters for the SendGrid template */
-    templateParams: {};
-}
-export declare type EMail = {
-    /** The unique id of this email (uuid/v4 for now) */
-    uid: string;
-    /** The id of the user this email was sent to */
-    userId: string;
-    /** The address this email was sent to */
-    recipientAddress: string;
-    /** Which campaign scheduled this email  */
-    campaignId: string;
-    /** The parameters this email was sent with (template id, template params, etc) */
-    params: EMailParameters;
-} & EMailStatus;
-export declare namespace EMail {
-    const create: (ts: Omit<EMail, "uid">) => EMail;
-}
-//# sourceMappingURL=email-protocol.d.ts.map

package/lib/email-protocol.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"email-protocol.d.ts","sourceRoot":"","sources":["../src/email-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,oBAAY,UAAU,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AAEnE,MAAM,WAAW,WAAW;IACxB,wDAAwD;IACxD,qBAAqB,EAAE,MAAM,CAAC;IAC9B,mEAAmE;IACnE,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,4EAA4E;IAC5E,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AACD,yBAAiB,WAAW,CAAC;IACzB,SAAgB,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAKxD;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC5B,4CAA4C;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yBAAyB;IACzB,aAAa,EAAE,MAAM,GAAG,YAAY,CAAC;IACrC,0BAA0B;IAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IACvC,+BAA+B;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,+CAA+C;IAC/C,cAAc,EAAE,EAAE,CAAC;CACtB;AAED,oBAAY,KAAK,GAAG;IAChB,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,gDAAgD;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,yCAAyC;IACzC,gBAAgB,EAAE,MAAM,CAAC;IACzB,2CAA2C;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,kFAAkF;IAClF,MAAM,EAAE,eAAe,CAAC;CAC3B,GAAG,WAAW,CAAC;AAEhB,yBAAiB,KAAK,CAAC;IACZ,MAAM,MAAM,OAAQ,KAAK,KAAK,EAAE,KAAK,CAAC,KAAG,KAI/C,CAAC;CACL"}

package/lib/email-protocol.js

@@ -1,28 +0,0 @@
-"use strict";
-/**
- * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
- * Licensed under the GNU Affero General Public License (AGPL).
- * See License-AGPL.txt in the project root for license information.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EMail = exports.EMailStatus = void 0;
-const uuid_1 = require("uuid");
-var EMailStatus;
-(function (EMailStatus) {
-    function getState(status) {
-        if (status.scheduledSendgridTime) {
-            return "scheduledSendgrid";
-        }
-        return "scheduledInternal";
-    }
-    EMailStatus.getState = getState;
-})(EMailStatus = exports.EMailStatus || (exports.EMailStatus = {}));
-var EMail;
-(function (EMail) {
-    EMail.create = (ts) => {
-        const withId = ts;
-        withId.uid = (0, uuid_1.v4)();
-        return withId;
-    };
-})(EMail = exports.EMail || (exports.EMail = {}));
-//# sourceMappingURL=email-protocol.js.map

package/lib/email-protocol.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"email-protocol.js","sourceRoot":"","sources":["../src/email-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,+BAAoC;AAYpC,IAAiB,WAAW,CAO3B;AAPD,WAAiB,WAAW;IACxB,SAAgB,QAAQ,CAAC,MAAmB;QACxC,IAAI,MAAM,CAAC,qBAAqB,EAAE;YAC9B,OAAO,mBAAmB,CAAC;SAC9B;QACD,OAAO,mBAAmB,CAAC;IAC/B,CAAC;IALe,oBAAQ,WAKvB,CAAA;AACL,CAAC,EAPgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAO3B;AAiCD,IAAiB,KAAK,CAMrB;AAND,WAAiB,KAAK;IACL,YAAM,GAAG,CAAC,EAAsB,EAAS,EAAE;QACpD,MAAM,MAAM,GAAG,EAAW,CAAC;QAC3B,MAAM,CAAC,GAAG,GAAG,IAAA,SAAM,GAAE,CAAC;QACtB,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC;AACN,CAAC,EANgB,KAAK,GAAL,aAAK,KAAL,aAAK,QAMrB"}

package/src/email-protocol.ts

@@ -1,65 +0,0 @@
-/**
- * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
- * Licensed under the GNU Affero General Public License (AGPL).
- * See License-AGPL.txt in the project root for license information.
- */
-
-import { v4 as uuidv4 } from "uuid";
-
-export type EMailState = "scheduledInternal" | "scheduledSendgrid";
-
-export interface EMailStatus {
-    /** The time the email entry was inserted into the DB */
-    scheduledInternalTime: string;
-    /** The time the email state transitioned to "scheduledSendgrid" */
-    scheduledSendgridTime?: string;
-    /** In case of any errors during sending with Sendgrid it gets noted here */
-    error?: string;
-}
-export namespace EMailStatus {
-    export function getState(status: EMailStatus): EMailState {
-        if (status.scheduledSendgridTime) {
-            return "scheduledSendgrid";
-        }
-        return "scheduledInternal";
-    }
-}
-
-export interface EmailAddress {
-    name?: string;
-    email: string;
-}
-
-export interface EMailParameters {
-    /** undefined means default from template */
-    subject?: string;
-    /** The sender address */
-    senderAddress: string | EmailAddress;
-    /** The replyTo address */
-    replyToAddress?: string | EmailAddress;
-    /** The SendGrid template id */
-    templateId: string;
-    /** The parameters for the SendGrid template */
-    templateParams: {};
-}
-
-export type EMail = {
-    /** The unique id of this email (uuid/v4 for now) */
-    uid: string;
-    /** The id of the user this email was sent to */
-    userId: string;
-    /** The address this email was sent to */
-    recipientAddress: string;
-    /** Which campaign scheduled this email  */
-    campaignId: string;
-    /** The parameters this email was sent with (template id, template params, etc) */
-    params: EMailParameters;
-} & EMailStatus;
-
-export namespace EMail {
-    export const create = (ts: Omit<EMail, "uid">): EMail => {
-        const withId = ts as EMail;
-        withId.uid = uuidv4();
-        return withId;
-    };
-}