@gitpod/gitpod-protocol 0.1.5-prs-loadgen-update.1 → 0.1.5-prs-test-dazzle-rewrite.22

package/src/workspace-cluster.ts

@@ -7,7 +7,6 @@
 import * as fs from 'fs';
 import { filePathTelepresenceAware } from './env';
 import { DeepPartial } from "./util/deep-partial";
-import { Without } from './util/without';
 import { PermissionName } from './permission';
 
 export interface WorkspaceCluster {
@@ -36,6 +35,9 @@ export interface WorkspaceCluster {
 
     // An optional set of constraints that limit who can start workspaces on the cluster
     admissionConstraints?: AdmissionConstraint[];
+
+    // An optional set of admission preferences that guide cluster selection
+    admissionPreferences?: AdmissionPreference[];
 }
 
 export type WorkspaceClusterState = "available" | "cordoned" | "draining";
@@ -50,12 +52,16 @@ export interface TLSConfig {
 export namespace TLSConfig {
     export const loadFromBase64File = (path: string): string => fs.readFileSync(filePathTelepresenceAware(path)).toString("base64");
 }
-export type WorkspaceClusterWoTLS = Without<WorkspaceCluster, "tls">;
+export type WorkspaceClusterWoTLS = Omit<WorkspaceCluster, "tls">;
 export type WorkspaceManagerConnectionInfo = Pick<WorkspaceCluster, "name" | "url" | "tls">;
 
-export type AdmissionConstraint = AdmissionConstraintFeaturePreview | AdmissionConstraintHasRole;
+export type AdmissionConstraint = AdmissionConstraintFeaturePreview | AdmissionConstraintHasRole | AdmissionConstraintHasUserLevel;
 export type AdmissionConstraintFeaturePreview = { type: "has-feature-preview" };
 export type AdmissionConstraintHasRole = { type: "has-permission", permission: PermissionName };
+export type AdmissionConstraintHasUserLevel = { type: "has-user-level", level: string };
+
+export type AdmissionPreference = AdmissionPreferenceUserLevel;
+export type AdmissionPreferenceUserLevel = { type: 'user-level', level: string };
 
 
 export const WorkspaceClusterDB = Symbol("WorkspaceClusterDB");

package/src/workspace-instance.ts

@@ -23,6 +23,9 @@ export interface WorkspaceInstance {
     // The time an instance has switched phase to 'Running'
     startedTime?: string;
 
+    // The time an instance has switched phase to 'Stopping' */
+    stoppingTime?: string;
+
     // The time an instance has switched phase to 'Stopped' */
     stoppedTime?: string;
 
@@ -131,9 +134,6 @@ export interface WorkspaceInstanceConditions {
     // PullingImages marks if the workspace is currently pulling its images. This condition can only be set during PhaseCreating
     pullingImages?: boolean
 
-    // ServiceExists denotes if the workspace theia-/ports- services exist. This condition will be true if either of the two services exist.
-    serviceExists?: boolean
-
     // deployed marks that a workspace instance was sent/deployed at a workspace manager
     deployed?: boolean;
 
@@ -142,6 +142,12 @@ export interface WorkspaceInstanceConditions {
 
     // ISO8601 timestamp when the first user activity was registered in the frontend. Only set if the workspace is running.
     firstUserActivity?: string;
+
+    // headless_task_failed indicates that a headless workspace task failed
+    headlessTaskFailed?: string;
+
+    // stopped_by_request is true if the workspace was stopped using a StopWorkspace call
+    stoppedByRequest?: boolean;
 }
 
 // AdmissionLevel describes who can access a workspace instance and its ports.
@@ -155,9 +161,6 @@ export interface WorkspaceInstancePort {
     // The outward-facing port number
     port: number;
 
-    // An optional inward-facing port number. If not present we'll use port.
-    targetPort?: number;
-
     // The visiblity of this port. Optional for backwards compatibility.
     visibility?: PortVisibility;
 
@@ -203,4 +206,10 @@ export interface WorkspaceInstanceConfiguration {
 
     // ideImage is the ref of the IDE image this instance uses.
     ideImage: string;
+
+    // desktopIdeImage is the ref of the desktop IDE image this instance uses.
+    desktopIdeImage?: string
+
+    // supervisorImage is the ref of the supervisor image this instance uses.
+    supervisorImage?: string;
 }

package/src/wsready.ts

@@ -4,7 +4,7 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-// generated using github.com/32leaves/bel on 2021-06-11 12:57:53.834879928 +0000 UTC m=+0.008335102
+// generated using github.com/32leaves/bel on 2021-11-04 12:16:53.917570766 +0000 UTC m=+0.006002884
 // DO NOT MODIFY
 
 export enum WorkspaceInitSource {

package/lib/util/repeater.d.ts

@@ -1,22 +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 { Deferred } from "./deferred";
-/**
- * Repeats a given function until it is stopped
- */
-export declare class Repeater {
-    protected readonly fn: () => Promise<void> | void;
-    protected readonly timeout: number;
-    protected shouldRun: boolean;
-    protected finished: Deferred<void>;
-    protected timer?: any;
-    constructor(fn: () => Promise<void> | void, timeout: number);
-    start(): Promise<void>;
-    run(): Promise<void>;
-    protected sleep(timeout: number): Promise<unknown>;
-    stop(): Promise<void>;
-}
-//# sourceMappingURL=repeater.d.ts.map

package/lib/util/repeater.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"repeater.d.ts","sourceRoot":"","sources":["../../src/util/repeater.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC;;GAEG;AACH,qBAAa,QAAQ;IAKL,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAJjG,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IAClC,SAAS,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC;gBAES,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAAqB,OAAO,EAAE,MAAM;IAE3F,KAAK;IAIL,GAAG;cAcO,KAAK,CAAC,OAAO,EAAE,MAAM;IAI/B,IAAI;CAOb"}

package/lib/util/repeater.js

@@ -1,118 +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.
- */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Repeater = void 0;
-var deferred_1 = require("./deferred");
-var logging_1 = require("./logging");
-/**
- * Repeats a given function until it is stopped
- */
-var Repeater = /** @class */ (function () {
-    function Repeater(fn, timeout) {
-        this.fn = fn;
-        this.timeout = timeout;
-    }
-    Repeater.prototype.start = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                this.run();
-                return [2 /*return*/];
-            });
-        });
-    };
-    Repeater.prototype.run = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var err_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.shouldRun = true;
-                        this.finished = new deferred_1.Deferred();
-                        _a.label = 1;
-                    case 1:
-                        if (!this.shouldRun) return [3 /*break*/, 7];
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, this.fn()];
-                    case 3:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 4:
-                        err_1 = _a.sent();
-                        logging_1.log.error(err_1);
-                        return [3 /*break*/, 5];
-                    case 5: return [4 /*yield*/, this.sleep(this.timeout)];
-                    case 6:
-                        _a.sent();
-                        return [3 /*break*/, 1];
-                    case 7:
-                        this.finished.resolve();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    Repeater.prototype.sleep = function (timeout) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve) { return _this.timer = setTimeout(resolve, timeout); })];
-            });
-        });
-    };
-    Repeater.prototype.stop = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                this.shouldRun = false;
-                if (this.timer) {
-                    clearTimeout(this.timer);
-                }
-                return [2 /*return*/, this.finished.promise];
-            });
-        });
-    };
-    return Repeater;
-}());
-exports.Repeater = Repeater;
-//# sourceMappingURL=repeater.js.map

package/lib/util/repeater.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"repeater.js","sourceRoot":"","sources":["../../src/util/repeater.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAsC;AACtC,qCAAgC;AAEhC;;GAEG;AACH;IAKI,kBAA+B,EAA8B,EAAqB,OAAe;QAAlE,OAAE,GAAF,EAAE,CAA4B;QAAqB,YAAO,GAAP,OAAO,CAAQ;IAAI,CAAC;IAEhG,wBAAK,GAAX;;;gBACI,IAAI,CAAC,GAAG,EAAE,CAAC;;;;KACd;IAEK,sBAAG,GAAT;;;;;;wBACI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;wBACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAQ,EAAQ,CAAC;;;6BAC9B,IAAI,CAAC,SAAS;;;;wBAEb,qBAAM,IAAI,CAAC,EAAE,EAAE,EAAA;;wBAAf,SAAe,CAAC;;;;wBAEhB,aAAG,CAAC,KAAK,CAAC,KAAG,CAAC,CAAC;;4BAEnB,qBAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAA;;wBAA9B,SAA8B,CAAC;;;wBAEnC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;;;;;KAC3B;IAEe,wBAAK,GAArB,UAAsB,OAAe;;;;gBACjC,sBAAO,IAAI,OAAO,CAAC,UAAA,OAAO,IAAI,OAAA,KAAI,CAAC,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,EAAzC,CAAyC,CAAC,EAAC;;;KAC5E;IAEK,uBAAI,GAAV;;;gBACI,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;gBACvB,IAAI,IAAI,CAAC,KAAK,EAAE;oBACZ,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC5B;gBACD,sBAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAC;;;KAChC;IACL,eAAC;AAAD,CAAC,AApCD,IAoCC;AApCY,4BAAQ"}

package/lib/util/without.d.ts

@@ -1,7 +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 Without<T, K> = Pick<T, Exclude<keyof T, K>>;
-//# sourceMappingURL=without.d.ts.map

package/lib/util/without.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"without.d.ts","sourceRoot":"","sources":["../../src/util/without.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,oBAAY,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC"}

package/lib/util/without.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"without.js","sourceRoot":"","sources":["../../src/util/without.ts"],"names":[],"mappings":";AAAA;;;;GAIG"}

package/src/util/jaeger-client.d.ts

@@ -1,105 +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.
- */
-
-// Type definitions for jaeger-client
-// Project: https://github.com/uber/jaeger-client-node
-// Definitions by: Julian Steger <https://github.com/julianste>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'jaeger-client' {
-    import * as opentracing from "opentracing";
-
-    export interface TracingConfig {
-        serviceName?: string;
-        disable?: boolean;
-        sampler?: SamplerConfig;
-        reporter?: ReporterConfig;
-    }
-
-    export interface TracingOptions {
-        reporter?: Reporter;
-        metrics?: MetricsFactory;
-        logger?: Logger;
-        tags?: any;
-    }
-
-    export interface ReporterConfig {
-        logSpans?: boolean;
-        agentHost?: string;
-        agentPort?: number;
-        flushIntervalMs?: number;
-    }
-
-    export interface SamplerConfig {
-        type: string;
-        param: number;
-        host?: string;
-        port?: number;
-        refreshIntervalMs?: number;
-    }
-
-    export interface Logger {
-        info(msg: string): void;
-        error(msg: string): void;
-    }
-
-    export interface Reporter {
-        report(span: opentracing.Span): void;
-        close(callback?: () => void): void;
-        setProcess(serviceName: string, tags: any): void;
-    }
-
-    export interface MetricsFactory {
-        createCounter(name: string, tags: any): Counter;
-        createTimer(name: string, tags: any): Timer;
-        createGauge(name: string, tags: any): Gauge;
-    }
-
-    // Counter tracks the number of times an event has occurred
-    export interface Counter {
-        // Adds the given value to the counter.
-        increment(delta: number): void;
-    }
-
-    // Timer tracks how long an operation took and also computes percentiles.
-    export interface Timer {
-        // Records the time passed in.
-        record(value: number): void;
-    }
-
-    // Gauge returns instantaneous measurements of something as an int64 value
-    export interface Gauge {
-        // Update the gauge to the value passed in.
-        update(value: number): void;
-    }
-
-    export function initTracer(
-        tracingConfig: TracingConfig,
-        tracingOptions: TracingOptions,
-    ): opentracing.Tracer;
-
-    export function initTracerFromEnv(
-        tracingConfig: TracingConfig,
-        tracingOptions: TracingOptions,
-    ): opentracing.Tracer;
-
-    export interface SamplingDecision {
-        sample: boolean;
-        retryable: boolean;
-        tags: any;
-    }
-
-    // added by TypeFox
-    export interface Sampler {
-        name(): string
-        isSampled(operation: string, tags: any): boolean;
-        onCreateSpan(span: opentracing.Span): SamplingDecision;
-        onSetOperationName(span: opentracing.Span, operationName: string): SamplingDecision;
-        onSetTag(span: opentracing.Span, key: string, value: any): SamplingDecision;
-        close(callback: () => void): void
-    }
-
-}

package/src/util/repeater.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.
- */
-
-import { Deferred } from "./deferred";
-import { log } from './logging';
-
-/**
- * Repeats a given function until it is stopped
- */
-export class Repeater {
-    protected shouldRun: boolean;
-    protected finished: Deferred<void>
-    protected timer?: any;
-
-    constructor(protected readonly fn: () => Promise<void> | void, protected readonly timeout: number) { }
-
-    async start() {
-        this.run();
-    }
-
-    async run() {
-        this.shouldRun = true;
-        this.finished = new Deferred<void>();
-        while (this.shouldRun) {
-            try {
-                await this.fn();
-            } catch (err) {
-                log.error(err);
-            }
-            await this.sleep(this.timeout);
-        }
-        this.finished.resolve();
-    }
-
-    protected async sleep(timeout: number) {
-        return new Promise(resolve => this.timer = setTimeout(resolve, timeout));
-    }
-
-    async stop() {
-        this.shouldRun = false;
-        if (this.timer) {
-            clearTimeout(this.timer);
-        }
-        return this.finished.promise;
-    }
-}