@gitpod/gitpod-protocol 0.1.5-vn-integrate-gitpod-yml-tasks-into-jetbrainsa.5 → 0.1.5-vn-6525.77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/data/gitpod-schema.json +28 -2
- package/lib/accounting-protocol.d.ts +10 -10
- package/lib/accounting-protocol.d.ts.map +1 -1
- package/lib/accounting-protocol.js +22 -31
- package/lib/accounting-protocol.js.map +1 -1
- package/lib/admin-protocol.d.ts +4 -2
- package/lib/admin-protocol.d.ts.map +1 -1
- package/lib/admin-protocol.js.map +1 -1
- package/lib/analytics.d.ts +4 -5
- package/lib/analytics.d.ts.map +1 -1
- package/lib/analytics.js.map +1 -1
- package/lib/auth.d.ts.map +1 -1
- package/lib/context-url.d.ts.map +1 -1
- package/lib/context-url.js +3 -3
- package/lib/context-url.js.map +1 -1
- package/lib/context-url.spec.d.ts.map +1 -1
- package/lib/context-url.spec.js +20 -5
- package/lib/context-url.spec.js.map +1 -1
- package/lib/email-protocol.d.ts +1 -1
- package/lib/email-protocol.d.ts.map +1 -1
- package/lib/email-protocol.js.map +1 -1
- package/lib/encryption/container-module.d.ts.map +1 -1
- package/lib/encryption/container-module.js +1 -1
- package/lib/encryption/container-module.js.map +1 -1
- package/lib/encryption/encryption-engine.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.js +7 -7
- package/lib/encryption/encryption-engine.js.map +1 -1
- package/lib/encryption/encryption-engine.spec.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.spec.js +2 -3
- package/lib/encryption/encryption-engine.spec.js.map +1 -1
- package/lib/encryption/encryption-service.d.ts.map +1 -1
- package/lib/encryption/encryption-service.js +1 -1
- package/lib/encryption/encryption-service.js.map +1 -1
- package/lib/encryption/key-provider.d.ts.map +1 -1
- package/lib/encryption/key-provider.js +7 -9
- package/lib/encryption/key-provider.js.map +1 -1
- package/lib/env.d.ts +1 -1
- package/lib/env.d.ts.map +1 -1
- package/lib/env.js +5 -5
- package/lib/env.js.map +1 -1
- package/lib/gitpod-file-parser.d.ts.map +1 -1
- package/lib/gitpod-file-parser.js +6 -6
- package/lib/gitpod-file-parser.js.map +1 -1
- package/lib/gitpod-file-parser.spec.js +42 -39
- package/lib/gitpod-file-parser.spec.js.map +1 -1
- package/lib/gitpod-service.d.ts +23 -26
- package/lib/gitpod-service.d.ts.map +1 -1
- package/lib/gitpod-service.js +32 -26
- package/lib/gitpod-service.js.map +1 -1
- package/lib/headless-workspace-log.d.ts +1 -0
- package/lib/headless-workspace-log.d.ts.map +1 -1
- package/lib/headless-workspace-log.js +2 -1
- package/lib/headless-workspace-log.js.map +1 -1
- package/lib/ide-frontend-service.d.ts +1 -1
- package/lib/ide-protocol.d.ts +6 -6
- package/lib/ide-protocol.d.ts.map +1 -1
- package/lib/index.d.ts +16 -16
- package/lib/installation-admin-protocol.d.ts +1 -1
- package/lib/installation-admin-protocol.d.ts.map +1 -1
- package/lib/installation-admin-protocol.js +2 -2
- package/lib/installation-admin-protocol.js.map +1 -1
- package/lib/license-protocol.d.ts.map +1 -1
- package/lib/license-protocol.js.map +1 -1
- package/lib/messaging/browser/connection.d.ts +1 -1
- package/lib/messaging/browser/connection.d.ts.map +1 -1
- package/lib/messaging/browser/connection.js +19 -19
- package/lib/messaging/browser/connection.js.map +1 -1
- package/lib/messaging/browser/window-connection.d.ts +4 -4
- package/lib/messaging/browser/window-connection.d.ts.map +1 -1
- package/lib/messaging/browser/window-connection.js +9 -6
- package/lib/messaging/browser/window-connection.js.map +1 -1
- package/lib/messaging/client-call-metrics.d.ts +2 -2
- package/lib/messaging/client-call-metrics.d.ts.map +1 -1
- package/lib/messaging/client-call-metrics.js +20 -20
- package/lib/messaging/client-call-metrics.js.map +1 -1
- package/lib/messaging/error.d.ts.map +1 -1
- package/lib/messaging/error.js.map +1 -1
- package/lib/messaging/handler.d.ts.map +1 -1
- package/lib/messaging/handler.js +1 -1
- package/lib/messaging/node/connection.js +8 -8
- package/lib/messaging/node/connection.js.map +1 -1
- package/lib/messaging/proxy-factory.d.ts +1 -1
- package/lib/messaging/proxy-factory.d.ts.map +1 -1
- package/lib/messaging/proxy-factory.js +7 -9
- package/lib/messaging/proxy-factory.js.map +1 -1
- package/lib/payment-protocol.d.ts.map +1 -1
- package/lib/payment-protocol.js +1 -1
- package/lib/payment-protocol.js.map +1 -1
- package/lib/permission.d.ts +2 -2
- package/lib/permission.d.ts.map +1 -1
- package/lib/permission.js +12 -23
- package/lib/permission.js.map +1 -1
- package/lib/plans.d.ts +3 -3
- package/lib/plans.d.ts.map +1 -1
- package/lib/plans.js +206 -171
- package/lib/plans.js.map +1 -1
- package/lib/protocol.d.ts +53 -37
- package/lib/protocol.d.ts.map +1 -1
- package/lib/protocol.js +85 -86
- package/lib/protocol.js.map +1 -1
- package/lib/snapshot-url.spec.js.map +1 -1
- package/lib/team-subscription-protocol.d.ts +5 -3
- package/lib/team-subscription-protocol.d.ts.map +1 -1
- package/lib/team-subscription-protocol.js +4 -4
- package/lib/team-subscription-protocol.js.map +1 -1
- package/lib/teams-projects-protocol.d.ts +3 -3
- package/lib/teams-projects-protocol.d.ts.map +1 -1
- package/lib/teams-projects-protocol.js +1 -1
- package/lib/teams-projects-protocol.js.map +1 -1
- package/lib/typings/globals.d.ts +2 -2
- package/lib/typings/globals.d.ts.map +1 -1
- package/lib/util/analytics.d.ts.map +1 -1
- package/lib/util/analytics.js +12 -3
- package/lib/util/analytics.js.map +1 -1
- package/lib/util/async-iterator.d.ts.map +1 -1
- package/lib/util/async-iterator.js +3 -3
- package/lib/util/async-iterator.js.map +1 -1
- package/lib/util/cancelable.js.map +1 -1
- package/lib/util/date-time.js +6 -6
- package/lib/util/date-time.js.map +1 -1
- package/lib/util/deferred.js.map +1 -1
- package/lib/util/disposable.d.ts.map +1 -1
- package/lib/util/disposable.js +2 -2
- package/lib/util/disposable.js.map +1 -1
- package/lib/util/event.d.ts.map +1 -1
- package/lib/util/event.js +5 -3
- package/lib/util/event.js.map +1 -1
- package/lib/util/garbage-collected-cache.d.ts.map +1 -1
- package/lib/util/garbage-collected-cache.js +1 -1
- package/lib/util/garbage-collected-cache.js.map +1 -1
- package/lib/util/generate-workspace-id.d.ts.map +1 -1
- package/lib/util/generate-workspace-id.js +435 -435
- package/lib/util/generate-workspace-id.js.map +1 -1
- package/lib/util/generate-workspace-id.spec.js +10 -6
- package/lib/util/generate-workspace-id.spec.js.map +1 -1
- package/lib/util/gitpod-cookie.d.ts +1 -1
- package/lib/util/gitpod-cookie.d.ts.map +1 -1
- package/lib/util/gitpod-cookie.js +0 -3
- package/lib/util/gitpod-cookie.js.map +1 -1
- package/lib/util/gitpod-host-url.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.js +31 -29
- package/lib/util/gitpod-host-url.js.map +1 -1
- package/lib/util/gitpod-host-url.spec.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.spec.js +15 -5
- package/lib/util/gitpod-host-url.spec.js.map +1 -1
- package/lib/util/grpc.d.ts.map +1 -1
- package/lib/util/grpc.js.map +1 -1
- package/lib/util/jaeger-client-types.d.ts.map +1 -1
- package/lib/util/logging.d.ts +1 -1
- package/lib/util/logging.d.ts.map +1 -1
- package/lib/util/logging.js +22 -23
- package/lib/util/logging.js.map +1 -1
- package/lib/util/make-link.js +5 -5
- package/lib/util/make-link.js.map +1 -1
- package/lib/util/parse-workspace-id.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.js +1 -2
- package/lib/util/parse-workspace-id.js.map +1 -1
- package/lib/util/parse-workspace-id.spec.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.spec.js.map +1 -1
- package/lib/util/queue.spec.js +9 -6
- package/lib/util/queue.spec.js.map +1 -1
- package/lib/util/semaphore.d.ts.map +1 -1
- package/lib/util/semaphore.js.map +1 -1
- package/lib/util/skip-if.d.ts.map +1 -1
- package/lib/util/skip-if.js.map +1 -1
- package/lib/util/timeutil.d.ts.map +1 -1
- package/lib/util/timeutil.js +2 -2
- package/lib/util/timeutil.js.map +1 -1
- package/lib/util/timeutil.spec.d.ts.map +1 -1
- package/lib/util/timeutil.spec.js.map +1 -1
- package/lib/util/tracing.d.ts +6 -6
- package/lib/util/tracing.d.ts.map +1 -1
- package/lib/util/tracing.js +6 -6
- package/lib/util/tracing.js.map +1 -1
- package/lib/util/tracing.spec.js +3 -3
- package/lib/util/tracing.spec.js.map +1 -1
- package/lib/util/workspace-port-authentication.d.ts +7 -7
- package/lib/util/workspace-port-authentication.d.ts.map +1 -1
- package/lib/util/workspace-port-authentication.js +8 -11
- package/lib/util/workspace-port-authentication.js.map +1 -1
- package/lib/workspace-cluster.d.ts +1 -1
- package/lib/workspace-cluster.d.ts.map +1 -1
- package/lib/workspace-cluster.js +2 -4
- package/lib/workspace-cluster.js.map +1 -1
- package/lib/workspace-instance.d.ts +2 -2
- package/lib/workspace-instance.d.ts.map +1 -1
- package/lib/wsready.d.ts +1 -1
- package/lib/wsready.d.ts.map +1 -1
- package/lib/wsready.js +2 -2
- package/package.json +2 -2
- package/pkg-yarn.lock +2 -2
- package/provenance-bundle.jsonl +1 -1
- package/src/accounting-protocol.ts +53 -51
- package/src/admin-protocol.ts +25 -21
- package/src/analytics.ts +26 -28
- package/src/auth.ts +2 -2
- package/src/context-url.spec.ts +25 -11
- package/src/context-url.ts +80 -78
- package/src/email-protocol.ts +5 -6
- package/src/encryption/container-module.ts +2 -3
- package/src/encryption/encryption-engine.spec.ts +9 -8
- package/src/encryption/encryption-engine.ts +14 -14
- package/src/encryption/encryption-service.ts +4 -5
- package/src/encryption/key-provider.ts +16 -19
- package/src/env.ts +9 -9
- package/src/gitpod-file-parser.spec.ts +55 -61
- package/src/gitpod-file-parser.ts +16 -17
- package/src/gitpod-service.ts +130 -104
- package/src/headless-workspace-log.ts +6 -4
- package/src/ide-frontend-service.ts +2 -2
- package/src/ide-protocol.ts +8 -8
- package/src/index.ts +16 -16
- package/src/installation-admin-protocol.ts +9 -9
- package/src/license-protocol.ts +5 -6
- package/src/messaging/browser/connection.ts +45 -47
- package/src/messaging/browser/window-connection.ts +39 -29
- package/src/messaging/client-call-metrics.ts +70 -71
- package/src/messaging/error.ts +1 -3
- package/src/messaging/handler.ts +6 -6
- package/src/messaging/node/connection.ts +8 -8
- package/src/messaging/proxy-factory.ts +23 -30
- package/src/oss-allowlist.ts +3 -3
- package/src/payment-protocol.ts +2 -2
- package/src/permission.ts +20 -31
- package/src/plans.ts +236 -189
- package/src/protocol.ts +239 -239
- package/src/snapshot-url.spec.ts +9 -7
- package/src/team-subscription-protocol.ts +33 -23
- package/src/teams-projects-protocol.ts +8 -8
- package/src/typings/globals.ts +4 -4
- package/src/util/analytics.ts +46 -24
- package/src/util/async-iterator.ts +4 -5
- package/src/util/cancelable.ts +3 -3
- package/src/util/date-time.ts +8 -8
- package/src/util/deferred.ts +6 -6
- package/src/util/disposable.ts +3 -6
- package/src/util/event.ts +9 -11
- package/src/util/garbage-collected-cache.ts +3 -6
- package/src/util/generate-workspace-id.spec.ts +18 -15
- package/src/util/generate-workspace-id.ts +453 -453
- package/src/util/gitpod-cookie.ts +8 -9
- package/src/util/gitpod-host-url.spec.ts +40 -13
- package/src/util/gitpod-host-url.ts +37 -34
- package/src/util/grpc.ts +1 -1
- package/src/util/jaeger-client-types.ts +2 -2
- package/src/util/logging.ts +49 -39
- package/src/util/make-link.ts +6 -7
- package/src/util/parse-workspace-id.spec.ts +17 -8
- package/src/util/parse-workspace-id.ts +5 -6
- package/src/util/queue.spec.ts +27 -25
- package/src/util/repeat.ts +1 -1
- package/src/util/semaphore.ts +4 -6
- package/src/util/skip-if.ts +9 -6
- package/src/util/timeutil.spec.ts +14 -15
- package/src/util/timeutil.ts +15 -11
- package/src/util/tracing.spec.ts +28 -23
- package/src/util/tracing.ts +46 -41
- package/src/util/workspace-port-authentication.ts +10 -13
- package/src/workspace-cluster.ts +15 -12
- package/src/workspace-instance.ts +27 -23
- package/src/wsready.ts +3 -3
- package/data/builtin-theia-plugins.json +0 -372
- package/lib/theia-plugins.d.ts +0 -11
- package/lib/theia-plugins.d.ts.map +0 -1
- package/lib/theia-plugins.js +0 -8
- package/lib/theia-plugins.js.map +0 -1
- package/src/theia-plugins.ts +0 -11
|
@@ -20,7 +20,7 @@ const REGEX_WORKSPACE_ID_LEGACY_FROM_HOSTNAME = new RegExp(`(${REGEX_WORKSPACE_I
|
|
|
20
20
|
* - webview-1234-moccasin-ferret-155799b3.ws-eu01.gitpod.io (or any other string replacing webview)
|
|
21
21
|
* @param hostname The hostname the request is headed to
|
|
22
22
|
*/
|
|
23
|
-
export const parseWorkspaceIdFromHostname = function(hostname: string) {
|
|
23
|
+
export const parseWorkspaceIdFromHostname = function (hostname: string) {
|
|
24
24
|
const match = REGEX_WORKSPACE_ID_FROM_HOSTNAME.exec(hostname);
|
|
25
25
|
if (match && match.length >= 2) {
|
|
26
26
|
return match[1];
|
|
@@ -41,15 +41,14 @@ const REGEX_INSTANCE_ID_EXACT = new RegExp(`^${REGEX_INSTANCE_ID.source}$`);
|
|
|
41
41
|
* @param maybeId
|
|
42
42
|
* @returns
|
|
43
43
|
*/
|
|
44
|
-
export const matchesInstanceIdOrLegacyWorkspaceIdExactly = function(maybeId: string): boolean {
|
|
45
|
-
return REGEX_INSTANCE_ID_EXACT.test(maybeId)
|
|
46
|
-
|| REGEX_WORKSPACE_ID_LEGACY_EXACT.test(maybeId);
|
|
44
|
+
export const matchesInstanceIdOrLegacyWorkspaceIdExactly = function (maybeId: string): boolean {
|
|
45
|
+
return REGEX_INSTANCE_ID_EXACT.test(maybeId) || REGEX_WORKSPACE_ID_LEGACY_EXACT.test(maybeId);
|
|
47
46
|
};
|
|
48
47
|
|
|
49
48
|
/**
|
|
50
49
|
* @param maybeWorkspaceId
|
|
51
50
|
* @returns
|
|
52
51
|
*/
|
|
53
|
-
export const matchesNewWorkspaceIdExactly = function(maybeWorkspaceId: string): boolean {
|
|
52
|
+
export const matchesNewWorkspaceIdExactly = function (maybeWorkspaceId: string): boolean {
|
|
54
53
|
return REGEX_WORKSPACE_ID_EXACT.test(maybeWorkspaceId);
|
|
55
|
-
};
|
|
54
|
+
};
|
package/src/util/queue.spec.ts
CHANGED
|
@@ -4,19 +4,19 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { suite, test, slow, timeout } from
|
|
8
|
-
import * as chai from
|
|
9
|
-
const chaiSubset = require(
|
|
7
|
+
import { suite, test, slow, timeout } from "mocha-typescript";
|
|
8
|
+
import * as chai from "chai";
|
|
9
|
+
const chaiSubset = require("chai-subset");
|
|
10
10
|
chai.use(chaiSubset);
|
|
11
11
|
|
|
12
|
-
import { Queue } from
|
|
13
|
-
import { fail } from
|
|
14
|
-
import { Deferred } from
|
|
12
|
+
import { Queue } from "..";
|
|
13
|
+
import { fail } from "assert";
|
|
14
|
+
import { Deferred } from "./deferred";
|
|
15
15
|
|
|
16
|
-
const expect = chai.expect
|
|
17
|
-
|
|
18
|
-
@suite class QueueSpec {
|
|
16
|
+
const expect = chai.expect;
|
|
19
17
|
|
|
18
|
+
@suite
|
|
19
|
+
class QueueSpec {
|
|
20
20
|
queue: Queue;
|
|
21
21
|
seq: number[];
|
|
22
22
|
|
|
@@ -35,8 +35,7 @@ const expect = chai.expect
|
|
|
35
35
|
resolve(undefined);
|
|
36
36
|
}, sleep);
|
|
37
37
|
});
|
|
38
|
-
else
|
|
39
|
-
this.seq.push(seqNr);
|
|
38
|
+
else this.seq.push(seqNr);
|
|
40
39
|
};
|
|
41
40
|
|
|
42
41
|
if (nextTick)
|
|
@@ -45,20 +44,22 @@ const expect = chai.expect
|
|
|
45
44
|
push().then(resolve);
|
|
46
45
|
});
|
|
47
46
|
});
|
|
48
|
-
else
|
|
49
|
-
await push();
|
|
47
|
+
else await push();
|
|
50
48
|
});
|
|
51
49
|
}
|
|
52
50
|
execError(seqNr: number): Deferred<boolean> {
|
|
53
51
|
const deferred = new Deferred<boolean>();
|
|
54
|
-
this.queue
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
52
|
+
this.queue
|
|
53
|
+
.enqueue(async () => {
|
|
54
|
+
this.seq.push(seqNr);
|
|
55
|
+
throw new Error("test error");
|
|
56
|
+
})
|
|
57
|
+
.then(() => {
|
|
58
|
+
deferred.reject(false);
|
|
59
|
+
})
|
|
60
|
+
.catch(() => {
|
|
61
|
+
deferred.resolve(true);
|
|
62
|
+
});
|
|
62
63
|
|
|
63
64
|
return deferred;
|
|
64
65
|
}
|
|
@@ -67,7 +68,9 @@ const expect = chai.expect
|
|
|
67
68
|
expect(actual).to.have.lengthOf(expected.length);
|
|
68
69
|
const expIt = expected.entries();
|
|
69
70
|
for (const act of actual) {
|
|
70
|
-
const {
|
|
71
|
+
const {
|
|
72
|
+
value: [, exp],
|
|
73
|
+
} = expIt.next();
|
|
71
74
|
expect(act).to.deep.equal(exp);
|
|
72
75
|
}
|
|
73
76
|
}
|
|
@@ -93,7 +96,6 @@ const expect = chai.expect
|
|
|
93
96
|
this.expectArray(this.seq, [1, 2]);
|
|
94
97
|
}
|
|
95
98
|
|
|
96
|
-
|
|
97
99
|
@test public async continueDespiteError() {
|
|
98
100
|
this.exec(1);
|
|
99
101
|
const receivedError = this.execError(2);
|
|
@@ -107,7 +109,7 @@ const expect = chai.expect
|
|
|
107
109
|
@test public async mustCatchError() {
|
|
108
110
|
const f = async () => {
|
|
109
111
|
throw new Error();
|
|
110
|
-
}
|
|
112
|
+
};
|
|
111
113
|
try {
|
|
112
114
|
const p = this.queue.enqueue(async () => {
|
|
113
115
|
return f();
|
|
@@ -124,7 +126,7 @@ const expect = chai.expect
|
|
|
124
126
|
@test public async expectUncaughtError() {
|
|
125
127
|
const f = async () => {
|
|
126
128
|
throw new Error();
|
|
127
|
-
}
|
|
129
|
+
};
|
|
128
130
|
const p = this.queue.enqueue(async () => {
|
|
129
131
|
return f();
|
|
130
132
|
});
|
package/src/util/repeat.ts
CHANGED
package/src/util/semaphore.ts
CHANGED
|
@@ -4,19 +4,18 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
|
|
8
7
|
export class Semaphore {
|
|
9
8
|
protected queue: (() => void)[] = [];
|
|
10
9
|
protected used: number;
|
|
11
10
|
|
|
12
11
|
constructor(protected readonly capacity: number) {
|
|
13
|
-
if(capacity < 1) {
|
|
12
|
+
if (capacity < 1) {
|
|
14
13
|
throw new Error("Capacity cannot be less than 1");
|
|
15
14
|
}
|
|
16
15
|
}
|
|
17
16
|
|
|
18
17
|
public release() {
|
|
19
|
-
if(this.used == 0) return;
|
|
18
|
+
if (this.used == 0) return;
|
|
20
19
|
|
|
21
20
|
const queued = this.queue.shift();
|
|
22
21
|
if (queued) {
|
|
@@ -28,7 +27,7 @@ export class Semaphore {
|
|
|
28
27
|
|
|
29
28
|
public async acquire(): Promise<void> {
|
|
30
29
|
this.used++;
|
|
31
|
-
if(this.used <= this.capacity) {
|
|
30
|
+
if (this.used <= this.capacity) {
|
|
32
31
|
return Promise.resolve();
|
|
33
32
|
}
|
|
34
33
|
|
|
@@ -36,5 +35,4 @@ export class Semaphore {
|
|
|
36
35
|
this.queue.push(rs);
|
|
37
36
|
});
|
|
38
37
|
}
|
|
39
|
-
|
|
40
|
-
}
|
|
38
|
+
}
|
package/src/util/skip-if.ts
CHANGED
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
|
|
8
7
|
/**
|
|
9
8
|
* The subset of actually available fields and methods which are not exported but we care about
|
|
10
9
|
*/
|
|
@@ -18,14 +17,18 @@ interface TestSuiteContext extends Mocha.ISuiteCallbackContext {
|
|
|
18
17
|
* @param doSkip A function which takes a TestSuite and decides if it should be skipped
|
|
19
18
|
*/
|
|
20
19
|
export function skipIf(doSkip: (suite: TestSuiteContext) => boolean): MochaTypeScript.SuiteTrait {
|
|
21
|
-
const trait: MochaTypeScript.SuiteTrait = function(
|
|
22
|
-
|
|
20
|
+
const trait: MochaTypeScript.SuiteTrait = function (
|
|
21
|
+
this: Mocha.ISuiteCallbackContext,
|
|
22
|
+
ctx: Mocha.ISuiteCallbackContext,
|
|
23
|
+
ctor: Function,
|
|
24
|
+
): void {
|
|
25
|
+
const suite = ctx as any as TestSuiteContext; // No idea why those fields are not exported in the types
|
|
23
26
|
const skip = doSkip(suite);
|
|
24
|
-
suite.beforeEach(function(this: Mocha.IHookCallbackContext) {
|
|
27
|
+
suite.beforeEach(function (this: Mocha.IHookCallbackContext) {
|
|
25
28
|
if (skip) {
|
|
26
29
|
this.skip();
|
|
27
30
|
}
|
|
28
|
-
})
|
|
31
|
+
});
|
|
29
32
|
};
|
|
30
33
|
|
|
31
34
|
// Mark as "trait": mimics the behavior of https://github.com/testdeck/testdeck/blob/9d2dd6a458c2c86c945f6f2999b8278b7528a7a7/index.ts#L433
|
|
@@ -45,4 +48,4 @@ export function skipIfEnvVarNotSet(name: string): MochaTypeScript.SuiteTrait {
|
|
|
45
48
|
}
|
|
46
49
|
return skip;
|
|
47
50
|
});
|
|
48
|
-
}
|
|
51
|
+
}
|
|
@@ -4,40 +4,39 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import * as chai from
|
|
7
|
+
import * as chai from "chai";
|
|
8
8
|
const expect = chai.expect;
|
|
9
|
-
import { suite, test } from
|
|
10
|
-
import { oneMonthLater } from
|
|
9
|
+
import { suite, test } from "mocha-typescript";
|
|
10
|
+
import { oneMonthLater } from "./timeutil";
|
|
11
11
|
|
|
12
12
|
@suite()
|
|
13
13
|
export class TimeutilSpec {
|
|
14
|
-
|
|
15
14
|
@test
|
|
16
15
|
testTimeutil() {
|
|
17
16
|
// targeting a 1st, 1th of Jan => 1st of Feb
|
|
18
|
-
this.isOneMonthLater(new Date(2000, 0, 1), 1, new Date(2000, 1, 1))
|
|
17
|
+
this.isOneMonthLater(new Date(2000, 0, 1), 1, new Date(2000, 1, 1));
|
|
19
18
|
|
|
20
19
|
// targeting a 31th, 30th of Apr => 31st of May
|
|
21
|
-
this.isOneMonthLater(new Date(2000, 3, 30), 31, new Date(2000, 4, 31))
|
|
20
|
+
this.isOneMonthLater(new Date(2000, 3, 30), 31, new Date(2000, 4, 31));
|
|
22
21
|
|
|
23
22
|
// targeting a 31th, 31th of Mar => 30th of Apr
|
|
24
|
-
this.isOneMonthLater(new Date(2000, 2, 31), 31, new Date(2000, 3, 30))
|
|
23
|
+
this.isOneMonthLater(new Date(2000, 2, 31), 31, new Date(2000, 3, 30));
|
|
25
24
|
|
|
26
25
|
// targeting a 30th, 30th of Mar => 30th of Apr
|
|
27
|
-
this.isOneMonthLater(new Date(2000, 2, 30), 30, new Date(2000, 3, 30))
|
|
26
|
+
this.isOneMonthLater(new Date(2000, 2, 30), 30, new Date(2000, 3, 30));
|
|
28
27
|
|
|
29
28
|
// next year
|
|
30
|
-
this.isOneMonthLater(new Date(2000, 11, 1), 1, new Date(2001, 0, 1))
|
|
31
|
-
this.isOneMonthLater(new Date(2000, 11, 31), 31, new Date(2001, 0, 31))
|
|
29
|
+
this.isOneMonthLater(new Date(2000, 11, 1), 1, new Date(2001, 0, 1));
|
|
30
|
+
this.isOneMonthLater(new Date(2000, 11, 31), 31, new Date(2001, 0, 31));
|
|
32
31
|
|
|
33
32
|
// Feb
|
|
34
|
-
this.isOneMonthLater(new Date(2001, 0, 31), 31, new Date(2001, 1, 28))
|
|
33
|
+
this.isOneMonthLater(new Date(2001, 0, 31), 31, new Date(2001, 1, 28));
|
|
35
34
|
// Feb leap year
|
|
36
|
-
this.isOneMonthLater(new Date(2000, 0, 31), 31, new Date(2000, 1, 29))
|
|
35
|
+
this.isOneMonthLater(new Date(2000, 0, 31), 31, new Date(2000, 1, 29));
|
|
37
36
|
}
|
|
38
37
|
|
|
39
38
|
isOneMonthLater(from: Date, day: number, expectation: Date) {
|
|
40
|
-
const later = oneMonthLater(from.toISOString(), day)
|
|
41
|
-
expect(later, `expected ${later} to be equal ${expectation}`).to.be.equal(expectation.toISOString())
|
|
39
|
+
const later = oneMonthLater(from.toISOString(), day);
|
|
40
|
+
expect(later, `expected ${later} to be equal ${expectation}`).to.be.equal(expectation.toISOString());
|
|
42
41
|
}
|
|
43
|
-
}
|
|
42
|
+
}
|
package/src/util/timeutil.ts
CHANGED
|
@@ -24,28 +24,32 @@ export function oneMonthLater(fromDate: string, day?: number): string {
|
|
|
24
24
|
}
|
|
25
25
|
return later.toISOString();
|
|
26
26
|
}
|
|
27
|
-
export const yearsLater = (fromDate: string, years: number): string =>
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
27
|
+
export const yearsLater = (fromDate: string, years: number): string =>
|
|
28
|
+
liftDate1(fromDate, (d) => {
|
|
29
|
+
d.setUTCFullYear(d.getUTCFullYear() + years);
|
|
30
|
+
return d.toISOString();
|
|
31
|
+
});
|
|
31
32
|
|
|
32
33
|
// tslint:disable-next-line:no-shadowed-variable
|
|
33
|
-
export const addMillis = (d1: string, millis: number) =>
|
|
34
|
-
|
|
34
|
+
export const addMillis = (d1: string, millis: number) =>
|
|
35
|
+
liftDate1(d1, (d1) => new Date(d1.getTime() + millis).toISOString());
|
|
36
|
+
export const durationInHours = (d1: string, d2: string) =>
|
|
37
|
+
liftDate(d1, d2, (d1, d2) => millisecondsToHours(d1.getTime() - d2.getTime()));
|
|
35
38
|
export const durationInMillis = (d1: string, d2: string) => liftDate(d1, d2, (d1, d2) => d1.getTime() - d2.getTime());
|
|
36
39
|
// tslint:disable-next-line:no-shadowed-variable
|
|
37
|
-
export const isDateGreaterOrEqual = (d1: string, d2: string): boolean =>
|
|
40
|
+
export const isDateGreaterOrEqual = (d1: string, d2: string): boolean =>
|
|
41
|
+
liftDate(d1, d2, (d1, d2) => d1.getTime() >= d2.getTime());
|
|
38
42
|
export const isDateSmallerOrEqual = (d1: string, d2: string | undefined) => !d2 || d1 <= d2;
|
|
39
43
|
export const isDateSmaller = (d1: string, d2: string | undefined) => !d2 || d1 < d2;
|
|
40
|
-
export const oldest = (d1: string, d2: string): string => d1 > d2 ? d1 : d2;
|
|
41
|
-
export const earliest = (d1: string, d2: string): string => d1 < d2 ? d1 : d2;
|
|
44
|
+
export const oldest = (d1: string, d2: string): string => (d1 > d2 ? d1 : d2);
|
|
45
|
+
export const earliest = (d1: string, d2: string): string => (d1 < d2 ? d1 : d2);
|
|
42
46
|
export const orderAsc = (d1: string, d2: string): number => liftDate(d1, d2, (d1, d2) => d1.getTime() - d2.getTime());
|
|
43
47
|
export const liftDate1 = <T>(d1: string, f: (d1: Date) => T): T => f(new Date(d1));
|
|
44
48
|
export const liftDate = <T>(d1: string, d2: string, f: (d1: Date, d2: Date) => T): T => f(new Date(d1), new Date(d2));
|
|
45
49
|
|
|
46
50
|
export function hoursLater(date: string, hours: number): string {
|
|
47
|
-
const result = new Date(date)
|
|
48
|
-
result.setHours(result.getHours() + hours)
|
|
51
|
+
const result = new Date(date);
|
|
52
|
+
result.setHours(result.getHours() + hours);
|
|
49
53
|
return result.toISOString();
|
|
50
54
|
}
|
|
51
55
|
|
package/src/util/tracing.spec.ts
CHANGED
|
@@ -4,28 +4,31 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { suite, test } from "mocha-typescript"
|
|
8
|
-
import * as chai from "chai"
|
|
7
|
+
import { suite, test } from "mocha-typescript";
|
|
8
|
+
import * as chai from "chai";
|
|
9
9
|
import { TraceContext } from "./tracing";
|
|
10
10
|
import { MockTracer } from "opentracing";
|
|
11
11
|
|
|
12
|
-
const expect = chai.expect
|
|
13
|
-
|
|
14
|
-
@suite class TestTracing {
|
|
12
|
+
const expect = chai.expect;
|
|
15
13
|
|
|
14
|
+
@suite
|
|
15
|
+
class TestTracing {
|
|
16
16
|
@test public async testTracingContext_addNestedTags() {
|
|
17
17
|
const tracer = new MockTracer();
|
|
18
|
-
const span = tracer.startSpan(
|
|
19
|
-
TraceContext.addNestedTags(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
18
|
+
const span = tracer.startSpan("testTracingContext_addNestedTags");
|
|
19
|
+
TraceContext.addNestedTags(
|
|
20
|
+
{ span },
|
|
21
|
+
{
|
|
22
|
+
rpc: {
|
|
23
|
+
system: "jsonrpc",
|
|
24
|
+
jsonrpc: {
|
|
25
|
+
version: "1.0",
|
|
26
|
+
method: "test",
|
|
27
|
+
parameters: ["abc", "def"],
|
|
28
|
+
},
|
|
26
29
|
},
|
|
27
30
|
},
|
|
28
|
-
|
|
31
|
+
);
|
|
29
32
|
|
|
30
33
|
const mockSpan = tracer.report().spans[0];
|
|
31
34
|
expect(mockSpan.tags()).to.deep.equal({
|
|
@@ -39,13 +42,16 @@ const expect = chai.expect
|
|
|
39
42
|
|
|
40
43
|
@test public async testTracingContext_addNestedTags_null() {
|
|
41
44
|
const tracer = new MockTracer();
|
|
42
|
-
const span = tracer.startSpan(
|
|
43
|
-
TraceContext.addNestedTags(
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
const span = tracer.startSpan("testTracingContext_addNestedTags_null");
|
|
46
|
+
TraceContext.addNestedTags(
|
|
47
|
+
{ span },
|
|
48
|
+
{
|
|
49
|
+
someShape: {
|
|
50
|
+
thisIsNull: null,
|
|
51
|
+
thisIsUndefined: undefined,
|
|
52
|
+
},
|
|
47
53
|
},
|
|
48
|
-
|
|
54
|
+
);
|
|
49
55
|
|
|
50
56
|
const mockSpan = tracer.report().spans[0];
|
|
51
57
|
expect(mockSpan.tags()).to.deep.equal({
|
|
@@ -56,7 +62,7 @@ const expect = chai.expect
|
|
|
56
62
|
|
|
57
63
|
@test public async testTracingContext_addJsonRPCParameters() {
|
|
58
64
|
const tracer = new MockTracer();
|
|
59
|
-
const span = tracer.startSpan(
|
|
65
|
+
const span = tracer.startSpan("testTracingContext_addJsonRPCParameters");
|
|
60
66
|
const ctx = { span };
|
|
61
67
|
TraceContext.addJsonRPCParameters(ctx, {
|
|
62
68
|
one: "one",
|
|
@@ -78,6 +84,5 @@ const expect = chai.expect
|
|
|
78
84
|
"rpc.system": "jsonrpc",
|
|
79
85
|
});
|
|
80
86
|
}
|
|
81
|
-
|
|
82
87
|
}
|
|
83
|
-
module.exports = new TestTracing()
|
|
88
|
+
module.exports = new TestTracing();
|
package/src/util/tracing.ts
CHANGED
|
@@ -4,22 +4,20 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
import
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import { log, LogContext } from './logging';
|
|
7
|
+
import * as opentracing from "opentracing";
|
|
8
|
+
import { TracingConfig, initTracerFromEnv } from "jaeger-client";
|
|
9
|
+
import { Sampler, SamplingDecision } from "./jaeger-client-types";
|
|
10
|
+
import { initGlobalTracer } from "opentracing";
|
|
11
|
+
import { injectable } from "inversify";
|
|
12
|
+
import { ResponseError } from "vscode-jsonrpc";
|
|
13
|
+
import { log, LogContext } from "./logging";
|
|
15
14
|
|
|
16
15
|
export interface TraceContext {
|
|
17
|
-
span?: opentracing.Span
|
|
16
|
+
span?: opentracing.Span;
|
|
18
17
|
}
|
|
19
18
|
export type TraceContextWithSpan = TraceContext & {
|
|
20
|
-
span: opentracing.Span
|
|
21
|
-
}
|
|
22
|
-
|
|
19
|
+
span: opentracing.Span;
|
|
20
|
+
};
|
|
23
21
|
|
|
24
22
|
export namespace TraceContext {
|
|
25
23
|
export function startSpan(operation: string, parentCtx?: TraceContext): opentracing.Span {
|
|
@@ -53,9 +51,9 @@ export namespace TraceContext {
|
|
|
53
51
|
|
|
54
52
|
const span = TraceContext.startSpan(operation, ctx);
|
|
55
53
|
try {
|
|
56
|
-
callback({span});
|
|
54
|
+
callback({ span });
|
|
57
55
|
} catch (e) {
|
|
58
|
-
TraceContext.setError({span}, e);
|
|
56
|
+
TraceContext.setError({ span }, e);
|
|
59
57
|
throw e;
|
|
60
58
|
} finally {
|
|
61
59
|
span.finish();
|
|
@@ -93,7 +91,12 @@ export namespace TraceContext {
|
|
|
93
91
|
addNestedTags(ctx, tags);
|
|
94
92
|
}
|
|
95
93
|
|
|
96
|
-
export function setJsonRPCError(
|
|
94
|
+
export function setJsonRPCError(
|
|
95
|
+
ctx: TraceContext,
|
|
96
|
+
method: string,
|
|
97
|
+
err: ResponseError<any>,
|
|
98
|
+
withStatusCode: boolean = false,
|
|
99
|
+
) {
|
|
97
100
|
if (!ctx.span) {
|
|
98
101
|
return;
|
|
99
102
|
}
|
|
@@ -160,7 +163,7 @@ export namespace TraceContext {
|
|
|
160
163
|
if (!ctx.span) {
|
|
161
164
|
return;
|
|
162
165
|
}
|
|
163
|
-
const namespace = _namespace ? `${_namespace}.` :
|
|
166
|
+
const namespace = _namespace ? `${_namespace}.` : "";
|
|
164
167
|
|
|
165
168
|
try {
|
|
166
169
|
for (const k of Object.keys(keyValueMap)) {
|
|
@@ -189,7 +192,6 @@ export namespace TraceContext {
|
|
|
189
192
|
|
|
190
193
|
@injectable()
|
|
191
194
|
export class TracingManager {
|
|
192
|
-
|
|
193
195
|
public setup(serviceName: string, opts?: CustomTracerOpts) {
|
|
194
196
|
initGlobalTracer(this.getTracerForService(serviceName, opts));
|
|
195
197
|
}
|
|
@@ -198,16 +200,16 @@ export class TracingManager {
|
|
|
198
200
|
const config: TracingConfig = {
|
|
199
201
|
disable: false,
|
|
200
202
|
reporter: {
|
|
201
|
-
logSpans: false
|
|
203
|
+
logSpans: false,
|
|
202
204
|
},
|
|
203
205
|
serviceName,
|
|
204
|
-
}
|
|
206
|
+
};
|
|
205
207
|
const t = initTracerFromEnv(config, {
|
|
206
208
|
logger: console,
|
|
207
209
|
tags: {
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
}
|
|
210
|
+
"service.build.commit": process.env.GITPOD_BUILD_GIT_COMMIT,
|
|
211
|
+
"service.build.version": process.env.GITPOD_BUILD_VERSION,
|
|
212
|
+
},
|
|
211
213
|
});
|
|
212
214
|
|
|
213
215
|
if (opts) {
|
|
@@ -217,24 +219,22 @@ export class TracingManager {
|
|
|
217
219
|
}
|
|
218
220
|
return t;
|
|
219
221
|
}
|
|
220
|
-
|
|
221
222
|
}
|
|
222
223
|
|
|
223
224
|
export interface CustomTracerOpts {
|
|
224
|
-
perOpSampling?: PerOperationSampling
|
|
225
|
+
perOpSampling?: PerOperationSampling;
|
|
225
226
|
}
|
|
226
227
|
|
|
227
|
-
|
|
228
228
|
// has to conform to https://github.com/jaegertracing/jaeger-client-node/blob/0042b1c0a0796bb655eb93e77ff76ab5e94c2bb6/src/_flow/sampler-thrift.js#L32
|
|
229
229
|
export interface PerOperationSampling {
|
|
230
|
-
[key: string]: boolean
|
|
230
|
+
[key: string]: boolean;
|
|
231
231
|
}
|
|
232
232
|
|
|
233
233
|
export class PerOperationSampler implements Sampler {
|
|
234
234
|
constructor(protected readonly fallback: Sampler, protected readonly strategies: PerOperationSampling) {}
|
|
235
235
|
|
|
236
236
|
name(): string {
|
|
237
|
-
return
|
|
237
|
+
return "PerOperationSampler";
|
|
238
238
|
}
|
|
239
239
|
|
|
240
240
|
toString(): string {
|
|
@@ -274,7 +274,7 @@ export class PerOperationSampler implements Sampler {
|
|
|
274
274
|
return false; // TODO equal should be removed
|
|
275
275
|
}
|
|
276
276
|
|
|
277
|
-
close(callback: ()=>void): void {
|
|
277
|
+
close(callback: () => void): void {
|
|
278
278
|
// all nested samplers are of simple types, so we do not need to Close them
|
|
279
279
|
if (callback) {
|
|
280
280
|
callback();
|
|
@@ -283,18 +283,23 @@ export class PerOperationSampler implements Sampler {
|
|
|
283
283
|
}
|
|
284
284
|
|
|
285
285
|
// Augment interfaces with an leading parameter "TraceContext" on every method
|
|
286
|
-
type IsValidArg<T> = T extends object ? keyof T extends never ? false : true : true;
|
|
287
|
-
type AddTraceContext<T> =
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
IsValidArg<E> extends true
|
|
291
|
-
|
|
292
|
-
IsValidArg<
|
|
293
|
-
|
|
294
|
-
IsValidArg<
|
|
295
|
-
(ctx: TraceContextWithSpan) =>
|
|
296
|
-
|
|
286
|
+
type IsValidArg<T> = T extends object ? (keyof T extends never ? false : true) : true;
|
|
287
|
+
type AddTraceContext<T> = T extends (a: infer A, b: infer B, c: infer C, d: infer D, e: infer E, f: infer F) => infer R
|
|
288
|
+
? IsValidArg<F> extends true
|
|
289
|
+
? (ctx: TraceContextWithSpan, a: A, b: B, c: C, d: D, e: E, f: F) => R
|
|
290
|
+
: IsValidArg<E> extends true
|
|
291
|
+
? (ctx: TraceContextWithSpan, a: A, b: B, c: C, d: D, e: E) => R
|
|
292
|
+
: IsValidArg<D> extends true
|
|
293
|
+
? (ctx: TraceContextWithSpan, a: A, b: B, c: C, d: D) => R
|
|
294
|
+
: IsValidArg<C> extends true
|
|
295
|
+
? (ctx: TraceContextWithSpan, a: A, b: B, c: C) => R
|
|
296
|
+
: IsValidArg<B> extends true
|
|
297
|
+
? (ctx: TraceContextWithSpan, a: A, b: B) => R
|
|
298
|
+
: IsValidArg<A> extends true
|
|
299
|
+
? (ctx: TraceContextWithSpan, a: A) => R
|
|
300
|
+
: (ctx: TraceContextWithSpan) => Promise<R>
|
|
301
|
+
: never;
|
|
297
302
|
|
|
298
303
|
export type InterfaceWithTraceContext<T> = {
|
|
299
|
-
[P in keyof T]: AddTraceContext<T[P]
|
|
300
|
-
};
|
|
304
|
+
[P in keyof T]: AddTraceContext<T[P]>;
|
|
305
|
+
};
|
|
@@ -5,16 +5,13 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
|
-
* These cookies are set in the Theia frontend. This pattern is relied upon in:
|
|
9
|
-
* - proxy:
|
|
10
|
-
* - to filter it out on port locations
|
|
11
|
-
* - to forward it to the server for authentication
|
|
12
|
-
* - server:
|
|
13
|
-
* - to authenticate access to port locations
|
|
14
|
-
*/
|
|
15
|
-
export const worspacePortAuthCookieName = function(host: string, workspaceId: string): string {
|
|
16
|
-
return host
|
|
17
|
-
|
|
18
|
-
.replace(/[\W_]+/g, "_")
|
|
19
|
-
+ `_ws_${workspaceId}_port_auth_`;
|
|
20
|
-
};
|
|
8
|
+
* These cookies are set in the Theia frontend. This pattern is relied upon in:
|
|
9
|
+
* - proxy:
|
|
10
|
+
* - to filter it out on port locations
|
|
11
|
+
* - to forward it to the server for authentication
|
|
12
|
+
* - server:
|
|
13
|
+
* - to authenticate access to port locations
|
|
14
|
+
*/
|
|
15
|
+
export const worspacePortAuthCookieName = function (host: string, workspaceId: string): string {
|
|
16
|
+
return host.replace(/https?/, "").replace(/[\W_]+/g, "_") + `_ws_${workspaceId}_port_auth_`;
|
|
17
|
+
};
|
package/src/workspace-cluster.ts
CHANGED
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import * as fs from
|
|
8
|
-
import { filePathTelepresenceAware } from
|
|
7
|
+
import * as fs from "fs";
|
|
8
|
+
import { filePathTelepresenceAware } from "./env";
|
|
9
9
|
import { DeepPartial } from "./util/deep-partial";
|
|
10
|
-
import { PermissionName } from
|
|
10
|
+
import { PermissionName } from "./permission";
|
|
11
11
|
|
|
12
12
|
export interface WorkspaceCluster {
|
|
13
13
|
// Name of the workspace cluster.
|
|
@@ -47,25 +47,28 @@ export interface TLSConfig {
|
|
|
47
47
|
crt: string;
|
|
48
48
|
}
|
|
49
49
|
export namespace TLSConfig {
|
|
50
|
-
export const loadFromBase64File = (path: string): string =>
|
|
50
|
+
export const loadFromBase64File = (path: string): string =>
|
|
51
|
+
fs.readFileSync(filePathTelepresenceAware(path)).toString("base64");
|
|
51
52
|
}
|
|
52
53
|
export type WorkspaceClusterWoTLS = Omit<WorkspaceCluster, "tls">;
|
|
53
54
|
export type WorkspaceManagerConnectionInfo = Pick<WorkspaceCluster, "name" | "url" | "tls">;
|
|
54
55
|
|
|
55
|
-
export type AdmissionConstraint =
|
|
56
|
+
export type AdmissionConstraint =
|
|
57
|
+
| AdmissionConstraintFeaturePreview
|
|
58
|
+
| AdmissionConstraintHasPermission
|
|
59
|
+
| AdmissionConstraintHasUserLevel
|
|
60
|
+
| AdmissionConstraintHasMoreResources;
|
|
56
61
|
export type AdmissionConstraintFeaturePreview = { type: "has-feature-preview" };
|
|
57
|
-
export type AdmissionConstraintHasPermission = { type: "has-permission"
|
|
58
|
-
export type AdmissionConstraintHasUserLevel = { type: "has-user-level"
|
|
62
|
+
export type AdmissionConstraintHasPermission = { type: "has-permission"; permission: PermissionName };
|
|
63
|
+
export type AdmissionConstraintHasUserLevel = { type: "has-user-level"; level: string };
|
|
59
64
|
export type AdmissionConstraintHasMoreResources = { type: "has-more-resources" };
|
|
60
65
|
|
|
61
66
|
export namespace AdmissionConstraint {
|
|
62
67
|
export function is(o: any): o is AdmissionConstraint {
|
|
63
|
-
return !!o
|
|
64
|
-
&& 'type' in o;
|
|
68
|
+
return !!o && "type" in o;
|
|
65
69
|
}
|
|
66
70
|
export function isHasPermissionConstraint(o: any): o is AdmissionConstraintHasPermission {
|
|
67
|
-
return is(o)
|
|
68
|
-
&& o.type === "has-permission";
|
|
71
|
+
return is(o) && o.type === "has-permission";
|
|
69
72
|
}
|
|
70
73
|
export function hasPermission(ac: AdmissionConstraint, permission: PermissionName): boolean {
|
|
71
74
|
return isHasPermissionConstraint(ac) && ac.permission === permission;
|
|
@@ -101,4 +104,4 @@ export interface WorkspaceClusterDB {
|
|
|
101
104
|
}
|
|
102
105
|
export interface WorkspaceClusterFilter extends Pick<WorkspaceCluster, "state" | "govern" | "url"> {
|
|
103
106
|
minScore: number;
|
|
104
|
-
}
|
|
107
|
+
}
|