@gitpod/gitpod-protocol 0.1.5-wth-argo.0 → 0.1.5-wth-test.41

package/src/util/skip-if.ts

@@ -27,7 +27,7 @@ export function skipIf(doSkip: (suite: TestSuiteContext) => boolean): MochaTypeS
             }
         })
     };
-    
+
     // Mark as "trait": mimics the behavior of https://github.com/testdeck/testdeck/blob/9d2dd6a458c2c86c945f6f2999b8278b7528a7a7/index.ts#L433
     (trait as any)["__mts_isTrait"] = true;
     return trait;

package/src/util/timeutil.ts

@@ -6,12 +6,12 @@
 
 /**
  * Returns the <code>day</code>th of the next month from <code>formDate</code>.
- * If the next month does not have a <code>day</code>th, the last day of that 
+ * If the next month does not have a <code>day</code>th, the last day of that
  * month is taken.
  * The time is copied from <code>fromDate</code>.
- * 
- * @param fromDate 
- * @param day 
+ *
+ * @param fromDate
+ * @param day
  */
 export function oneMonthLater(fromDate: string, day?: number): string {
     const later = new Date(fromDate);

package/src/workspace-cluster.ts

@@ -0,0 +1,96 @@
+/**
+ * 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 * as fs from 'fs';
+import { filePathTelepresenceAware } from './env';
+import { DeepPartial } from "./util/deep-partial";
+import { PermissionName } from './permission';
+
+export interface WorkspaceCluster {
+    // Name of the workspace cluster.
+    // This is the string set in each
+    // Must be identical to the installationShortname of the cluster it represents!
+    name: string;
+
+    // URL of the cluster's ws-manager API
+    url: string;
+
+    // TLS contains the keys and certificates necessary to use mTLS between server and clients
+    tls?: TLSConfig;
+
+    // Current state of the cluster
+    state: WorkspaceClusterState;
+
+    // Maximum value score can reach for this cluster
+    maxScore: number;
+
+    // Score used for cluster selection when starting workspace instances
+    score: number;
+
+    // True if this bridge should control this cluster
+    govern: boolean;
+
+    // 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";
+export interface TLSConfig {
+    // the CA shared between client and server (base64 encoded)
+    ca: string;
+    // the private key (base64 encoded)
+    key: string;
+    // the certificate signed with the shared CA (base64 encoded)
+    crt: string;
+}
+export namespace TLSConfig {
+    export const loadFromBase64File = (path: string): string => fs.readFileSync(filePathTelepresenceAware(path)).toString("base64");
+}
+export type WorkspaceClusterWoTLS = Omit<WorkspaceCluster, "tls">;
+export type WorkspaceManagerConnectionInfo = Pick<WorkspaceCluster, "name" | "url" | "tls">;
+
+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");
+export interface WorkspaceClusterDB {
+    /**
+     * Stores the given WorkspaceCluster to the cluster-local DB in a consistent manner.
+     * If there already is an entry with the same name it's merged and updated with the given state.
+     * @param cluster
+     */
+    save(cluster: WorkspaceCluster): Promise<void>;
+
+    /**
+     * Deletes the cluster identified by this name, if any.
+     * @param name
+     */
+    deleteByName(name: 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>;
+
+    /**
+     * 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;
+}

package/src/workspace-instance.ts

@@ -23,16 +23,22 @@ 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;
 
     // ideUrl is the URL at which the workspace is available on the internet
+    // Note: this is nitially empty, filled during starting process!
     ideUrl: string;
 
     // region is the name of the workspace cluster this instance runs in
+    // Note: this is nitially empty, filled during starting process!
     region: string;
 
     // workspaceImage is the name of the Docker image this instance runs
+    // Note: this is nitially empty, filled during starting process!
     workspaceImage: string;
 
     // status is the latest status of the instance that we're aware of
@@ -70,6 +76,12 @@ export interface WorkspaceInstanceStatus {
     // nodeName is the name of the node the instance was scheduled onto
     nodeName?: string;
 
+    // podName is the name of the pod of this instance
+    podName?: string;
+
+    // nodeIp is the IP of the node the workspace is running on
+    nodeIp?: string;
+
     // ownerToken is the token one needs to access the workspace. Its presence is checked by ws-proxy.
     ownerToken?: string;
 }
@@ -77,7 +89,7 @@ export interface WorkspaceInstanceStatus {
 // WorkspaceInstancePhase describes a high-level state of a workspace instance
 export type WorkspaceInstancePhase =
     // unknown indicates an issue within the system in that it cannot determine the actual phase of
-	// a workspace. This phase is usually accompanied by an error.
+    // a workspace. This phase is usually accompanied by an error.
     "unknown" |
 
     // Preparing means that we haven't actually started the workspace instance just yet, but rather
@@ -85,21 +97,21 @@ export type WorkspaceInstancePhase =
     "preparing" |
 
     // Pending means the workspace does not yet consume resources in the cluster, but rather is looking for
-	// some space within the cluster. If for example the cluster needs to scale up to accomodate the
-	// workspace, the workspace will be in Pending state until that happened.
+    // some space within the cluster. If for example the cluster needs to scale up to accomodate the
+    // workspace, the workspace will be in Pending state until that happened.
     "pending" |
 
     // Creating means the workspace is currently being created. Thati includes downloading the images required
-	// to run the workspace over the network. The time spent in this phase varies widely and depends on the current
-	// network speed, image size and cache states.
+    // to run the workspace over the network. The time spent in this phase varies widely and depends on the current
+    // network speed, image size and cache states.
     "creating" |
 
     // Initializing is the phase in which the workspace is executing the appropriate workspace initializer (e.g. Git
-	// clone or backup download). After this phase one can expect the workspace to either be Running or Failed.
+    // clone or backup download). After this phase one can expect the workspace to either be Running or Failed.
     "initializing" |
 
     // Running means the workspace is able to actively perform work, either by serving a user through Theia,
-	// or as a headless workspace.
+    // or as a headless workspace.
     "running" |
 
     // Interrupted is an exceptional state where the container should be running but is temporarily unavailable.
@@ -122,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;
 
@@ -133,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.
@@ -146,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;
 
@@ -194,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

@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
+ * Copyright (c) 2021 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.
  */
 
-// generated using github.com/32leaves/bel on 2020-06-11 14:47:30.351829728 +0000 UTC m=+0.002956090
+// 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/context-url.d.ts

@@ -1,13 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the GNU Affero General Public License (AGPL).
- * See License-AGPL.txt in the project root for license information.
- */
-/**
- * The field "contextUrl" might contain prefixes like:
- *  - envvar1=value1/...
- *  - prebuild/...
- * This is the analogon to the (Prefix)ContextParser structure in "server".
- */
-export declare function contextUrlToUrl(contextUrl: string | undefined): URL | undefined;
-//# sourceMappingURL=context-url.d.ts.map

package/lib/util/context-url.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-url.d.ts","sourceRoot":"","sources":["../../src/util/context-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,CAU/E"}

package/lib/util/context-url.js

@@ -1,26 +0,0 @@
-"use strict";
-/**
- * Copyright (c) 2020 TypeFox 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.contextUrlToUrl = void 0;
-/**
- * The field "contextUrl" might contain prefixes like:
- *  - envvar1=value1/...
- *  - prebuild/...
- * This is the analogon to the (Prefix)ContextParser structure in "server".
- */
-function contextUrlToUrl(contextUrl) {
-    if (contextUrl === undefined) {
-        return undefined;
-    }
-    if (contextUrl.startsWith("http")) {
-        return new URL(contextUrl);
-    }
-    var finding = contextUrl.search("/http");
-    return new URL(contextUrl.substr(finding + 1));
-}
-exports.contextUrlToUrl = contextUrlToUrl;
-//# sourceMappingURL=context-url.js.map

package/lib/util/context-url.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-url.js","sourceRoot":"","sources":["../../src/util/context-url.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,UAA8B;IAC5D,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QACjC,OAAO,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;KAC5B;IACD,IAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,OAAO,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAVD,0CAUC"}

package/lib/util/context-url.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-url.spec.d.ts","sourceRoot":"","sources":["../../src/util/context-url.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,cAAc;IAEV,0BAA0B;IAK1B,4BAA4B;CAI5C"}

package/lib/util/context-url.spec.js

@@ -1,52 +0,0 @@
-"use strict";
-/**
- * Copyright (c) 2020 TypeFox 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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContextUrlTest = void 0;
-var chai = require("chai");
-var mocha_typescript_1 = require("mocha-typescript");
-var context_url_1 = require("./context-url");
-var expect = chai.expect;
-var ContextUrlTest = /** @class */ (function () {
-    function ContextUrlTest() {
-    }
-    ContextUrlTest.prototype.parseContextUrl_withEnvVar = function () {
-        var actual = context_url_1.contextUrlToUrl("passedin=test%20value/https://github.com/gitpod-io/gitpod-test-repo");
-        expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo");
-    };
-    ContextUrlTest.prototype.parseContextUrl_withPrebuild = function () {
-        var actual = context_url_1.contextUrlToUrl("prebuild/https://github.com/gitpod-io/gitpod-test-repo");
-        expect(actual === null || actual === void 0 ? void 0 : actual.host).to.equal("github.com");
-    };
-    __decorate([
-        mocha_typescript_1.test,
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], ContextUrlTest.prototype, "parseContextUrl_withEnvVar", null);
-    __decorate([
-        mocha_typescript_1.test,
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], ContextUrlTest.prototype, "parseContextUrl_withPrebuild", null);
-    ContextUrlTest = __decorate([
-        mocha_typescript_1.suite
-    ], ContextUrlTest);
-    return ContextUrlTest;
-}());
-exports.ContextUrlTest = ContextUrlTest;
-module.exports = new ContextUrlTest();
-//# sourceMappingURL=context-url.spec.js.map

package/lib/util/context-url.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-url.spec.js","sourceRoot":"","sources":["../../src/util/context-url.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,2BAA6B;AAC7B,qDAA+C;AAC/C,6CAAgD;AAChD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAG3B;IAAA;IAWA,CAAC;IATgB,mDAA0B,GAAjC;QACF,IAAM,MAAM,GAAG,6BAAe,CAAC,qEAAqE,CAAC,CAAC;QACtG,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;IAEY,qDAA4B,GAAnC;QACF,IAAM,MAAM,GAAG,6BAAe,CAAC,wDAAwD,CAAC,CAAC;QACzF,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IARK;QAAL,uBAAI;;;;oEAGJ;IAEK;QAAL,uBAAI;;;;sEAGJ;IAVQ,cAAc;QAD1B,wBAAK;OACO,cAAc,CAW1B;IAAD,qBAAC;CAAA,AAXD,IAWC;AAXY,wCAAc;AAY3B,MAAM,CAAC,OAAO,GAAG,IAAI,cAAc,EAAE,CAAA"}

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/context-url.spec.ts

@@ -1,25 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox 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 * as chai from 'chai';
-import { suite, test } from 'mocha-typescript';
-import { contextUrlToUrl } from './context-url';
-const expect = chai.expect;
-
-@suite
-export class ContextUrlTest {
-
-    @test public parseContextUrl_withEnvVar() {
-        const actual = contextUrlToUrl("passedin=test%20value/https://github.com/gitpod-io/gitpod-test-repo");
-        expect(actual?.pathname).to.equal("/gitpod-io/gitpod-test-repo");
-    }
-
-    @test public parseContextUrl_withPrebuild() {
-        const actual = contextUrlToUrl("prebuild/https://github.com/gitpod-io/gitpod-test-repo");
-        expect(actual?.host).to.equal("github.com");
-    }
-}
-module.exports = new ContextUrlTest()

package/src/util/context-url.ts

@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
- * Licensed under the GNU Affero General Public License (AGPL).
- * See License-AGPL.txt in the project root for license information.
- */
-
-/**
- * The field "contextUrl" might contain prefixes like:
- *  - envvar1=value1/...
- *  - prebuild/...
- * This is the analogon to the (Prefix)ContextParser structure in "server".
- */
-export function contextUrlToUrl(contextUrl: string | undefined): URL | undefined {
-  if (contextUrl === undefined) {
-    return undefined;
-  }
-  
-  if (contextUrl.startsWith("http")) {
-    return new URL(contextUrl);
-  }
-  const finding = contextUrl.search("/http");
-  return new URL(contextUrl.substr(finding + 1));
-}