@gitpod/gitpod-protocol 0.1.5-se-external-config.13 → 0.1.5-se-workspace-for-teams.5
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 +4 -22
- package/lib/accounting-protocol.d.ts +3 -5
- package/lib/accounting-protocol.d.ts.map +1 -1
- package/lib/accounting-protocol.js +0 -5
- package/lib/accounting-protocol.js.map +1 -1
- package/lib/admin-protocol.d.ts +1 -2
- package/lib/admin-protocol.d.ts.map +1 -1
- package/lib/admin-protocol.js.map +1 -1
- package/lib/analytics.d.ts +33 -0
- package/lib/analytics.d.ts.map +1 -0
- package/lib/{util/without.js → analytics.js} +4 -2
- package/lib/analytics.js.map +1 -0
- package/lib/context-url.d.ts +18 -0
- package/lib/context-url.d.ts.map +1 -0
- package/lib/context-url.js +49 -0
- package/lib/context-url.js.map +1 -0
- package/lib/{util/context-url.spec.d.ts → context-url.spec.d.ts} +2 -0
- package/lib/context-url.spec.d.ts.map +1 -0
- package/lib/{util/context-url.spec.js → context-url.spec.js} +26 -2
- package/lib/context-url.spec.js.map +1 -0
- package/lib/email-protocol.d.ts +1 -2
- package/lib/email-protocol.d.ts.map +1 -1
- package/lib/email-protocol.js.map +1 -1
- package/lib/env.d.ts +1 -1
- package/lib/env.d.ts.map +1 -1
- package/lib/env.js +10 -9
- package/lib/env.js.map +1 -1
- package/lib/gitpod-service.d.ts +65 -5
- package/lib/gitpod-service.d.ts.map +1 -1
- package/lib/gitpod-service.js +7 -6
- package/lib/gitpod-service.js.map +1 -1
- package/lib/headless-workspace-log.d.ts +8 -11
- package/lib/headless-workspace-log.d.ts.map +1 -1
- package/lib/headless-workspace-log.js +4 -7
- package/lib/headless-workspace-log.js.map +1 -1
- package/lib/index.d.ts +2 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -0
- package/lib/index.js.map +1 -1
- package/lib/messaging/client-call-metrics.d.ts +35 -0
- package/lib/messaging/client-call-metrics.d.ts.map +1 -0
- package/lib/messaging/client-call-metrics.js +84 -0
- package/lib/messaging/client-call-metrics.js.map +1 -0
- package/lib/messaging/error.d.ts +1 -0
- package/lib/messaging/error.d.ts.map +1 -1
- package/lib/messaging/error.js +2 -0
- package/lib/messaging/error.js.map +1 -1
- package/lib/messaging/node/connection.js +2 -2
- package/lib/messaging/node/connection.js.map +1 -1
- package/lib/messaging/proxy-factory.d.ts.map +1 -1
- package/lib/messaging/proxy-factory.js +3 -1
- package/lib/messaging/proxy-factory.js.map +1 -1
- package/lib/permission.d.ts +2 -1
- package/lib/permission.d.ts.map +1 -1
- package/lib/permission.js +1 -0
- package/lib/permission.js.map +1 -1
- package/lib/protocol.d.ts +41 -24
- package/lib/protocol.d.ts.map +1 -1
- package/lib/protocol.js +18 -1
- package/lib/protocol.js.map +1 -1
- package/lib/team-subscription-protocol.d.ts +3 -3
- package/lib/team-subscription-protocol.d.ts.map +1 -1
- package/lib/team-subscription-protocol.js +3 -0
- package/lib/team-subscription-protocol.js.map +1 -1
- package/lib/teams-projects-protocol.d.ts +100 -0
- package/lib/teams-projects-protocol.d.ts.map +1 -0
- package/lib/teams-projects-protocol.js +34 -0
- package/lib/teams-projects-protocol.js.map +1 -0
- package/lib/util/analytics.d.ts +1 -26
- package/lib/util/analytics.d.ts.map +1 -1
- package/lib/util/analytics.js +1 -2
- package/lib/util/analytics.js.map +1 -1
- package/lib/util/generate-workspace-id.d.ts.map +1 -1
- package/lib/util/generate-workspace-id.js +1 -0
- package/lib/util/generate-workspace-id.js.map +1 -1
- package/lib/util/gitpod-host-url.js +1 -1
- package/lib/util/gitpod-host-url.js.map +1 -1
- package/lib/util/gitpod-host-url.spec.d.ts +5 -0
- package/lib/util/gitpod-host-url.spec.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.spec.js +70 -0
- package/lib/util/gitpod-host-url.spec.js.map +1 -1
- package/lib/util/grpc.d.ts +15 -0
- package/lib/util/grpc.d.ts.map +1 -0
- package/lib/util/grpc.js +18 -0
- package/lib/util/grpc.js.map +1 -0
- package/lib/util/logging.d.ts +17 -1
- package/lib/util/logging.d.ts.map +1 -1
- package/lib/util/logging.js +66 -28
- package/lib/util/logging.js.map +1 -1
- package/lib/workspace-cluster.d.ts +1 -2
- package/lib/workspace-cluster.d.ts.map +1 -1
- package/lib/workspace-cluster.js.map +1 -1
- package/lib/workspace-instance.d.ts +1 -0
- package/lib/workspace-instance.d.ts.map +1 -1
- package/lib/wsready.js +1 -1
- package/lib/wsready.js.map +1 -1
- package/package.json +9 -6
- package/pkg-yarn.lock +6 -4
- package/src/accounting-protocol.ts +3 -7
- package/src/admin-protocol.ts +1 -2
- package/src/analytics.ts +39 -0
- package/src/context-url.spec.ts +39 -0
- package/src/context-url.ts +51 -0
- package/src/email-protocol.ts +1 -2
- package/src/env.ts +10 -9
- package/src/gitpod-service.ts +80 -12
- package/src/headless-workspace-log.ts +7 -11
- package/src/index.ts +2 -0
- package/src/messaging/client-call-metrics.ts +97 -0
- package/src/messaging/error.ts +3 -0
- package/src/messaging/node/connection.ts +2 -2
- package/src/messaging/proxy-factory.ts +3 -1
- package/src/permission.ts +1 -0
- package/src/protocol.ts +58 -29
- package/src/team-subscription-protocol.ts +5 -3
- package/src/teams-projects-protocol.ts +129 -0
- package/src/util/analytics.ts +1 -30
- package/src/util/generate-workspace-id.ts +1 -0
- package/src/util/gitpod-host-url.spec.ts +20 -0
- package/src/util/gitpod-host-url.ts +1 -1
- package/src/util/grpc.ts +15 -0
- package/src/util/logging.ts +64 -13
- package/src/workspace-cluster.ts +1 -2
- package/src/workspace-instance.ts +13 -7
- package/src/wsready.ts +1 -1
- package/lib/util/context-url.d.ts +0 -13
- package/lib/util/context-url.d.ts.map +0 -1
- package/lib/util/context-url.js +0 -26
- package/lib/util/context-url.js.map +0 -1
- package/lib/util/context-url.spec.d.ts.map +0 -1
- package/lib/util/context-url.spec.js.map +0 -1
- package/lib/util/without.d.ts +0 -7
- package/lib/util/without.d.ts.map +0 -1
- package/lib/util/without.js.map +0 -1
- package/src/util/context-url.spec.ts +0 -25
- package/src/util/context-url.ts +0 -23
- package/src/util/without.ts +0 -8
package/data/gitpod-schema.json
CHANGED
|
@@ -4,23 +4,6 @@
|
|
|
4
4
|
"title": "Gitpod Config",
|
|
5
5
|
"type": "object",
|
|
6
6
|
"properties": {
|
|
7
|
-
"ide": {
|
|
8
|
-
"anyOf": [
|
|
9
|
-
{
|
|
10
|
-
"type": "string"
|
|
11
|
-
},
|
|
12
|
-
{
|
|
13
|
-
"type": "string",
|
|
14
|
-
"enum": [
|
|
15
|
-
"theia",
|
|
16
|
-
"code"
|
|
17
|
-
]
|
|
18
|
-
}
|
|
19
|
-
],
|
|
20
|
-
"default": "theia",
|
|
21
|
-
"description": "Controls what ide should be used for a workspace.",
|
|
22
|
-
"deprecationMessage": "The 'ide' property is an experimental feature and enabled only for some users."
|
|
23
|
-
},
|
|
24
7
|
"ports": {
|
|
25
8
|
"type": "array",
|
|
26
9
|
"description": "List of exposed ports.",
|
|
@@ -51,8 +34,8 @@
|
|
|
51
34
|
"private",
|
|
52
35
|
"public"
|
|
53
36
|
],
|
|
54
|
-
"default": "
|
|
55
|
-
"description": "Whether the port visibility should be private or public. '
|
|
37
|
+
"default": "private",
|
|
38
|
+
"description": "Whether the port visibility should be private or public. 'private' (default) will only allow users with workspace access to access the port. 'public' will allow everyone with the port URL to access the port."
|
|
56
39
|
},
|
|
57
40
|
"name": {
|
|
58
41
|
"type": "string",
|
|
@@ -93,7 +76,8 @@
|
|
|
93
76
|
},
|
|
94
77
|
"prebuild": {
|
|
95
78
|
"type": "string",
|
|
96
|
-
"description": "A shell command to run after `before`. This command is executed only on during workspace prebuilds. This command is expected to terminate. If it fails, the workspace build fails."
|
|
79
|
+
"description": "A shell command to run after `before`. This command is executed only on during workspace prebuilds. This command is expected to terminate. If it fails, the workspace build fails.",
|
|
80
|
+
"deprecationMessage": "Deprecated. Please use `init` task instead. See https://www.gitpod.io/docs/config-start-tasks."
|
|
97
81
|
},
|
|
98
82
|
"command": {
|
|
99
83
|
"type": "string",
|
|
@@ -116,10 +100,8 @@
|
|
|
116
100
|
"openMode": {
|
|
117
101
|
"type": "string",
|
|
118
102
|
"enum": [
|
|
119
|
-
"split-top",
|
|
120
103
|
"split-left",
|
|
121
104
|
"split-right",
|
|
122
|
-
"split-bottom",
|
|
123
105
|
"tab-before",
|
|
124
106
|
"tab-after"
|
|
125
107
|
],
|
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
|
-
import { Without } from "./util/without";
|
|
7
6
|
import { User } from './protocol';
|
|
8
7
|
export interface AccountEntry {
|
|
9
8
|
uid: string;
|
|
@@ -32,7 +31,7 @@ export interface AccountEntry {
|
|
|
32
31
|
description?: object;
|
|
33
32
|
}
|
|
34
33
|
export declare namespace AccountEntry {
|
|
35
|
-
function create<T extends AccountEntry>(entry:
|
|
34
|
+
function create<T extends AccountEntry>(entry: Omit<T, 'uid'>): T;
|
|
36
35
|
}
|
|
37
36
|
export declare type DebitAccountEntryKind = 'session' | 'expiry' | 'loss';
|
|
38
37
|
export declare type AccountEntryKind = 'credit' | DebitAccountEntryKind | 'carry' | 'open';
|
|
@@ -119,12 +118,11 @@ export declare namespace AssignedTeamSubscription {
|
|
|
119
118
|
function is(data: any): data is AssignedTeamSubscription;
|
|
120
119
|
}
|
|
121
120
|
export declare namespace Subscription {
|
|
122
|
-
function create(newSubscription:
|
|
121
|
+
function create(newSubscription: Omit<Subscription, 'uid'>): Subscription;
|
|
123
122
|
function cancelSubscription(s: Subscription, cancellationDate: string, endDate?: string): void;
|
|
124
123
|
function isSame(s1: Subscription | undefined, s2: Subscription | undefined): boolean;
|
|
125
124
|
function isActive(s: Subscription, date: string): boolean;
|
|
126
125
|
function isDowngraded(s: Subscription): string | undefined;
|
|
127
|
-
function isCancelled(s: Subscription): boolean;
|
|
128
126
|
function calculateCurrentPeriod(startDate: string, now: Date): {
|
|
129
127
|
startDate: string;
|
|
130
128
|
endDate: string;
|
|
@@ -136,7 +134,7 @@ export interface Period {
|
|
|
136
134
|
endDate: string;
|
|
137
135
|
}
|
|
138
136
|
export declare type MaybePeriod = Period | undefined;
|
|
139
|
-
export declare type AccountEntryFixedPeriod =
|
|
137
|
+
export declare type AccountEntryFixedPeriod = Omit<AccountEntry, 'uid'> & {
|
|
140
138
|
expiryDate: string;
|
|
141
139
|
};
|
|
142
140
|
export interface AccountStatement extends Period {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounting-protocol.d.ts","sourceRoot":"","sources":["../src/accounting-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"accounting-protocol.d.ts","sourceRoot":"","sources":["../src/accounting-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,11 +96,6 @@ var Subscription;
|
|
|
96
96
|
}
|
|
97
97
|
Subscription.isDowngraded = isDowngraded;
|
|
98
98
|
;
|
|
99
|
-
function isCancelled(s) {
|
|
100
|
-
return !!s.cancellationDate;
|
|
101
|
-
}
|
|
102
|
-
Subscription.isCancelled = isCancelled;
|
|
103
|
-
;
|
|
104
99
|
function calculateCurrentPeriod(startDate, now) {
|
|
105
100
|
var nextStartDate = startDate;
|
|
106
101
|
do {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounting-protocol.js","sourceRoot":"","sources":["../src/accounting-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEF,gCAAkC;
|
|
1
|
+
{"version":3,"file":"accounting-protocol.js","sourceRoot":"","sources":["../src/accounting-protocol.ts"],"names":[],"mappings":"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"}
|
package/lib/admin-protocol.d.ts
CHANGED
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
import { User, Workspace, NamedWorkspaceFeatureFlag } from "./protocol";
|
|
7
|
-
import { Without } from "./util/without";
|
|
8
7
|
import { WorkspaceInstance, WorkspaceInstancePhase } from "./workspace-instance";
|
|
9
8
|
import { RoleOrPermission } from "./permission";
|
|
10
9
|
import { AccountStatement } from "./accounting-protocol";
|
|
@@ -55,7 +54,7 @@ export interface AdminModifyPermanentWorkspaceFeatureFlagRequest {
|
|
|
55
54
|
add: boolean;
|
|
56
55
|
}[];
|
|
57
56
|
}
|
|
58
|
-
export interface WorkspaceAndInstance extends
|
|
57
|
+
export interface WorkspaceAndInstance extends Omit<Workspace, "id" | "creationTime">, Omit<WorkspaceInstance, "id" | "creationTime"> {
|
|
59
58
|
workspaceId: string;
|
|
60
59
|
workspaceCreationTime: string;
|
|
61
60
|
instanceId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-protocol.d.ts","sourceRoot":"","sources":["../src/admin-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"admin-protocol.d.ts","sourceRoot":"","sources":["../src/admin-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-protocol.js","sourceRoot":"","sources":["../src/admin-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"admin-protocol.js","sourceRoot":"","sources":["../src/admin-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;AAuEH,IAAiB,oBAAoB,CAmBpC;AAnBD,WAAiB,oBAAoB;IACjC,SAAgB,WAAW,CAAC,GAAyB;QACjD,kBACI,EAAE,EAAE,GAAG,CAAC,WAAW,EACnB,YAAY,EAAE,GAAG,CAAC,qBAAqB,IACnC,GAAG,EACT;IACN,CAAC;IANe,gCAAW,cAM1B,CAAA;IAED,SAAgB,UAAU,CAAC,GAAyB;QAChD,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;YACjB,OAAO,SAAS,CAAC;SACpB;QACD,kBACI,EAAE,EAAE,GAAG,CAAC,UAAU,EAClB,YAAY,EAAE,GAAG,CAAC,oBAAoB,IAClC,GAAG,EACT;IACN,CAAC;IATe,+BAAU,aASzB,CAAA;AACL,CAAC,EAnBgB,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAmBpC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2021 Gitpod GmbH. All rights reserved.
|
|
3
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
+
* See License-AGPL.txt in the project root for license information.
|
|
5
|
+
*/
|
|
6
|
+
export declare const IAnalyticsWriter: unique symbol;
|
|
7
|
+
declare type Identity = {
|
|
8
|
+
userId: string | number;
|
|
9
|
+
} | {
|
|
10
|
+
userId?: string | number;
|
|
11
|
+
anonymousId: string | number;
|
|
12
|
+
};
|
|
13
|
+
interface Message {
|
|
14
|
+
messageId?: string;
|
|
15
|
+
}
|
|
16
|
+
export declare type IdentifyMessage = Message & Identity & {
|
|
17
|
+
traits?: any;
|
|
18
|
+
timestamp?: Date;
|
|
19
|
+
context?: any;
|
|
20
|
+
};
|
|
21
|
+
export declare type TrackMessage = Message & Identity & {
|
|
22
|
+
event: string;
|
|
23
|
+
properties?: any;
|
|
24
|
+
timestamp?: Date;
|
|
25
|
+
context?: any;
|
|
26
|
+
};
|
|
27
|
+
export declare type RemoteTrackMessage = Omit<TrackMessage, "timestamp" | "userId" | "anonymousId">;
|
|
28
|
+
export interface IAnalyticsWriter {
|
|
29
|
+
identify(msg: IdentifyMessage): void;
|
|
30
|
+
track(msg: TrackMessage): void;
|
|
31
|
+
}
|
|
32
|
+
export {};
|
|
33
|
+
//# sourceMappingURL=analytics.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../src/analytics.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D,aAAK,QAAQ,GACP;IAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC3B;IAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEjE,UAAU,OAAO;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,oBAAY,eAAe,GAAG,OAAO,GAAG,QAAQ,GAAG;IAC/C,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;CACjB,CAAC;AAEF,oBAAY,YAAY,GAAG,OAAO,GAAG,QAAQ,GAAG;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;CACjB,CAAC;AAEF,oBAAY,kBAAkB,GAAG,IAAI,CAAC,YAAY,EAAE,WAAW,GAAG,QAAQ,GAAG,aAAa,CAAC,CAAC;AAE5F,MAAM,WAAW,gBAAgB;IAE7B,QAAQ,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI,CAAC;IAErC,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAAC;CAElC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/**
|
|
3
|
-
* Copyright (c)
|
|
3
|
+
* Copyright (c) 2021 Gitpod GmbH. All rights reserved.
|
|
4
4
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
5
5
|
* See License-AGPL.txt in the project root for license information.
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
-
|
|
8
|
+
exports.IAnalyticsWriter = void 0;
|
|
9
|
+
exports.IAnalyticsWriter = Symbol("IAnalyticsWriter");
|
|
10
|
+
//# sourceMappingURL=analytics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../src/analytics.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGU,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
3
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
+
* See License-AGPL.txt in the project root for license information.
|
|
5
|
+
*/
|
|
6
|
+
export declare namespace ContextURL {
|
|
7
|
+
const INCREMENTAL_PREBUILD_PREFIX = "incremental-prebuild";
|
|
8
|
+
const PREBUILD_PREFIX = "prebuild";
|
|
9
|
+
const IMAGEBUILD_PREFIX = "imagebuild";
|
|
10
|
+
/**
|
|
11
|
+
* The field "contextUrl" might contain prefixes like:
|
|
12
|
+
* - envvar1=value1/...
|
|
13
|
+
* - prebuild/...
|
|
14
|
+
* This is the analogon to the (Prefix)ContextParser structure in "server".
|
|
15
|
+
*/
|
|
16
|
+
function parseToURL(contextUrl: string | undefined): URL | undefined;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=context-url.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-url.d.ts","sourceRoot":"","sources":["../src/context-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,yBAAiB,UAAU,CAAC;IACnB,MAAM,2BAA2B,yBAAyB,CAAC;IAC3D,MAAM,eAAe,aAAa,CAAC;IACnC,MAAM,iBAAiB,eAAe,CAAC;IAE9C;;;;;OAKG;IACH,SAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,CAgC1E;CACF"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
4
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
5
|
+
* See License-AGPL.txt in the project root for license information.
|
|
6
|
+
*/
|
|
7
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
+
exports.ContextURL = void 0;
|
|
9
|
+
var ContextURL;
|
|
10
|
+
(function (ContextURL) {
|
|
11
|
+
ContextURL.INCREMENTAL_PREBUILD_PREFIX = "incremental-prebuild";
|
|
12
|
+
ContextURL.PREBUILD_PREFIX = "prebuild";
|
|
13
|
+
ContextURL.IMAGEBUILD_PREFIX = "imagebuild";
|
|
14
|
+
/**
|
|
15
|
+
* The field "contextUrl" might contain prefixes like:
|
|
16
|
+
* - envvar1=value1/...
|
|
17
|
+
* - prebuild/...
|
|
18
|
+
* This is the analogon to the (Prefix)ContextParser structure in "server".
|
|
19
|
+
*/
|
|
20
|
+
function parseToURL(contextUrl) {
|
|
21
|
+
if (contextUrl === undefined) {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
var segments = contextUrl.split("/");
|
|
25
|
+
if (segments.length === 1) {
|
|
26
|
+
return new URL(segments[0]); // this might be something, we just try
|
|
27
|
+
}
|
|
28
|
+
var segmentsToURL = function (offset) {
|
|
29
|
+
var rest = segments.slice(offset).join("/");
|
|
30
|
+
if (!rest.startsWith("http")) {
|
|
31
|
+
rest = 'https://' + rest;
|
|
32
|
+
}
|
|
33
|
+
return new URL(rest);
|
|
34
|
+
};
|
|
35
|
+
var firstSegment = segments[0];
|
|
36
|
+
if (firstSegment === ContextURL.PREBUILD_PREFIX ||
|
|
37
|
+
firstSegment === ContextURL.INCREMENTAL_PREBUILD_PREFIX ||
|
|
38
|
+
firstSegment === ContextURL.IMAGEBUILD_PREFIX) {
|
|
39
|
+
return segmentsToURL(1);
|
|
40
|
+
}
|
|
41
|
+
// check for env vars
|
|
42
|
+
if (firstSegment.indexOf("=") !== -1) {
|
|
43
|
+
return segmentsToURL(1);
|
|
44
|
+
}
|
|
45
|
+
return segmentsToURL(0);
|
|
46
|
+
}
|
|
47
|
+
ContextURL.parseToURL = parseToURL;
|
|
48
|
+
})(ContextURL = exports.ContextURL || (exports.ContextURL = {}));
|
|
49
|
+
//# sourceMappingURL=context-url.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-url.js","sourceRoot":"","sources":["../src/context-url.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,IAAiB,UAAU,CA4C1B;AA5CD,WAAiB,UAAU;IACZ,sCAA2B,GAAG,sBAAsB,CAAC;IACrD,0BAAe,GAAG,UAAU,CAAC;IAC7B,4BAAiB,GAAG,YAAY,CAAC;IAE9C;;;;;OAKG;IACH,SAAgB,UAAU,CAAC,UAA8B;QACvD,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,OAAO,SAAS,CAAC;SAClB;QAED,IAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,OAAO,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,uCAAuC;SACtE;QAED,IAAM,aAAa,GAAG,UAAC,MAAc;YACnC,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC5B,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;aAC1B;YACD,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC;QAGF,IAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,YAAY,KAAK,WAAA,eAAe;YAChC,YAAY,KAAK,WAAA,2BAA2B;YAC5C,YAAY,KAAK,WAAA,iBAAiB,EAAE;YACtC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,qBAAqB;QACrB,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YACpC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAhCe,qBAAU,aAgCzB,CAAA;AACH,CAAC,EA5CgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QA4C1B"}
|
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
*/
|
|
6
6
|
export declare class ContextUrlTest {
|
|
7
7
|
parseContextUrl_withEnvVar(): void;
|
|
8
|
+
parseContextUrl_withEnvVar_withoutSchema(): void;
|
|
8
9
|
parseContextUrl_withPrebuild(): void;
|
|
10
|
+
parseContextUrl_withPrebuild_withoutSchema(): void;
|
|
9
11
|
}
|
|
10
12
|
//# sourceMappingURL=context-url.spec.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-url.spec.d.ts","sourceRoot":"","sources":["../src/context-url.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,cAAc;IAEV,0BAA0B;IAM1B,wCAAwC;IAMxC,4BAA4B;IAM5B,0CAA0C;CAK1D"}
|
|
@@ -23,12 +23,24 @@ var ContextUrlTest = /** @class */ (function () {
|
|
|
23
23
|
function ContextUrlTest() {
|
|
24
24
|
}
|
|
25
25
|
ContextUrlTest.prototype.parseContextUrl_withEnvVar = function () {
|
|
26
|
-
var actual = context_url_1.
|
|
26
|
+
var actual = context_url_1.ContextURL.parseToURL("passedin=test%20value/https://github.com/gitpod-io/gitpod-test-repo");
|
|
27
|
+
expect(actual === null || actual === void 0 ? void 0 : actual.host).to.equal("github.com");
|
|
28
|
+
expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo");
|
|
29
|
+
};
|
|
30
|
+
ContextUrlTest.prototype.parseContextUrl_withEnvVar_withoutSchema = function () {
|
|
31
|
+
var actual = context_url_1.ContextURL.parseToURL("passedin=test%20value/github.com/gitpod-io/gitpod-test-repo");
|
|
32
|
+
expect(actual === null || actual === void 0 ? void 0 : actual.host).to.equal("github.com");
|
|
27
33
|
expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo");
|
|
28
34
|
};
|
|
29
35
|
ContextUrlTest.prototype.parseContextUrl_withPrebuild = function () {
|
|
30
|
-
var actual = context_url_1.
|
|
36
|
+
var actual = context_url_1.ContextURL.parseToURL("prebuild/https://github.com/gitpod-io/gitpod-test-repo");
|
|
31
37
|
expect(actual === null || actual === void 0 ? void 0 : actual.host).to.equal("github.com");
|
|
38
|
+
expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo");
|
|
39
|
+
};
|
|
40
|
+
ContextUrlTest.prototype.parseContextUrl_withPrebuild_withoutSchema = function () {
|
|
41
|
+
var actual = context_url_1.ContextURL.parseToURL("prebuild/github.com/gitpod-io/gitpod-test-repo");
|
|
42
|
+
expect(actual === null || actual === void 0 ? void 0 : actual.host).to.equal("github.com");
|
|
43
|
+
expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo");
|
|
32
44
|
};
|
|
33
45
|
__decorate([
|
|
34
46
|
mocha_typescript_1.test,
|
|
@@ -36,12 +48,24 @@ var ContextUrlTest = /** @class */ (function () {
|
|
|
36
48
|
__metadata("design:paramtypes", []),
|
|
37
49
|
__metadata("design:returntype", void 0)
|
|
38
50
|
], ContextUrlTest.prototype, "parseContextUrl_withEnvVar", null);
|
|
51
|
+
__decorate([
|
|
52
|
+
mocha_typescript_1.test,
|
|
53
|
+
__metadata("design:type", Function),
|
|
54
|
+
__metadata("design:paramtypes", []),
|
|
55
|
+
__metadata("design:returntype", void 0)
|
|
56
|
+
], ContextUrlTest.prototype, "parseContextUrl_withEnvVar_withoutSchema", null);
|
|
39
57
|
__decorate([
|
|
40
58
|
mocha_typescript_1.test,
|
|
41
59
|
__metadata("design:type", Function),
|
|
42
60
|
__metadata("design:paramtypes", []),
|
|
43
61
|
__metadata("design:returntype", void 0)
|
|
44
62
|
], ContextUrlTest.prototype, "parseContextUrl_withPrebuild", null);
|
|
63
|
+
__decorate([
|
|
64
|
+
mocha_typescript_1.test,
|
|
65
|
+
__metadata("design:type", Function),
|
|
66
|
+
__metadata("design:paramtypes", []),
|
|
67
|
+
__metadata("design:returntype", void 0)
|
|
68
|
+
], ContextUrlTest.prototype, "parseContextUrl_withPrebuild_withoutSchema", null);
|
|
45
69
|
ContextUrlTest = __decorate([
|
|
46
70
|
mocha_typescript_1.suite
|
|
47
71
|
], ContextUrlTest);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-url.spec.js","sourceRoot":"","sources":["../src/context-url.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,2BAA6B;AAC7B,qDAA+C;AAC/C,6CAA2C;AAC3C,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAG3B;IAAA;IAyBA,CAAC;IAvBgB,mDAA0B,GAAjC;QACF,IAAM,MAAM,GAAG,wBAAU,CAAC,UAAU,CAAC,qEAAqE,CAAC,CAAC;QAC5G,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;IAEY,iEAAwC,GAA/C;QACF,IAAM,MAAM,GAAG,wBAAU,CAAC,UAAU,CAAC,6DAA6D,CAAC,CAAC;QACpG,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,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,wBAAU,CAAC,UAAU,CAAC,wDAAwD,CAAC,CAAC;QAC/F,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;IAEY,mEAA0C,GAAjD;QACF,IAAM,MAAM,GAAG,wBAAU,CAAC,UAAU,CAAC,gDAAgD,CAAC,CAAC;QACvF,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;IAtBK;QAAL,uBAAI;;;;oEAIJ;IAEK;QAAL,uBAAI;;;;kFAIJ;IAEK;QAAL,uBAAI;;;;sEAIJ;IAEK;QAAL,uBAAI;;;;oFAIJ;IAxBQ,cAAc;QAD1B,wBAAK;OACO,cAAc,CAyB1B;IAAD,qBAAC;CAAA,AAzBD,IAyBC;AAzBY,wCAAc;AA0B3B,MAAM,CAAC,OAAO,GAAG,IAAI,cAAc,EAAE,CAAA"}
|
package/lib/email-protocol.d.ts
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
|
-
import { Without } from "./util/without";
|
|
7
6
|
export declare type EMailState = "scheduledInternal" | "scheduledSendgrid";
|
|
8
7
|
export interface EMailStatus {
|
|
9
8
|
/** The time the email entry was inserted into the DB */
|
|
@@ -45,6 +44,6 @@ export declare type EMail = {
|
|
|
45
44
|
params: EMailParameters;
|
|
46
45
|
} & EMailStatus;
|
|
47
46
|
export declare namespace EMail {
|
|
48
|
-
const create: (ts:
|
|
47
|
+
const create: (ts: Omit<EMail, 'uid'>) => EMail;
|
|
49
48
|
}
|
|
50
49
|
//# sourceMappingURL=email-protocol.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email-protocol.d.ts","sourceRoot":"","sources":["../src/email-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"email-protocol.d.ts","sourceRoot":"","sources":["../src/email-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,oBAAY,UAAU,GAAG,mBAAmB,GACtC,mBAAmB,CAAC;AAE1B,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,CAAA;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email-protocol.js","sourceRoot":"","sources":["../src/email-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;
|
|
1
|
+
{"version":3,"file":"email-protocol.js","sourceRoot":"","sources":["../src/email-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,gCAAmC;AAanC,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,UAAC,EAAsB;QACzC,IAAM,MAAM,GAAG,EAAW,CAAC;QAC3B,MAAM,CAAC,GAAG,GAAG,MAAM,EAAE,CAAC;QACtB,OAAO,MAAM,CAAC;IAClB,CAAC,CAAA;AACL,CAAC,EANgB,KAAK,GAAL,aAAK,KAAL,aAAK,QAMrB"}
|
package/lib/env.d.ts
CHANGED
|
@@ -3,10 +3,10 @@
|
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
4
|
* See License-AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
|
+
export declare function translateLegacyStagename(kubeStage: string): KubeStage;
|
|
6
7
|
export declare abstract class AbstractComponentEnv {
|
|
7
8
|
readonly kubeStage: KubeStage;
|
|
8
9
|
readonly kubeNamespace: string;
|
|
9
|
-
readonly version: string;
|
|
10
10
|
readonly installationLongname: string;
|
|
11
11
|
readonly installationShortname: string;
|
|
12
12
|
}
|
package/lib/env.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH,8BACsB,oBAAoB;IACtC,QAAQ,CAAC,SAAS,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAOrE;AAED,8BACsB,oBAAoB;IACtC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAA2D;IACxF,QAAQ,CAAC,aAAa,EAAE,MAAM,CAA+B;IAE7D,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAA4C;IACjF,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAA6C;CACtF;AAED,oBAAY,SAAS,GAAG,YAAY,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,CAAC;AAEtE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAMrE;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKlE;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAEvG"}
|
package/lib/env.js
CHANGED
|
@@ -11,7 +11,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
11
11
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.getEnvVarParsed = exports.filePathTelepresenceAware = exports.getEnvVar = exports.AbstractComponentEnv = void 0;
|
|
14
|
+
exports.getEnvVarParsed = exports.filePathTelepresenceAware = exports.getEnvVar = exports.AbstractComponentEnv = exports.translateLegacyStagename = void 0;
|
|
15
15
|
var inversify_1 = require("inversify");
|
|
16
16
|
var legacyStagenameTranslation = {
|
|
17
17
|
"production": "production",
|
|
@@ -19,17 +19,18 @@ var legacyStagenameTranslation = {
|
|
|
19
19
|
"devstaging": "dev",
|
|
20
20
|
"dev": "dev"
|
|
21
21
|
};
|
|
22
|
+
function translateLegacyStagename(kubeStage) {
|
|
23
|
+
var stage = legacyStagenameTranslation[kubeStage];
|
|
24
|
+
if (!stage) {
|
|
25
|
+
throw new Error("Invalid KUBE_STAGE: " + kubeStage);
|
|
26
|
+
}
|
|
27
|
+
return stage;
|
|
28
|
+
}
|
|
29
|
+
exports.translateLegacyStagename = translateLegacyStagename;
|
|
22
30
|
var AbstractComponentEnv = /** @class */ (function () {
|
|
23
31
|
function AbstractComponentEnv() {
|
|
24
|
-
this.kubeStage = getEnvVarParsed('KUBE_STAGE',
|
|
25
|
-
var stage = legacyStagenameTranslation[kubeStage];
|
|
26
|
-
if (!stage) {
|
|
27
|
-
throw new Error("Environment variable invalid: KUBE_STAGE=" + kubeStage);
|
|
28
|
-
}
|
|
29
|
-
return stage;
|
|
30
|
-
});
|
|
32
|
+
this.kubeStage = getEnvVarParsed('KUBE_STAGE', translateLegacyStagename);
|
|
31
33
|
this.kubeNamespace = getEnvVar('KUBE_NAMESPACE');
|
|
32
|
-
this.version = getEnvVar('VERSION');
|
|
33
34
|
this.installationLongname = getEnvVar("GITPOD_INSTALLATION_LONGNAME");
|
|
34
35
|
this.installationShortname = getEnvVar("GITPOD_INSTALLATION_SHORTNAME");
|
|
35
36
|
}
|
package/lib/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;AAEH,uCAAuC;AAEvC,IAAM,0BAA0B,GAAiC;IAC7D,YAAY,EAAE,YAAY;IAC1B,SAAS,EAAE,UAAU;IACrB,YAAY,EAAE,KAAK;IACnB,KAAK,EAAE,KAAK;CACf,CAAA;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;AAEH,uCAAuC;AAEvC,IAAM,0BAA0B,GAAiC;IAC7D,YAAY,EAAE,YAAY;IAC1B,SAAS,EAAE,UAAU;IACrB,YAAY,EAAE,KAAK;IACnB,KAAK,EAAE,KAAK;CACf,CAAA;AAED,SAAgB,wBAAwB,CAAC,SAAiB;IACtD,IAAM,KAAK,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;IACpD,IAAI,CAAC,KAAK,EAAE;QACR,MAAM,IAAI,KAAK,CAAC,yBAAuB,SAAW,CAAC,CAAC;KACvD;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAPD,4DAOC;AAGD;IAAA;QACa,cAAS,GAAc,eAAe,CAAC,YAAY,EAAE,wBAAwB,CAAC,CAAC;QAC/E,kBAAa,GAAW,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAEpD,yBAAoB,GAAW,SAAS,CAAC,8BAA8B,CAAC,CAAA;QACxE,0BAAqB,GAAW,SAAS,CAAC,+BAA+B,CAAC,CAAA;IACvF,CAAC;IANqB,oBAAoB;QADzC,sBAAU,EAAE;OACS,oBAAoB,CAMzC;IAAD,2BAAC;CAAA,AAND,IAMC;AANqB,oDAAoB;AAU1C,SAAgB,SAAS,CAAC,IAAY,EAAE,YAAqB;IACzD,IAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC;IAChD,IAAI,CAAC,KAAK,EAAE;QACR,MAAM,IAAI,KAAK,CAAC,8CAA4C,IAAM,CAAC,CAAC;KACvE;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAND,8BAMC;AAED,SAAgB,yBAAyB,CAAC,QAAgB;IACtD,IAAI,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;QAC3C,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,QAAQ,CAAC;KACvD;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AALD,8DAKC;AAED,SAAgB,eAAe,CAAI,IAAY,EAAE,MAA4B,EAAE,YAAqB;IAChG,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;AACjD,CAAC;AAFD,0CAEC"}
|