@gitpod/gitpod-protocol 0.1.5-svenefftinge-patch-1.3 → 0.1.5-tarun-telemetry-users.1

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.
Files changed (259) hide show
  1. package/data/gitpod-schema.json +21 -2
  2. package/lib/accounting-protocol.d.ts +0 -1
  3. package/lib/accounting-protocol.d.ts.map +1 -1
  4. package/lib/accounting-protocol.js +10 -11
  5. package/lib/accounting-protocol.js.map +1 -1
  6. package/lib/admin-protocol.d.ts +18 -2
  7. package/lib/admin-protocol.d.ts.map +1 -1
  8. package/lib/admin-protocol.js +2 -13
  9. package/lib/admin-protocol.js.map +1 -1
  10. package/lib/analytics.d.ts +13 -1
  11. package/lib/analytics.d.ts.map +1 -1
  12. package/lib/context-url.d.ts +1 -0
  13. package/lib/context-url.d.ts.map +1 -1
  14. package/lib/context-url.js +7 -5
  15. package/lib/context-url.js.map +1 -1
  16. package/lib/context-url.spec.js +45 -48
  17. package/lib/context-url.spec.js.map +1 -1
  18. package/lib/email-protocol.js +4 -4
  19. package/lib/email-protocol.js.map +1 -1
  20. package/lib/encryption/container-module.js +4 -4
  21. package/lib/encryption/container-module.js.map +1 -1
  22. package/lib/encryption/encryption-engine.js +19 -20
  23. package/lib/encryption/encryption-engine.js.map +1 -1
  24. package/lib/encryption/encryption-engine.spec.js +29 -36
  25. package/lib/encryption/encryption-engine.spec.js.map +1 -1
  26. package/lib/encryption/encryption-service.js +29 -43
  27. package/lib/encryption/encryption-service.js.map +1 -1
  28. package/lib/encryption/key-provider.js +25 -30
  29. package/lib/encryption/key-provider.js.map +1 -1
  30. package/lib/env.d.ts +1 -2
  31. package/lib/env.d.ts.map +1 -1
  32. package/lib/env.js +20 -21
  33. package/lib/env.js.map +1 -1
  34. package/lib/gitpod-file-parser.js +25 -41
  35. package/lib/gitpod-file-parser.js.map +1 -1
  36. package/lib/gitpod-file-parser.spec.js +116 -116
  37. package/lib/gitpod-file-parser.spec.js.map +1 -1
  38. package/lib/gitpod-service.d.ts +68 -20
  39. package/lib/gitpod-service.d.ts.map +1 -1
  40. package/lib/gitpod-service.js +151 -295
  41. package/lib/gitpod-service.js.map +1 -1
  42. package/lib/headless-workspace-log.d.ts +1 -12
  43. package/lib/headless-workspace-log.d.ts.map +1 -1
  44. package/lib/headless-workspace-log.js +1 -7
  45. package/lib/headless-workspace-log.js.map +1 -1
  46. package/lib/ide-protocol.d.ts +101 -0
  47. package/lib/ide-protocol.d.ts.map +1 -0
  48. package/lib/ide-protocol.js +8 -0
  49. package/lib/ide-protocol.js.map +1 -0
  50. package/lib/index.d.ts +3 -0
  51. package/lib/index.d.ts.map +1 -1
  52. package/lib/index.js +3 -0
  53. package/lib/index.js.map +1 -1
  54. package/lib/installation-admin-protocol.d.ts +25 -0
  55. package/lib/installation-admin-protocol.d.ts.map +1 -0
  56. package/lib/installation-admin-protocol.js +30 -0
  57. package/lib/installation-admin-protocol.js.map +1 -0
  58. package/lib/messaging/browser/connection.d.ts +3 -3
  59. package/lib/messaging/browser/connection.d.ts.map +1 -1
  60. package/lib/messaging/browser/connection.js +172 -35
  61. package/lib/messaging/browser/connection.js.map +1 -1
  62. package/lib/messaging/browser/window-connection.js +35 -55
  63. package/lib/messaging/browser/window-connection.js.map +1 -1
  64. package/lib/messaging/client-call-metrics.d.ts +35 -0
  65. package/lib/messaging/client-call-metrics.d.ts.map +1 -0
  66. package/lib/messaging/client-call-metrics.js +83 -0
  67. package/lib/messaging/client-call-metrics.js.map +1 -0
  68. package/lib/messaging/connection-error-handler.js +11 -23
  69. package/lib/messaging/connection-error-handler.js.map +1 -1
  70. package/lib/messaging/error.d.ts +2 -1
  71. package/lib/messaging/error.d.ts.map +1 -1
  72. package/lib/messaging/error.js +4 -2
  73. package/lib/messaging/error.js.map +1 -1
  74. package/lib/messaging/handler.d.ts +10 -0
  75. package/lib/messaging/handler.d.ts.map +1 -1
  76. package/lib/messaging/node/connection.d.ts +1 -17
  77. package/lib/messaging/node/connection.d.ts.map +1 -1
  78. package/lib/messaging/node/connection.js +23 -59
  79. package/lib/messaging/node/connection.js.map +1 -1
  80. package/lib/messaging/proxy-factory.d.ts +2 -0
  81. package/lib/messaging/proxy-factory.d.ts.map +1 -1
  82. package/lib/messaging/proxy-factory.js +74 -159
  83. package/lib/messaging/proxy-factory.js.map +1 -1
  84. package/lib/oss-allowlist.d.ts +14 -0
  85. package/lib/oss-allowlist.d.ts.map +1 -0
  86. package/lib/oss-allowlist.js +8 -0
  87. package/lib/oss-allowlist.js.map +1 -0
  88. package/lib/permission.d.ts +4 -2
  89. package/lib/permission.d.ts.map +1 -1
  90. package/lib/permission.js +16 -13
  91. package/lib/permission.js.map +1 -1
  92. package/lib/plans.d.ts +1 -1
  93. package/lib/plans.d.ts.map +1 -1
  94. package/lib/plans.js +38 -57
  95. package/lib/plans.js.map +1 -1
  96. package/lib/protocol.d.ts +51 -49
  97. package/lib/protocol.d.ts.map +1 -1
  98. package/lib/protocol.js +57 -115
  99. package/lib/protocol.js.map +1 -1
  100. package/lib/snapshot-url.d.ts +14 -0
  101. package/lib/snapshot-url.d.ts.map +1 -0
  102. package/lib/snapshot-url.js +26 -0
  103. package/lib/snapshot-url.js.map +1 -0
  104. package/lib/snapshot-url.spec.d.ts +7 -0
  105. package/lib/snapshot-url.spec.d.ts.map +1 -0
  106. package/lib/snapshot-url.spec.js +41 -0
  107. package/lib/snapshot-url.spec.js.map +1 -0
  108. package/lib/team-subscription-protocol.js +13 -13
  109. package/lib/team-subscription-protocol.js.map +1 -1
  110. package/lib/teams-projects-protocol.d.ts +59 -6
  111. package/lib/teams-projects-protocol.d.ts.map +1 -1
  112. package/lib/teams-projects-protocol.js +18 -15
  113. package/lib/teams-projects-protocol.js.map +1 -1
  114. package/lib/util/analytics.d.ts.map +1 -1
  115. package/lib/util/analytics.js +35 -26
  116. package/lib/util/analytics.js.map +1 -1
  117. package/lib/util/async-iterator.js +55 -133
  118. package/lib/util/async-iterator.js.map +1 -1
  119. package/lib/util/cancelable.js +17 -59
  120. package/lib/util/cancelable.js.map +1 -1
  121. package/lib/util/date-time.js +8 -8
  122. package/lib/util/date-time.js.map +1 -1
  123. package/lib/util/deferred.js +10 -12
  124. package/lib/util/deferred.js.map +1 -1
  125. package/lib/util/disposable.js +26 -39
  126. package/lib/util/disposable.js.map +1 -1
  127. package/lib/util/event.js +58 -74
  128. package/lib/util/event.js.map +1 -1
  129. package/lib/util/garbage-collected-cache.d.ts +1 -0
  130. package/lib/util/garbage-collected-cache.d.ts.map +1 -1
  131. package/lib/util/garbage-collected-cache.js +26 -46
  132. package/lib/util/garbage-collected-cache.js.map +1 -1
  133. package/lib/util/generate-workspace-id.d.ts +1 -1
  134. package/lib/util/generate-workspace-id.d.ts.map +1 -1
  135. package/lib/util/generate-workspace-id.js +29 -68
  136. package/lib/util/generate-workspace-id.js.map +1 -1
  137. package/lib/util/generate-workspace-id.spec.js +57 -78
  138. package/lib/util/generate-workspace-id.spec.js.map +1 -1
  139. package/lib/util/gitpod-cookie.d.ts +20 -0
  140. package/lib/util/gitpod-cookie.d.ts.map +1 -0
  141. package/lib/util/gitpod-cookie.js +44 -0
  142. package/lib/util/gitpod-cookie.js.map +1 -0
  143. package/lib/util/gitpod-host-url.d.ts +1 -1
  144. package/lib/util/gitpod-host-url.d.ts.map +1 -1
  145. package/lib/util/gitpod-host-url.js +93 -103
  146. package/lib/util/gitpod-host-url.js.map +1 -1
  147. package/lib/util/gitpod-host-url.spec.js +87 -135
  148. package/lib/util/gitpod-host-url.spec.js.map +1 -1
  149. package/lib/util/grpc.d.ts +15 -0
  150. package/lib/util/grpc.d.ts.map +1 -0
  151. package/lib/util/grpc.js +18 -0
  152. package/lib/util/grpc.js.map +1 -0
  153. package/lib/util/jaeger-client-types.d.ts +68 -0
  154. package/lib/util/jaeger-client-types.d.ts.map +1 -0
  155. package/lib/util/jaeger-client-types.js +8 -0
  156. package/lib/util/jaeger-client-types.js.map +1 -0
  157. package/lib/util/logging.d.ts +49 -33
  158. package/lib/util/logging.d.ts.map +1 -1
  159. package/lib/util/logging.js +107 -110
  160. package/lib/util/logging.js.map +1 -1
  161. package/lib/util/make-link.js +2 -2
  162. package/lib/util/make-link.js.map +1 -1
  163. package/lib/util/parse-workspace-id.d.ts +10 -0
  164. package/lib/util/parse-workspace-id.d.ts.map +1 -1
  165. package/lib/util/parse-workspace-id.js +31 -7
  166. package/lib/util/parse-workspace-id.js.map +1 -1
  167. package/lib/util/parse-workspace-id.spec.d.ts +4 -0
  168. package/lib/util/parse-workspace-id.spec.d.ts.map +1 -1
  169. package/lib/util/parse-workspace-id.spec.js +123 -84
  170. package/lib/util/parse-workspace-id.spec.js.map +1 -1
  171. package/lib/util/queue.js +16 -55
  172. package/lib/util/queue.js.map +1 -1
  173. package/lib/util/queue.spec.js +144 -288
  174. package/lib/util/queue.spec.js.map +1 -1
  175. package/lib/util/repeat.d.ts +15 -0
  176. package/lib/util/repeat.d.ts.map +1 -0
  177. package/lib/util/repeat.js +55 -0
  178. package/lib/util/repeat.js.map +1 -0
  179. package/lib/util/semaphore.js +15 -46
  180. package/lib/util/semaphore.js.map +1 -1
  181. package/lib/util/skip-if.js +6 -6
  182. package/lib/util/skip-if.js.map +1 -1
  183. package/lib/util/timeutil.js +16 -16
  184. package/lib/util/timeutil.js.map +1 -1
  185. package/lib/util/timeutil.spec.js +21 -24
  186. package/lib/util/timeutil.spec.js.map +1 -1
  187. package/lib/util/tracing.d.ts +51 -5
  188. package/lib/util/tracing.d.ts.map +1 -1
  189. package/lib/util/tracing.js +196 -62
  190. package/lib/util/tracing.js.map +1 -1
  191. package/lib/util/tracing.spec.d.ts +7 -0
  192. package/lib/util/tracing.spec.d.ts.map +1 -0
  193. package/lib/util/tracing.spec.js +121 -0
  194. package/lib/util/tracing.spec.js.map +1 -0
  195. package/lib/util/workspace-port-authentication.js +2 -2
  196. package/lib/util/workspace-port-authentication.js.map +1 -1
  197. package/lib/workspace-cluster.d.ts +8 -1
  198. package/lib/workspace-cluster.d.ts.map +1 -1
  199. package/lib/workspace-cluster.js +3 -3
  200. package/lib/workspace-cluster.js.map +1 -1
  201. package/lib/workspace-instance.d.ts +24 -2
  202. package/lib/workspace-instance.d.ts.map +1 -1
  203. package/lib/wsready.js +1 -1
  204. package/package.json +24 -13
  205. package/pkg-yarn.lock +14 -7
  206. package/provenance-bundle.jsonl +2 -0
  207. package/src/accounting-protocol.ts +1 -3
  208. package/src/admin-protocol.ts +25 -6
  209. package/src/analytics.ts +16 -1
  210. package/src/context-url.ts +3 -1
  211. package/src/email-protocol.ts +1 -1
  212. package/src/env.ts +10 -10
  213. package/src/gitpod-service.ts +88 -33
  214. package/src/headless-workspace-log.ts +1 -14
  215. package/src/ide-frontend-service.ts +1 -1
  216. package/src/ide-protocol.ts +114 -0
  217. package/src/index.ts +3 -0
  218. package/src/installation-admin-protocol.ts +40 -0
  219. package/src/messaging/browser/connection.ts +176 -10
  220. package/src/messaging/client-call-metrics.ts +97 -0
  221. package/src/messaging/error.ts +5 -2
  222. package/src/messaging/handler.ts +12 -0
  223. package/src/messaging/node/connection.ts +21 -68
  224. package/src/messaging/proxy-factory.ts +13 -5
  225. package/src/oss-allowlist.ts +15 -0
  226. package/src/permission.ts +5 -1
  227. package/src/protocol.ts +70 -54
  228. package/src/snapshot-url.spec.ts +25 -0
  229. package/src/snapshot-url.ts +27 -0
  230. package/src/team-subscription-protocol.ts +1 -1
  231. package/src/teams-projects-protocol.ts +78 -7
  232. package/src/util/analytics.ts +17 -1
  233. package/src/util/garbage-collected-cache.ts +7 -1
  234. package/src/util/generate-workspace-id.spec.ts +17 -0
  235. package/src/util/generate-workspace-id.ts +20 -2
  236. package/src/util/gitpod-cookie.ts +39 -0
  237. package/src/util/gitpod-host-url.ts +11 -11
  238. package/src/util/grpc.ts +15 -0
  239. package/src/util/jaeger-client-types.ts +102 -0
  240. package/src/util/logging.ts +102 -38
  241. package/src/util/parse-workspace-id.spec.ts +21 -1
  242. package/src/util/parse-workspace-id.ts +32 -6
  243. package/src/util/repeat.ts +45 -0
  244. package/src/util/tracing.spec.ts +83 -0
  245. package/src/util/tracing.ts +183 -18
  246. package/src/workspace-cluster.ts +3 -1
  247. package/src/workspace-instance.ts +35 -6
  248. package/src/wsready.ts +1 -1
  249. package/lib/util/repeater.d.ts +0 -22
  250. package/lib/util/repeater.d.ts.map +0 -1
  251. package/lib/util/repeater.js +0 -118
  252. package/lib/util/repeater.js.map +0 -1
  253. package/lib/util/safe-promise.d.ts +0 -11
  254. package/lib/util/safe-promise.d.ts.map +0 -1
  255. package/lib/util/safe-promise.js +0 -34
  256. package/lib/util/safe-promise.js.map +0 -1
  257. package/src/util/jaeger-client.d.ts +0 -105
  258. package/src/util/repeater.ts +0 -49
  259. package/src/util/safe-promise.ts +0 -26
@@ -15,45 +15,38 @@ var __metadata = (this && this.__metadata) || function (k, v) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  exports.t = void 0;
18
- var mocha_typescript_1 = require("mocha-typescript");
19
- var chai = require("chai");
20
- var path = require("path");
21
- var fs = require("fs");
22
- var encryption_engine_1 = require("./encryption-engine");
23
- var expect = chai.expect;
24
- var TestEncryptionEngineImpl = /** @class */ (function () {
25
- function TestEncryptionEngineImpl() {
18
+ const mocha_typescript_1 = require("mocha-typescript");
19
+ const chai = require("chai");
20
+ const path = require("path");
21
+ const fs = require("fs");
22
+ const encryption_engine_1 = require("./encryption-engine");
23
+ const expect = chai.expect;
24
+ let TestEncryptionEngineImpl = class TestEncryptionEngineImpl {
25
+ // Created with openssl rand -rand /dev/urandom -out key -base64 32
26
+ get testkey() {
27
+ const keyFilePath = path.resolve(__dirname, '../../test/fixtures/encryption/testkey');
28
+ const keyBuffer = fs.readFileSync(keyFilePath);
29
+ return keyBuffer.toString().trim();
26
30
  }
27
- Object.defineProperty(TestEncryptionEngineImpl.prototype, "testkey", {
28
- // Created with openssl rand -rand /dev/urandom -out key -base64 32
29
- get: function () {
30
- var keyFilePath = path.resolve(__dirname, '../../test/fixtures/encryption/testkey');
31
- var keyBuffer = fs.readFileSync(keyFilePath);
32
- return keyBuffer.toString().trim();
33
- },
34
- enumerable: false,
35
- configurable: true
36
- });
37
31
  ;
38
- TestEncryptionEngineImpl.prototype.basicSymmetry = function () {
39
- var plaintext = "12345678901234567890";
40
- var key = new Buffer(this.testkey, 'base64');
41
- var cut = new encryption_engine_1.EncryptionEngineImpl();
42
- var encryptedData = cut.encrypt(plaintext, key);
32
+ basicSymmetry() {
33
+ const plaintext = "12345678901234567890";
34
+ const key = new Buffer(this.testkey, 'base64');
35
+ const cut = new encryption_engine_1.EncryptionEngineImpl();
36
+ const encryptedData = cut.encrypt(plaintext, key);
43
37
  expect(encryptedData).to.be.not.undefined;
44
- var decryptedPlaintext = cut.decrypt(encryptedData, key);
38
+ const decryptedPlaintext = cut.decrypt(encryptedData, key);
45
39
  expect(decryptedPlaintext).equals(plaintext);
46
- };
47
- __decorate([
48
- mocha_typescript_1.test,
49
- __metadata("design:type", Function),
50
- __metadata("design:paramtypes", []),
51
- __metadata("design:returntype", void 0)
52
- ], TestEncryptionEngineImpl.prototype, "basicSymmetry", null);
53
- TestEncryptionEngineImpl = __decorate([
54
- mocha_typescript_1.suite
55
- ], TestEncryptionEngineImpl);
56
- return TestEncryptionEngineImpl;
57
- }());
40
+ }
41
+ };
42
+ __decorate([
43
+ mocha_typescript_1.test,
44
+ __metadata("design:type", Function),
45
+ __metadata("design:paramtypes", []),
46
+ __metadata("design:returntype", void 0)
47
+ ], TestEncryptionEngineImpl.prototype, "basicSymmetry", null);
48
+ TestEncryptionEngineImpl = __decorate([
49
+ mocha_typescript_1.suite
50
+ ], TestEncryptionEngineImpl);
58
51
  exports.t = new TestEncryptionEngineImpl();
59
52
  //# sourceMappingURL=encryption-engine.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"encryption-engine.spec.js","sourceRoot":"","sources":["../../src/encryption/encryption-engine.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,qDAA+C;AAC/C,2BAA6B;AAC7B,2BAA6B;AAC7B,uBAAyB;AAEzB,yDAA2D;AAE3D,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAEpB;IAAA;IAmBP,CAAC;IAjBG,sBAAc,6CAAO;QADrB,mEAAmE;aACnE;YACI,IAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wCAAwC,CAAC,CAAC;YACtF,IAAM,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC/C,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QACvC,CAAC;;;OAAA;IAAA,CAAC;IAEI,gDAAa,GAAb;QACF,IAAM,SAAS,GAAG,sBAAsB,CAAC;QACzC,IAAM,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE/C,IAAM,GAAG,GAAG,IAAI,wCAAoB,EAAE,CAAC;QACvC,IAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC;QAE1C,IAAM,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;IAVK;QAAL,uBAAI;;;;iEAUJ;IAlBQ,wBAAwB;QAApC,wBAAK;OAAO,wBAAwB,CAmBpC;IAAD,+BAAC;CAAA,AAnBM,IAmBN;AACY,QAAA,CAAC,GAAG,IAAI,wBAAwB,EAAE,CAAC"}
1
+ {"version":3,"file":"encryption-engine.spec.js","sourceRoot":"","sources":["../../src/encryption/encryption-engine.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,uDAA+C;AAC/C,6BAA6B;AAC7B,6BAA6B;AAC7B,yBAAyB;AAEzB,2DAA2D;AAE3D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAEpB,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACjC,mEAAmE;IACnE,IAAc,OAAO;QACjB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wCAAwC,CAAC,CAAC;QACtF,MAAM,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC/C,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IACvC,CAAC;IAAA,CAAC;IAEI,aAAa;QACf,MAAM,SAAS,GAAG,sBAAsB,CAAC;QACzC,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE/C,MAAM,GAAG,GAAG,IAAI,wCAAoB,EAAE,CAAC;QACvC,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC;QAE1C,MAAM,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;CACJ,CAAA;AAXS;IAAL,uBAAI;;;;6DAUJ;AAlBQ,wBAAwB;IAApC,wBAAK;GAAO,wBAAwB,CAmBpC;AACY,QAAA,CAAC,GAAG,IAAI,wBAAwB,EAAE,CAAC"}
@@ -4,17 +4,6 @@
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
- var __assign = (this && this.__assign) || function () {
8
- __assign = Object.assign || function(t) {
9
- for (var s, i = 1, n = arguments.length; i < n; i++) {
10
- s = arguments[i];
11
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
12
- t[p] = s[p];
13
- }
14
- return t;
15
- };
16
- return __assign.apply(this, arguments);
17
- };
18
7
  var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
19
8
  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
20
9
  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -26,42 +15,39 @@ var __metadata = (this && this.__metadata) || function (k, v) {
26
15
  };
27
16
  Object.defineProperty(exports, "__esModule", { value: true });
28
17
  exports.EncryptionServiceImpl = exports.EncryptionService = void 0;
29
- var inversify_1 = require("inversify");
30
- var encryption_engine_1 = require("./encryption-engine");
31
- var key_provider_1 = require("./key-provider");
18
+ const inversify_1 = require("inversify");
19
+ const encryption_engine_1 = require("./encryption-engine");
20
+ const key_provider_1 = require("./key-provider");
32
21
  exports.EncryptionService = Symbol('EncryptionService');
33
- var EncryptionServiceImpl = /** @class */ (function () {
34
- function EncryptionServiceImpl() {
22
+ let EncryptionServiceImpl = class EncryptionServiceImpl {
23
+ encrypt(data) {
24
+ const dataStr = this.serialize(data);
25
+ const key = this.keyProvider.getPrimaryKey();
26
+ const encryptedData = this.engine.encrypt(dataStr, key.material);
27
+ return Object.assign(Object.assign({}, encryptedData), { keyMetadata: key.metadata });
35
28
  }
36
- EncryptionServiceImpl.prototype.encrypt = function (data) {
37
- var dataStr = this.serialize(data);
38
- var key = this.keyProvider.getPrimaryKey();
39
- var encryptedData = this.engine.encrypt(dataStr, key.material);
40
- return __assign(__assign({}, encryptedData), { keyMetadata: key.metadata });
41
- };
42
- EncryptionServiceImpl.prototype.decrypt = function (encrypted) {
43
- var key = this.keyProvider.getKeyFor(encrypted.keyMetadata);
44
- var serializedData = this.engine.decrypt(encrypted, key.material);
29
+ decrypt(encrypted) {
30
+ const key = this.keyProvider.getKeyFor(encrypted.keyMetadata);
31
+ const serializedData = this.engine.decrypt(encrypted, key.material);
45
32
  return this.deserialize(serializedData);
46
- };
47
- EncryptionServiceImpl.prototype.serialize = function (data) {
33
+ }
34
+ serialize(data) {
48
35
  return JSON.stringify(data);
49
- };
50
- EncryptionServiceImpl.prototype.deserialize = function (data) {
36
+ }
37
+ deserialize(data) {
51
38
  return JSON.parse(data);
52
- };
53
- __decorate([
54
- inversify_1.inject(encryption_engine_1.EncryptionEngine),
55
- __metadata("design:type", Object)
56
- ], EncryptionServiceImpl.prototype, "engine", void 0);
57
- __decorate([
58
- inversify_1.inject(key_provider_1.KeyProvider),
59
- __metadata("design:type", Object)
60
- ], EncryptionServiceImpl.prototype, "keyProvider", void 0);
61
- EncryptionServiceImpl = __decorate([
62
- inversify_1.injectable()
63
- ], EncryptionServiceImpl);
64
- return EncryptionServiceImpl;
65
- }());
39
+ }
40
+ };
41
+ __decorate([
42
+ (0, inversify_1.inject)(encryption_engine_1.EncryptionEngine),
43
+ __metadata("design:type", Object)
44
+ ], EncryptionServiceImpl.prototype, "engine", void 0);
45
+ __decorate([
46
+ (0, inversify_1.inject)(key_provider_1.KeyProvider),
47
+ __metadata("design:type", Object)
48
+ ], EncryptionServiceImpl.prototype, "keyProvider", void 0);
49
+ EncryptionServiceImpl = __decorate([
50
+ (0, inversify_1.injectable)()
51
+ ], EncryptionServiceImpl);
66
52
  exports.EncryptionServiceImpl = EncryptionServiceImpl;
67
53
  //# sourceMappingURL=encryption-service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"encryption-service.js","sourceRoot":"","sources":["../../src/encryption/encryption-service.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAA+C;AAE/C,yDAAsE;AACtE,+CAA0D;AAO7C,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAO7D;IAAA;IA4BA,CAAC;IAxBG,uCAAO,GAAP,UAAW,IAAO;QACd,IAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACrC,IAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;QAE7C,IAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjE,6BACO,aAAa,KAChB,WAAW,EAAE,GAAG,CAAC,QAAQ,IAC3B;IACN,CAAC;IAED,uCAAO,GAAP,UAAW,SAAuB;QAC9B,IAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC9D,IAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;IAES,yCAAS,GAAnB,UAAoB,IAAS;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAES,2CAAW,GAArB,UAAyB,IAAY;QACjC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAM,CAAC;IACjC,CAAC;IA1ByB;QAAzB,kBAAM,CAAC,oCAAgB,CAAC;;yDAA6C;IACjD;QAApB,kBAAM,CAAC,0BAAW,CAAC;;8DAA6C;IAFxD,qBAAqB;QADjC,sBAAU,EAAE;OACA,qBAAqB,CA4BjC;IAAD,4BAAC;CAAA,AA5BD,IA4BC;AA5BY,sDAAqB"}
1
+ {"version":3,"file":"encryption-service.js","sourceRoot":"","sources":["../../src/encryption/encryption-service.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,yCAA+C;AAE/C,2DAAsE;AACtE,iDAA0D;AAO7C,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAO7D,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAI9B,OAAO,CAAI,IAAO;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;QAE7C,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjE,uCACO,aAAa,KAChB,WAAW,EAAE,GAAG,CAAC,QAAQ,IAC3B;IACN,CAAC;IAED,OAAO,CAAI,SAAuB;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC9D,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;IAES,SAAS,CAAC,IAAS;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAES,WAAW,CAAI,IAAY;QACjC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAM,CAAC;IACjC,CAAC;CACJ,CAAA;AA3B6B;IAAzB,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;qDAA6C;AACjD;IAApB,IAAA,kBAAM,EAAC,0BAAW,CAAC;;0DAA6C;AAFxD,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CA4BjC;AA5BY,sDAAqB"}
@@ -18,44 +18,40 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
18
18
  };
19
19
  Object.defineProperty(exports, "__esModule", { value: true });
20
20
  exports.KeyProviderImpl = exports.KeyProviderConfig = exports.KeyProvider = void 0;
21
- var inversify_1 = require("inversify");
21
+ const inversify_1 = require("inversify");
22
22
  exports.KeyProvider = Symbol('KeyProvider');
23
23
  exports.KeyProviderConfig = Symbol('KeyProviderConfig');
24
- var KeyProviderImpl = /** @class */ (function () {
25
- function KeyProviderImpl(config) {
24
+ let KeyProviderImpl = class KeyProviderImpl {
25
+ constructor(config) {
26
26
  this.config = config;
27
27
  }
28
- KeyProviderImpl.loadKeyConfigFromJsonString = function (configStr) {
29
- var keys = (JSON.parse(configStr) || []);
28
+ static loadKeyConfigFromJsonString(configStr) {
29
+ const keys = (JSON.parse(configStr) || []);
30
30
  if (!Array.isArray(keys)
31
31
  || keys.length < 0
32
- || 1 !== keys.reduce(function (p, k) { return k.primary ? p + 1 : p; }, 0)) {
32
+ || 1 !== keys.reduce((p, k) => k.primary ? p + 1 : p, 0)) {
33
33
  throw new Error('Invalid key config!');
34
34
  }
35
35
  return keys;
36
- };
37
- Object.defineProperty(KeyProviderImpl.prototype, "keys", {
38
- get: function () {
39
- return this.config.keys;
40
- },
41
- enumerable: false,
42
- configurable: true
43
- });
44
- KeyProviderImpl.prototype.getPrimaryKey = function () {
45
- var primaryKey = this.keys.find(function (key) { return !!key.primary; });
36
+ }
37
+ get keys() {
38
+ return this.config.keys;
39
+ }
40
+ getPrimaryKey() {
41
+ const primaryKey = this.keys.find((key) => !!key.primary);
46
42
  if (!primaryKey) {
47
43
  throw new Error('No primary encryption key found!');
48
44
  }
49
45
  return this.configToKey(primaryKey);
50
- };
51
- KeyProviderImpl.prototype.getKeyFor = function (metadata) {
52
- var key = this.keys.find(function (k) { return k.name === metadata.name && k.version === metadata.version; });
46
+ }
47
+ getKeyFor(metadata) {
48
+ const key = this.keys.find((k) => k.name === metadata.name && k.version === metadata.version);
53
49
  if (!key) {
54
- throw new Error("No key found for metadata " + metadata.name + "/" + metadata.version);
50
+ throw new Error(`No key found for metadata ${metadata.name}/${metadata.version}`);
55
51
  }
56
52
  return this.configToKey(key);
57
- };
58
- KeyProviderImpl.prototype.configToKey = function (config) {
53
+ }
54
+ configToKey(config) {
59
55
  return {
60
56
  metadata: {
61
57
  name: config.name,
@@ -63,13 +59,12 @@ var KeyProviderImpl = /** @class */ (function () {
63
59
  },
64
60
  material: new Buffer(config.material, 'base64')
65
61
  };
66
- };
67
- KeyProviderImpl = __decorate([
68
- inversify_1.injectable(),
69
- __param(0, inversify_1.inject(exports.KeyProviderConfig)),
70
- __metadata("design:paramtypes", [Object])
71
- ], KeyProviderImpl);
72
- return KeyProviderImpl;
73
- }());
62
+ }
63
+ };
64
+ KeyProviderImpl = __decorate([
65
+ (0, inversify_1.injectable)(),
66
+ __param(0, (0, inversify_1.inject)(exports.KeyProviderConfig)),
67
+ __metadata("design:paramtypes", [Object])
68
+ ], KeyProviderImpl);
74
69
  exports.KeyProviderImpl = KeyProviderImpl;
75
70
  //# sourceMappingURL=key-provider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"key-provider.js","sourceRoot":"","sources":["../../src/encryption/key-provider.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;AAEH,uCAA+C;AAYlC,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAYpC,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAM7D;IAYI,yBAA0D,MAAyB;QAAzB,WAAM,GAAN,MAAM,CAAmB;IAAG,CAAC;IAVhF,2CAA2B,GAAlC,UAAmC,SAAiB;QAChD,IAAM,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAgB,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;eACjB,IAAI,CAAC,MAAM,GAAG,CAAC;eACf,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAArB,CAAqB,EAAE,CAAC,CAAC,EAAE;YAC1D,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAID,sBAAc,iCAAI;aAAlB;YACI,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QAC3B,CAAC;;;OAAA;IAED,uCAAa,GAAb;QACI,IAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,CAAC,CAAC,GAAG,CAAC,OAAO,EAAb,CAAa,CAAC,CAAC;QAC1D,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACvD;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,mCAAS,GAAT,UAAU,QAAqB;QAC3B,IAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,EAA1D,CAA0D,CAAC,CAAC;QAC9F,IAAI,CAAC,GAAG,EAAE;YACN,MAAM,IAAI,KAAK,CAAC,+BAA6B,QAAQ,CAAC,IAAI,SAAI,QAAQ,CAAC,OAAS,CAAC,CAAC;SACrF;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAES,qCAAW,GAArB,UAAsB,MAAiB;QACnC,OAAO;YACH,QAAQ,EAAE;gBACN,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,OAAO,EAAE,MAAM,CAAC,OAAO;aAC1B;YACD,QAAQ,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAClD,CAAC;IACN,CAAC;IA1CQ,eAAe;QAD3B,sBAAU,EAAE;QAaI,WAAA,kBAAM,CAAC,yBAAiB,CAAC,CAAA;;OAZ7B,eAAe,CA2C3B;IAAD,sBAAC;CAAA,AA3CD,IA2CC;AA3CY,0CAAe"}
1
+ {"version":3,"file":"key-provider.js","sourceRoot":"","sources":["../../src/encryption/key-provider.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;AAEH,yCAA+C;AAYlC,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAYpC,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAM7D,IAAa,eAAe,GAA5B,MAAa,eAAe;IAYxB,YAA0D,MAAyB;QAAzB,WAAM,GAAN,MAAM,CAAmB;IAAG,CAAC;IAVvF,MAAM,CAAC,2BAA2B,CAAC,SAAiB;QAChD,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAgB,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;eACjB,IAAI,CAAC,MAAM,GAAG,CAAC;eACf,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;YAC1D,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAID,IAAc,IAAI;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IAC3B,CAAC;IAED,aAAa;QACT,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1D,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACvD;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,SAAS,CAAC,QAAqB;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC9F,IAAI,CAAC,GAAG,EAAE;YACN,MAAM,IAAI,KAAK,CAAC,6BAA6B,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;SACrF;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAES,WAAW,CAAC,MAAiB;QACnC,OAAO;YACH,QAAQ,EAAE;gBACN,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,OAAO,EAAE,MAAM,CAAC,OAAO;aAC1B;YACD,QAAQ,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAClD,CAAC;IACN,CAAC;CACJ,CAAA;AA3CY,eAAe;IAD3B,IAAA,sBAAU,GAAE;IAaI,WAAA,IAAA,kBAAM,EAAC,yBAAiB,CAAC,CAAA;;GAZ7B,eAAe,CA2C3B;AA3CY,0CAAe"}
package/lib/env.d.ts CHANGED
@@ -3,10 +3,9 @@
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
- readonly kubeNamespace: string;
9
- readonly version: string;
10
9
  readonly installationLongname: string;
11
10
  readonly installationShortname: string;
12
11
  }
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,CAO1B;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,CAA+B;IAC7D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAwB;IAEhD,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"}
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;IAExF,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,38 +11,37 @@ 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;
15
- var inversify_1 = require("inversify");
16
- var legacyStagenameTranslation = {
14
+ exports.getEnvVarParsed = exports.filePathTelepresenceAware = exports.getEnvVar = exports.AbstractComponentEnv = exports.translateLegacyStagename = void 0;
15
+ const inversify_1 = require("inversify");
16
+ const legacyStagenameTranslation = {
17
17
  "production": "production",
18
18
  "staging": "prodcopy",
19
19
  "devstaging": "dev",
20
20
  "dev": "dev"
21
21
  };
22
- var AbstractComponentEnv = /** @class */ (function () {
23
- function AbstractComponentEnv() {
24
- this.kubeStage = getEnvVarParsed('KUBE_STAGE', function (kubeStage) {
25
- var stage = legacyStagenameTranslation[kubeStage];
26
- if (!stage) {
27
- throw new Error("Environment variable invalid: KUBE_STAGE=" + kubeStage);
28
- }
29
- return stage;
30
- });
31
- this.kubeNamespace = getEnvVar('KUBE_NAMESPACE');
32
- this.version = getEnvVar('VERSION');
22
+ function translateLegacyStagename(kubeStage) {
23
+ const stage = legacyStagenameTranslation[kubeStage];
24
+ if (!stage) {
25
+ throw new Error(`Invalid KUBE_STAGE: ${kubeStage}`);
26
+ }
27
+ return stage;
28
+ }
29
+ exports.translateLegacyStagename = translateLegacyStagename;
30
+ let AbstractComponentEnv = class AbstractComponentEnv {
31
+ constructor() {
32
+ this.kubeStage = getEnvVarParsed('KUBE_STAGE', translateLegacyStagename);
33
33
  this.installationLongname = getEnvVar("GITPOD_INSTALLATION_LONGNAME");
34
34
  this.installationShortname = getEnvVar("GITPOD_INSTALLATION_SHORTNAME");
35
35
  }
36
- AbstractComponentEnv = __decorate([
37
- inversify_1.injectable()
38
- ], AbstractComponentEnv);
39
- return AbstractComponentEnv;
40
- }());
36
+ };
37
+ AbstractComponentEnv = __decorate([
38
+ (0, inversify_1.injectable)()
39
+ ], AbstractComponentEnv);
41
40
  exports.AbstractComponentEnv = AbstractComponentEnv;
42
41
  function getEnvVar(name, defaultValue) {
43
- var value = process.env[name] || defaultValue;
42
+ const value = process.env[name] || defaultValue;
44
43
  if (!value) {
45
- throw new Error("Environment variable undefined or empty: " + name);
44
+ throw new Error(`Environment variable undefined or empty: ${name}`);
46
45
  }
47
46
  return value;
48
47
  }
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;AAGD;IAAA;QACa,cAAS,GAAc,eAAe,CAAC,YAAY,EAAE,UAAC,SAAS;YACpE,IAAM,KAAK,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,8CAA4C,SAAW,CAAC,CAAC;aAC5E;YAED,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;QACM,kBAAa,GAAW,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACpD,YAAO,GAAW,SAAS,CAAC,SAAS,CAAC,CAAC;QAEvC,yBAAoB,GAAW,SAAS,CAAC,8BAA8B,CAAC,CAAA;QACxE,0BAAqB,GAAW,SAAS,CAAC,+BAA+B,CAAC,CAAA;IACvF,CAAC;IAdqB,oBAAoB;QADzC,sBAAU,EAAE;OACS,oBAAoB,CAczC;IAAD,2BAAC;CAAA,AAdD,IAcC;AAdqB,oDAAoB;AAkB1C,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"}
1
+ {"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;AAEH,yCAAuC;AAEvC,MAAM,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,MAAM,KAAK,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAAC;IACpD,IAAI,CAAC,KAAK,EAAE;QACR,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;KACvD;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAPD,4DAOC;AAGD,IAAsB,oBAAoB,GAA1C,MAAsB,oBAAoB;IAA1C;QACa,cAAS,GAAc,eAAe,CAAC,YAAY,EAAE,wBAAwB,CAAC,CAAC;QAE/E,yBAAoB,GAAW,SAAS,CAAC,8BAA8B,CAAC,CAAA;QACxE,0BAAqB,GAAW,SAAS,CAAC,+BAA+B,CAAC,CAAA;IACvF,CAAC;CAAA,CAAA;AALqB,oBAAoB;IADzC,IAAA,sBAAU,GAAE;GACS,oBAAoB,CAKzC;AALqB,oDAAoB;AAS1C,SAAgB,SAAS,CAAC,IAAY,EAAE,YAAqB;IACzD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC;IAChD,IAAI,CAAC,KAAK,EAAE;QACR,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,EAAE,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"}
@@ -4,17 +4,6 @@
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
- var __assign = (this && this.__assign) || function () {
8
- __assign = Object.assign || function(t) {
9
- for (var s, i = 1, n = arguments.length; i < n; i++) {
10
- s = arguments[i];
11
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
12
- t[p] = s[p];
13
- }
14
- return t;
15
- };
16
- return __assign.apply(this, arguments);
17
- };
18
7
  var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
19
8
  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
20
9
  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -23,55 +12,50 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
23
12
  };
24
13
  Object.defineProperty(exports, "__esModule", { value: true });
25
14
  exports.GitpodFileParser = void 0;
26
- var inversify_1 = require("inversify");
27
- var yaml = require("js-yaml");
28
- var Ajv = require("ajv");
29
- var logging_1 = require("./util/logging");
30
- var protocol_1 = require("./protocol");
31
- var schema = require('../data/gitpod-schema.json');
32
- var validate = new Ajv().compile(schema);
33
- var defaultParseOptions = {
15
+ const inversify_1 = require("inversify");
16
+ const yaml = require("js-yaml");
17
+ const Ajv = require("ajv");
18
+ const logging_1 = require("./util/logging");
19
+ const protocol_1 = require("./protocol");
20
+ const schema = require('../data/gitpod-schema.json');
21
+ const validate = new Ajv().compile(schema);
22
+ const defaultParseOptions = {
34
23
  acceptPortRanges: false,
35
24
  };
36
- var GitpodFileParser = /** @class */ (function () {
37
- function GitpodFileParser() {
38
- }
39
- GitpodFileParser.prototype.parse = function (content, parseOptions, defaultConfig) {
40
- if (parseOptions === void 0) { parseOptions = {}; }
41
- if (defaultConfig === void 0) { defaultConfig = {}; }
42
- var options = __assign(__assign({}, defaultParseOptions), parseOptions);
25
+ let GitpodFileParser = class GitpodFileParser {
26
+ parse(content, parseOptions = {}, defaultConfig = {}) {
27
+ const options = Object.assign(Object.assign({}, defaultParseOptions), parseOptions);
43
28
  try {
44
- var parsedConfig = yaml.safeLoad(content);
29
+ const parsedConfig = yaml.safeLoad(content);
45
30
  validate(parsedConfig);
46
- var validationErrors = validate.errors ? validate.errors.map(function (e) { return e.message || e.keyword; }) : undefined;
31
+ const validationErrors = validate.errors ? validate.errors.map(e => e.message || e.keyword) : undefined;
47
32
  if (validationErrors && validationErrors.length > 0) {
48
33
  return {
49
34
  config: defaultConfig,
50
- parsedConfig: parsedConfig,
51
- validationErrors: validationErrors
35
+ parsedConfig,
36
+ validationErrors
52
37
  };
53
38
  }
54
- var overrides = {};
39
+ const overrides = {};
55
40
  if (!options.acceptPortRanges && Array.isArray(parsedConfig.ports)) {
56
- overrides.ports = parsedConfig.ports.filter(function (port) { return !protocol_1.PortRangeConfig.is(port); });
41
+ overrides.ports = parsedConfig.ports.filter((port) => !protocol_1.PortRangeConfig.is(port));
57
42
  }
58
43
  return {
59
- config: __assign(__assign(__assign({}, defaultConfig), parsedConfig), overrides),
60
- parsedConfig: parsedConfig
44
+ config: Object.assign(Object.assign(Object.assign({}, defaultConfig), parsedConfig), overrides),
45
+ parsedConfig
61
46
  };
62
47
  }
63
48
  catch (err) {
64
- logging_1.log.error('Unparsable Gitpod configuration', err, { content: content });
49
+ logging_1.log.error('Unparsable Gitpod configuration', err, { content });
65
50
  return {
66
51
  config: defaultConfig,
67
52
  validationErrors: ['Unparsable Gitpod configuration: ' + err.toString()]
68
53
  };
69
54
  }
70
- };
71
- GitpodFileParser = __decorate([
72
- inversify_1.injectable()
73
- ], GitpodFileParser);
74
- return GitpodFileParser;
75
- }());
55
+ }
56
+ };
57
+ GitpodFileParser = __decorate([
58
+ (0, inversify_1.injectable)()
59
+ ], GitpodFileParser);
76
60
  exports.GitpodFileParser = GitpodFileParser;
77
61
  //# sourceMappingURL=gitpod-file-parser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"gitpod-file-parser.js","sourceRoot":"","sources":["../src/gitpod-file-parser.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;AAEH,uCAAuC;AACvC,8BAAgC;AAChC,yBAA2B;AAC3B,0CAAqC;AACrC,uCAA8D;AAI9D,IAAM,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACrD,IAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3C,IAAM,mBAAmB,GAAG;IACxB,gBAAgB,EAAE,KAAK;CAC1B,CAAC;AASF;IAAA;IAsCA,CAAC;IApCU,gCAAK,GAAZ,UAAa,OAAe,EAAE,YAAiB,EAAE,aAAmC;QAAtD,6BAAA,EAAA,iBAAiB;QAAE,8BAAA,EAAA,kBAAmC;QAChF,IAAM,OAAO,yBACP,mBAAmB,GACnB,YAAY,CACjB,CAAC;QACF,IAAI;YACA,IAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAQ,CAAC;YACnD,QAAQ,CAAC,YAAY,CAAC,CAAC;YACvB,IAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAE,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,EAAtB,CAAsB,CAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1G,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjD,OAAO;oBACH,MAAM,EAAE,aAAa;oBACrB,YAAY,cAAA;oBACZ,gBAAgB,kBAAA;iBACnB,CAAC;aACL;YACD,IAAM,SAAS,GAAG,EAAS,CAAC;YAC5B,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAChE,SAAS,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,UAAC,IAAS,IAAK,OAAA,CAAC,0BAAe,CAAC,EAAE,CAAC,IAAI,CAAC,EAAzB,CAAyB,CAAC,CAAC;aACzF;YACD,OAAO;gBACH,MAAM,iCACE,aAAa,GACb,YAAY,GACZ,SAAS,CAChB;gBACD,YAAY,cAAA;aACf,CAAC;SACL;QAAC,OAAO,GAAG,EAAE;YACV,aAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,EAAE,EAAE,OAAO,SAAA,EAAE,CAAC,CAAC;YAC/D,OAAO;gBACH,MAAM,EAAE,aAAa;gBACrB,gBAAgB,EAAE,CAAC,mCAAmC,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;aAC3E,CAAC;SACL;IACL,CAAC;IArCQ,gBAAgB;QAD5B,sBAAU,EAAE;OACA,gBAAgB,CAsC5B;IAAD,uBAAC;CAAA,AAtCD,IAsCC;AAtCY,4CAAgB"}
1
+ {"version":3,"file":"gitpod-file-parser.js","sourceRoot":"","sources":["../src/gitpod-file-parser.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;AAEH,yCAAuC;AACvC,gCAAgC;AAChC,2BAA2B;AAC3B,4CAAqC;AACrC,yCAA8D;AAI9D,MAAM,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACrD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3C,MAAM,mBAAmB,GAAG;IACxB,gBAAgB,EAAE,KAAK;CAC1B,CAAC;AASF,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAElB,KAAK,CAAC,OAAe,EAAE,YAAY,GAAG,EAAE,EAAE,gBAAiC,EAAE;QAChF,MAAM,OAAO,mCACP,mBAAmB,GACnB,YAAY,CACjB,CAAC;QACF,IAAI;YACA,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAQ,CAAC;YACnD,QAAQ,CAAC,YAAY,CAAC,CAAC;YACvB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1G,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjD,OAAO;oBACH,MAAM,EAAE,aAAa;oBACrB,YAAY;oBACZ,gBAAgB;iBACnB,CAAC;aACL;YACD,MAAM,SAAS,GAAG,EAAS,CAAC;YAC5B,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAChE,SAAS,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,0BAAe,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;aACzF;YACD,OAAO;gBACH,MAAM,gDACE,aAAa,GACb,YAAY,GACZ,SAAS,CAChB;gBACD,YAAY;aACf,CAAC;SACL;QAAC,OAAO,GAAG,EAAE;YACV,aAAG,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAC/D,OAAO;gBACH,MAAM,EAAE,aAAa;gBACrB,gBAAgB,EAAE,CAAC,mCAAmC,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;aAC3E,CAAC;SACL;IACL,CAAC;CACJ,CAAA;AAtCY,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAsC5B;AAtCY,4CAAgB"}