@webda/core 1.5.0 → 1.6.0-beta.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.
- package/lib/application.d.ts +0 -7
- package/lib/application.js +20 -18
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +32 -11
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +20 -2
- package/lib/core.js +73 -32
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +7 -7
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +40 -1
- package/lib/models/aclmodel.js +55 -0
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +17 -5
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +22 -6
- package/lib/models/coremodel.js +15 -7
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +6 -7
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/ownermodel.spec.js +11 -11
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +2 -0
- package/lib/models/user.js +4 -2
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +9 -2
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.js +6 -5
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +3 -3
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +27 -0
- package/lib/queues/pubsubservice.js +21 -0
- package/lib/queues/pubsubservice.js.map +1 -0
- package/lib/queues/queueservice.d.ts +3 -16
- package/lib/queues/queueservice.js +2 -13
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/services/authentication.js +11 -6
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +14 -7
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.js +11 -6
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +6 -6
- package/lib/services/binary.spec.js +22 -21
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +9 -0
- package/lib/services/configuration.js +27 -2
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +19 -2
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.spec.js +2 -2
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/filebinary.js +9 -12
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.js +1 -1
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +7 -1
- package/lib/services/fileconfiguration.js +9 -0
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +83 -4
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +6 -0
- package/lib/services/kubernetesconfiguration.js +13 -0
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +40 -16
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +51 -2
- package/lib/services/mailer.js +24 -9
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +1 -1
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/oauth.js +1 -1
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/service.d.ts +10 -0
- package/lib/services/service.js +35 -5
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +28 -5
- package/lib/services/service.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +43 -0
- package/lib/stores/aggregator.js +106 -0
- package/lib/stores/aggregator.js.map +1 -0
- package/lib/stores/file.d.ts +1 -1
- package/lib/stores/file.js +5 -5
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +3 -1
- package/lib/stores/file.spec.js +48 -20
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +151 -0
- package/lib/stores/mapper.js +294 -0
- package/lib/stores/mapper.js.map +1 -0
- package/lib/{policies/aclpolicy.spec.d.ts → stores/mapper.spec.d.ts} +0 -0
- package/lib/stores/mapper.spec.js +55 -0
- package/lib/stores/mapper.spec.js.map +1 -0
- package/lib/stores/memory.js +0 -3
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +3 -1
- package/lib/stores/memory.spec.js +12 -0
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +31 -110
- package/lib/stores/store.js +51 -281
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +12 -0
- package/lib/stores/store.spec.js +116 -24
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/utils/context.d.ts +10 -0
- package/lib/utils/context.js +15 -3
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +5 -0
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +12 -0
- package/lib/utils/cookie.js +13 -1
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +13 -13
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/serializers.js +4 -4
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +11 -11
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/waiter.js +1 -1
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +6 -6
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +11 -9
- package/test/config-file-no-reload.json +70 -0
- package/test/config-file-reload.json +7 -1
- package/test/config-kube-reload.json +7 -1
- package/test/config.json +35 -23
- package/test/config.old-default.json +0 -16
- package/test/config.old.json +0 -16
- package/lib/policies/aclpolicy.d.ts +0 -16
- package/lib/policies/aclpolicy.js +0 -72
- package/lib/policies/aclpolicy.js.map +0 -1
- package/lib/policies/aclpolicy.spec.js +0 -104
- package/lib/policies/aclpolicy.spec.js.map +0 -1
- package/lib/policies/ownerpolicy.d.ts +0 -25
- package/lib/policies/ownerpolicy.js +0 -80
- package/lib/policies/ownerpolicy.js.map +0 -1
- package/lib/policies/ownerpolicy.spec.d.ts +0 -1
- package/lib/policies/ownerpolicy.spec.js +0 -199
- package/lib/policies/ownerpolicy.spec.js.map +0 -1
- package/lib/policies/rolepolicy.d.ts +0 -10
- package/lib/policies/rolepolicy.js +0 -47
- package/lib/policies/rolepolicy.js.map +0 -1
- package/lib/policies/rolepolicy.spec.d.ts +0 -1
- package/lib/policies/rolepolicy.spec.js +0 -91
- package/lib/policies/rolepolicy.spec.js.map +0 -1
- package/lib/utils/json.d.ts +0 -8
- package/lib/utils/json.js +0 -74
- package/lib/utils/json.js.map +0 -1
- package/lib/utils/json.spec.d.ts +0 -1
- package/lib/utils/json.spec.js +0 -83
- package/lib/utils/json.spec.js.map +0 -1
|
@@ -19,6 +19,7 @@ const assert = require("assert");
|
|
|
19
19
|
const mocha_1 = require("@testdeck/mocha");
|
|
20
20
|
const test_1 = require("../test");
|
|
21
21
|
const configuration_1 = require("./configuration");
|
|
22
|
+
const sinon_1 = require("sinon");
|
|
22
23
|
let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.WebdaTest {
|
|
23
24
|
getTestConfiguration() {
|
|
24
25
|
return __dirname + "/../../test/config-reload.json";
|
|
@@ -53,6 +54,7 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.Web
|
|
|
53
54
|
yield assert.rejects(() => service.init(), /Need a valid source/);
|
|
54
55
|
service.getParameters().source = "DefinedMailer:none";
|
|
55
56
|
yield assert.rejects(() => service.init(), /Service 'DefinedMailer' is not implementing ConfigurationProvider interface/);
|
|
57
|
+
yield assert.rejects(() => service.initConfiguration(), /ConfigurationService with dependencies cannot be used/);
|
|
56
58
|
});
|
|
57
59
|
}
|
|
58
60
|
initialLoad() {
|
|
@@ -63,7 +65,13 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.Web
|
|
|
63
65
|
uuid: "test",
|
|
64
66
|
webda: {
|
|
65
67
|
services: {
|
|
66
|
-
|
|
68
|
+
Authentication: {
|
|
69
|
+
providers: {
|
|
70
|
+
email: {
|
|
71
|
+
text: "Plop"
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
67
75
|
}
|
|
68
76
|
}
|
|
69
77
|
};
|
|
@@ -74,8 +82,17 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends test_1.Web
|
|
|
74
82
|
}));
|
|
75
83
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop");
|
|
76
84
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
85
|
+
let service = this.webda.getService("ConfigurationService");
|
|
77
86
|
// @ts-ignore
|
|
78
|
-
yield
|
|
87
|
+
yield service.checkUpdate();
|
|
88
|
+
let mock = (0, sinon_1.stub)(service, "loadConfiguration").callsFake(() => { });
|
|
89
|
+
// @ts-ignore
|
|
90
|
+
service.nextCheck = Date.now() + 86400000;
|
|
91
|
+
// @ts-ignore
|
|
92
|
+
service.interval = 1;
|
|
93
|
+
// @ts-ignore
|
|
94
|
+
yield service.checkUpdate();
|
|
95
|
+
assert.strictEqual(mock.callCount, 0);
|
|
79
96
|
});
|
|
80
97
|
}
|
|
81
98
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAG9C,kCAAoC;AACpC,mDAAuF;
|
|
1
|
+
{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,10 +19,10 @@ class MyService extends __1.Service {
|
|
|
19
19
|
test2(myArg) { }
|
|
20
20
|
}
|
|
21
21
|
__decorate([
|
|
22
|
-
__1.Cron("0/15 * * * *", "plop")
|
|
22
|
+
(0, __1.Cron)("0/15 * * * *", "plop")
|
|
23
23
|
], MyService.prototype, "test", null);
|
|
24
24
|
__decorate([
|
|
25
|
-
__1.Cron("0/25 * * * *", undefined, "myArg")
|
|
25
|
+
(0, __1.Cron)("0/25 * * * *", undefined, "myArg")
|
|
26
26
|
], MyService.prototype, "test2", null);
|
|
27
27
|
let CronServiceTest = class CronServiceTest extends test_1.WebdaTest {
|
|
28
28
|
annotations() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.spec.js","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AACpC,0BAAgE;AAChE,qCAAqC;AACrC,+BAA+B;AAE/B,MAAM,SAAU,SAAQ,WAAO;IAE7B,IAAI;QACF,YAAY;IACd,CAAC;IAGD,KAAK,CAAC,KAAa,IAAG,CAAC;CACxB;AANC;IADC,QAAI,
|
|
1
|
+
{"version":3,"file":"cron.spec.js","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":";;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AACpC,0BAAgE;AAChE,qCAAqC;AACrC,+BAA+B;AAE/B,MAAM,SAAU,SAAQ,WAAO;IAE7B,IAAI;QACF,YAAY;IACd,CAAC;IAGD,KAAK,CAAC,KAAa,IAAG,CAAC;CACxB;AANC;IADC,IAAA,QAAI,EAAC,cAAc,EAAE,MAAM,CAAC;qCAG5B;AAGD;IADC,IAAA,QAAI,EAAC,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC;sCAClB;AAGzB,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,gBAAS;IAErC,WAAW;QACT,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9E,IAAI,GAAG,GAAG,IAAI,kBAAc,CAAC,cAAc,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9E,IAAI,OAAO,GAAG,IAAI,eAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACtD,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACrD,UAAU;QACV,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACrD,eAAW,CAAC,QAAQ,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;YAClE,IAAI;gBACF,EAAE,EAAE,CAAC;aACN;YAAC,OAAO,GAAG,EAAE,GAAE;QAClB,CAAC,CAAC,CAAC;QACH,IAAI;YACF,IAAI,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YAC7B,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;YACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,MAAM,CAAC,CAAC;YAChD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC;YACrC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YACxB,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,CAAC,MAAM,EAAE,CAAC;SAClB;gBAAS;SACT;IACH,CAAC;CACF,CAAA;AA3BC;IADC,YAAI;kDA2BJ;AA5BG,eAAe;IADpB,aAAK;GACA,eAAe,CA6BpB;AAGD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAEtB,UAAU;QACR,MAAM,CAAC,WAAW,CAAC,IAAI,kBAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC;QACjF,MAAM,CAAC,WAAW,CAChB,IAAI,kBAAc,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAC9E,gEAAgE,CACjE,CAAC;IACJ,CAAC;CACF,CAAA;AAPC;IADC,YAAI;oDAOJ;AARG,kBAAkB;IADvB,aAAK;GACA,kBAAkB,CASvB"}
|
|
@@ -87,7 +87,6 @@ class FileBinary extends binary_1.Binary {
|
|
|
87
87
|
if (!fs.existsSync(path)) {
|
|
88
88
|
throw new binary_1.BinaryNotFoundError(info.hash, this.getName());
|
|
89
89
|
}
|
|
90
|
-
// @ts-ignore
|
|
91
90
|
return fs.createReadStream(path);
|
|
92
91
|
});
|
|
93
92
|
}
|
|
@@ -210,11 +209,12 @@ class FileBinary extends binary_1.Binary {
|
|
|
210
209
|
const p = this._getPath(hash);
|
|
211
210
|
if (!fs.existsSync(p))
|
|
212
211
|
return;
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
fs.unlinkSync(path_1.join(p,
|
|
212
|
+
try {
|
|
213
|
+
var files = fs.readdirSync(p);
|
|
214
|
+
files.forEach(file => fs.unlinkSync((0, path_1.join)(p, file)));
|
|
215
|
+
fs.rmdirSync(p);
|
|
216
216
|
}
|
|
217
|
-
|
|
217
|
+
catch (err) { }
|
|
218
218
|
});
|
|
219
219
|
}
|
|
220
220
|
/**
|
|
@@ -226,12 +226,7 @@ class FileBinary extends binary_1.Binary {
|
|
|
226
226
|
if (!fs.existsSync(p))
|
|
227
227
|
return;
|
|
228
228
|
var files = fs.readdirSync(p);
|
|
229
|
-
|
|
230
|
-
if (files[i].endsWith(uuid)) {
|
|
231
|
-
console.log(files[i]);
|
|
232
|
-
fs.unlinkSync(this._getPath(hash, files[i]));
|
|
233
|
-
}
|
|
234
|
-
}
|
|
229
|
+
files.filter(f => f.endsWith(uuid)).forEach(f => fs.unlinkSync(this._getPath(hash, f)));
|
|
235
230
|
if (files.length == 3) {
|
|
236
231
|
yield this._cleanHash(hash);
|
|
237
232
|
}
|
|
@@ -255,7 +250,9 @@ class FileBinary extends binary_1.Binary {
|
|
|
255
250
|
* @inheritdoc
|
|
256
251
|
*/
|
|
257
252
|
cascadeDelete(info, uuid) {
|
|
258
|
-
return this
|
|
253
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
254
|
+
return this._cleanUsage(info.hash, "_" + uuid);
|
|
255
|
+
});
|
|
259
256
|
}
|
|
260
257
|
_store(file, object) {
|
|
261
258
|
fs.mkdirSync(this._getPath(file.hash));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filebinary.js","sourceRoot":"","sources":["../../src/services/filebinary.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yBAAyB;AAGzB,qCAAoF;AAEpF,+BAA4B;AAG5B,oCAAoC;AAEpC,MAAa,oBAAqB,SAAQ,yBAAgB;IAMxD,YAAY,MAAW,EAAE,OAAgB;QACvC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC;SACpB;IACH,CAAC;CACF;AAZD,oDAYC;AACD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAkE,SAAQ,eAAS;IACvF;;;;OAIG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC1C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;IACH,CAAC;IAED,WAAW;QACT,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE;YACxB,OAAO,KAAK,CAAC;SACd;QACD,8CAA8C;QAC9C,IAAI,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,GAAG,6BAA6B,CAAC;QACrE,IAAI,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE;YAC3C,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE;gBAC5C,GAAG,EAAE;oBACH,WAAW,EAAE,MAAM,IAAI,QAAQ;oBAC/B,WAAW,EAAE,8CAA8C;oBAC3D,OAAO,EAAE,iBAAiB;oBAC1B,SAAS,EAAE;wBACT,KAAK,EAAE,EAAE;wBACT,KAAK,EAAE,YAAY;wBACnB,KAAK,EAAE,oDAAoD;wBAC3D,KAAK,EAAE,8BAA8B;qBACtC;iBACF;aACF,CAAC,CAAC;SACJ;IACH,CAAC;IAED;;OAEG;IACG,IAAI,CAAC,IAAe;;YACxB,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACxB,MAAM,IAAI,4BAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;aAC1D;YACD,
|
|
1
|
+
{"version":3,"file":"filebinary.js","sourceRoot":"","sources":["../../src/services/filebinary.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,7 +76,7 @@ let FileBinaryTest = class FileBinaryTest extends binary_spec_1.BinaryTest {
|
|
|
76
76
|
}
|
|
77
77
|
computeParameters() {
|
|
78
78
|
let binary = this.getBinary();
|
|
79
|
-
fs_extra_1.removeSync(binary.getParameters().folder);
|
|
79
|
+
(0, fs_extra_1.removeSync)(binary.getParameters().folder);
|
|
80
80
|
binary.computeParameters();
|
|
81
81
|
assert.ok(fs.existsSync(binary.getParameters().folder));
|
|
82
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filebinary.spec.js","sourceRoot":"","sources":["../../src/services/filebinary.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"filebinary.spec.js","sourceRoot":"","sources":["../../src/services/filebinary.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,13 @@ export declare class FileConfigurationService<T extends ConfigurationServicePara
|
|
|
10
10
|
* Load the JSON from source defined file
|
|
11
11
|
* @override
|
|
12
12
|
*/
|
|
13
|
-
loadConfiguration(): Promise<{
|
|
13
|
+
protected loadConfiguration(): Promise<{
|
|
14
|
+
[key: string]: any;
|
|
15
|
+
}>;
|
|
16
|
+
/**
|
|
17
|
+
* Read the file and store it
|
|
18
|
+
*/
|
|
19
|
+
initConfiguration(): Promise<{
|
|
14
20
|
[key: string]: any;
|
|
15
21
|
}>;
|
|
16
22
|
/**
|
|
@@ -45,6 +45,15 @@ class FileConfigurationService extends configuration_1.default {
|
|
|
45
45
|
return __1.JSONUtils.loadFile(this.parameters.source);
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
|
+
/**
|
|
49
|
+
* Read the file and store it
|
|
50
|
+
*/
|
|
51
|
+
initConfiguration() {
|
|
52
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
53
|
+
this.parameters.source = this._webda.getAppPath(this.parameters.source);
|
|
54
|
+
return this.loadAndStoreConfiguration();
|
|
55
|
+
});
|
|
56
|
+
}
|
|
48
57
|
/**
|
|
49
58
|
* @inheritdoc
|
|
50
59
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileconfiguration.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,0BAA+B;AAE/B;;GAEG;AACH,MAAa,wBAEX,SAAQ,uBAAuB;IAC/B,cAAc;IACR,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,kCAAkC;YAClC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAElE,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;;OAGG;
|
|
1
|
+
{"version":3,"file":"fileconfiguration.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,0BAA+B;AAE/B;;GAEG;AACH,MAAa,wBAEX,SAAQ,uBAAuB;IAC/B,cAAc;IACR,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,kCAAkC;YAClC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,4CAA4C,CAAC,CAAC;aACzG;YAED,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAElE,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;;OAGG;IACa,iBAAiB;;YAC/B,OAAO,aAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;KAAA;IAED;;OAEG;IACG,iBAAiB;;YACrB,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC1C,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,yBAAyB;YAC/B,KAAK,EAAE,oBAAoB;YAC3B,WAAW,EAAE,yDAAyD;SACvE,CAAC;IACJ,CAAC;CACF;AAlDD,4DAkDC"}
|
|
@@ -29,10 +29,16 @@ let FileConfigurationServiceTest = class FileConfigurationServiceTest extends te
|
|
|
29
29
|
before: { get: () => super.before }
|
|
30
30
|
});
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
-
fs_1.writeFileSync(__dirname + "/../../test/my-cnf.json", JSON.stringify({
|
|
32
|
+
(0, fs_1.writeFileSync)(__dirname + "/../../test/my-cnf.json", JSON.stringify({
|
|
33
33
|
webda: {
|
|
34
34
|
services: {
|
|
35
|
-
|
|
35
|
+
Authentication: {
|
|
36
|
+
providers: {
|
|
37
|
+
email: {
|
|
38
|
+
text: "Test"
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
36
42
|
}
|
|
37
43
|
}
|
|
38
44
|
}, undefined, 2));
|
|
@@ -60,10 +66,16 @@ let FileConfigurationServiceTest = class FileConfigurationServiceTest extends te
|
|
|
60
66
|
resolve();
|
|
61
67
|
}
|
|
62
68
|
}), 30000);
|
|
63
|
-
fs_1.writeFileSync(__dirname + "/../../test/my-cnf.json", JSON.stringify({
|
|
69
|
+
(0, fs_1.writeFileSync)(__dirname + "/../../test/my-cnf.json", JSON.stringify({
|
|
64
70
|
webda: {
|
|
65
71
|
services: {
|
|
66
|
-
|
|
72
|
+
Authentication: {
|
|
73
|
+
providers: {
|
|
74
|
+
email: {
|
|
75
|
+
text: "Plop"
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
67
79
|
}
|
|
68
80
|
}
|
|
69
81
|
}, undefined, 2));
|
|
@@ -79,4 +91,71 @@ __decorate([
|
|
|
79
91
|
FileConfigurationServiceTest = __decorate([
|
|
80
92
|
mocha_1.suite
|
|
81
93
|
], FileConfigurationServiceTest);
|
|
94
|
+
let FileConfigurationNoReloadServiceTest = class FileConfigurationNoReloadServiceTest extends test_1.WebdaTest {
|
|
95
|
+
getTestConfiguration() {
|
|
96
|
+
return __dirname + "/../../test/config-file-no-reload.json";
|
|
97
|
+
}
|
|
98
|
+
before() {
|
|
99
|
+
const _super = Object.create(null, {
|
|
100
|
+
before: { get: () => super.before }
|
|
101
|
+
});
|
|
102
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
103
|
+
(0, fs_1.writeFileSync)(__dirname + "/../../test/my-cnf.json", JSON.stringify({
|
|
104
|
+
webda: {
|
|
105
|
+
services: {
|
|
106
|
+
Authentication: {
|
|
107
|
+
providers: {
|
|
108
|
+
email: {
|
|
109
|
+
text: "Test2"
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}, undefined, 2));
|
|
116
|
+
yield _super.before.call(this);
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
initialLoad() {
|
|
120
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
121
|
+
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Test2");
|
|
122
|
+
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
};
|
|
126
|
+
__decorate([
|
|
127
|
+
mocha_1.test
|
|
128
|
+
], FileConfigurationNoReloadServiceTest.prototype, "initialLoad", null);
|
|
129
|
+
FileConfigurationNoReloadServiceTest = __decorate([
|
|
130
|
+
mocha_1.suite
|
|
131
|
+
], FileConfigurationNoReloadServiceTest);
|
|
132
|
+
let FileConfigurationNoReloadMissingServiceTest = class FileConfigurationNoReloadMissingServiceTest extends test_1.WebdaTest {
|
|
133
|
+
getTestConfiguration() {
|
|
134
|
+
return __dirname + "/../../test/config-file-no-reload.json";
|
|
135
|
+
}
|
|
136
|
+
before() {
|
|
137
|
+
const _super = Object.create(null, {
|
|
138
|
+
before: { get: () => super.before }
|
|
139
|
+
});
|
|
140
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
141
|
+
const filename = __dirname + "/../../test/my-cnf.json";
|
|
142
|
+
if ((0, fs_1.existsSync)(filename)) {
|
|
143
|
+
(0, fs_1.unlinkSync)(filename);
|
|
144
|
+
}
|
|
145
|
+
yield _super.before.call(this);
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
initialLoad() {
|
|
149
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
150
|
+
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Test");
|
|
151
|
+
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
};
|
|
155
|
+
__decorate([
|
|
156
|
+
mocha_1.test
|
|
157
|
+
], FileConfigurationNoReloadMissingServiceTest.prototype, "initialLoad", null);
|
|
158
|
+
FileConfigurationNoReloadMissingServiceTest = __decorate([
|
|
159
|
+
mocha_1.suite
|
|
160
|
+
], FileConfigurationNoReloadMissingServiceTest);
|
|
82
161
|
//# sourceMappingURL=fileconfiguration.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"fileconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/fileconfiguration.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,12 @@ export declare class KubernetesConfigurationService<T extends ConfigurationServi
|
|
|
8
8
|
* @ignore
|
|
9
9
|
*/
|
|
10
10
|
init(): Promise<void>;
|
|
11
|
+
/**
|
|
12
|
+
* Read the file and store it
|
|
13
|
+
*/
|
|
14
|
+
initConfiguration(): Promise<{
|
|
15
|
+
[key: string]: any;
|
|
16
|
+
}>;
|
|
11
17
|
/**
|
|
12
18
|
* Load configuration from a ConfigMap or a Secret
|
|
13
19
|
* @override
|
|
@@ -38,6 +38,14 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
|
|
|
38
38
|
yield this.checkUpdate();
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
|
+
/**
|
|
42
|
+
* Read the file and store it
|
|
43
|
+
*/
|
|
44
|
+
initConfiguration() {
|
|
45
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
return this.loadAndStoreConfiguration();
|
|
47
|
+
});
|
|
48
|
+
}
|
|
41
49
|
/**
|
|
42
50
|
* Load configuration from a ConfigMap or a Secret
|
|
43
51
|
* @override
|
|
@@ -45,9 +53,11 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
|
|
|
45
53
|
loadConfiguration() {
|
|
46
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
47
55
|
let result = {};
|
|
56
|
+
let found = 0;
|
|
48
57
|
fs.readdirSync(this.parameters.source)
|
|
49
58
|
.filter(f => !f.startsWith("."))
|
|
50
59
|
.forEach(f => {
|
|
60
|
+
found++;
|
|
51
61
|
let filePath = path.join(this.parameters.source, f);
|
|
52
62
|
// Auto parse JSON and YAML
|
|
53
63
|
if (f.match(/\.(json|ya?ml)$/i)) {
|
|
@@ -57,6 +67,9 @@ class KubernetesConfigurationService extends configuration_1.ConfigurationServic
|
|
|
57
67
|
result[f] = fs.readFileSync(filePath, "utf-8");
|
|
58
68
|
}
|
|
59
69
|
});
|
|
70
|
+
if (found === 0) {
|
|
71
|
+
return undefined;
|
|
72
|
+
}
|
|
60
73
|
this.log("TRACE", "loadConfiguration", result);
|
|
61
74
|
return result;
|
|
62
75
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,6BAA6B;AAC7B,sDAAiD;AAEjD;;GAEG;AACH,MAAa,8BAAyE,SAAQ,oCAAuB;IACnH;;OAEG;IACG,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YAED,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;;OAGG;IACG,iBAAiB;;YACrB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;iBACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAC/B,OAAO,CAAC,CAAC,CAAC,EAAE;gBACX,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACpD,2BAA2B;gBAC3B,IAAI,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;oBAC/B,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,GAAG,uBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC1E;qBAAM;oBACL,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,0BAA0B;YACjC,WAAW,EAAE,kDAAkD;SAChE,CAAC;IACJ,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"kubernetesconfiguration.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuF;AACvF,kCAAsD;AACtD,yBAAyB;AACzB,6BAA6B;AAC7B,sDAAiD;AAEjD;;GAEG;AACH,MAAa,8BAAyE,SAAQ,oCAAuB;IACnH;;OAEG;IACG,IAAI;;YACR,mCAAmC;YACnC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3B,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1C,MAAM,IAAI,iBAAU,CAAC,mCAAmC,EAAE,kDAAkD,CAAC,CAAC;aAC/G;YAED,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAErE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvF,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;KAAA;IAED;;OAEG;IACG,iBAAiB;;YACrB,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC1C,CAAC;KAAA;IAED;;;OAGG;IACG,iBAAiB;;YACrB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;iBACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBAC/B,OAAO,CAAC,CAAC,CAAC,EAAE;gBACX,KAAK,EAAE,CAAC;gBACR,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBACpD,2BAA2B;gBAC3B,IAAI,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;oBAC/B,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC,GAAG,uBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;iBAC1E;qBAAM;oBACL,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;YACL,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,OAAO,SAAS,CAAC;aAClB;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC/C,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ;QACb,OAAO;YACL,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,0BAA0B;YACjC,WAAW,EAAE,kDAAkD;SAChE,CAAC;IACJ,CAAC;CACF;AAhED,wEAgEC"}
|
|
@@ -23,6 +23,7 @@ const path = require("path");
|
|
|
23
23
|
const yaml = require("yaml");
|
|
24
24
|
const fs_1 = require("fs");
|
|
25
25
|
const __1 = require("..");
|
|
26
|
+
const sinon_1 = require("sinon");
|
|
26
27
|
class AbstractKubernetesConfigurationServiceTest extends test_1.WebdaTest {
|
|
27
28
|
constructor() {
|
|
28
29
|
super(...arguments);
|
|
@@ -30,7 +31,14 @@ class AbstractKubernetesConfigurationServiceTest extends test_1.WebdaTest {
|
|
|
30
31
|
this.content = {
|
|
31
32
|
"webda.json": JSON.stringify({
|
|
32
33
|
services: {
|
|
33
|
-
|
|
34
|
+
Authentication: {
|
|
35
|
+
providers: {
|
|
36
|
+
email: {
|
|
37
|
+
text: "Plop1"
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
},
|
|
41
|
+
"Authentication.providers.email.text2": "Plop6"
|
|
34
42
|
}
|
|
35
43
|
}, undefined, 2),
|
|
36
44
|
other: "test",
|
|
@@ -47,7 +55,7 @@ class AbstractKubernetesConfigurationServiceTest extends test_1.WebdaTest {
|
|
|
47
55
|
before: { get: () => super.before }
|
|
48
56
|
});
|
|
49
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
50
|
-
fs_extra_1.emptyDirSync(this.folder);
|
|
58
|
+
(0, fs_extra_1.emptyDirSync)(this.folder);
|
|
51
59
|
// Empty the kube directory
|
|
52
60
|
if (create) {
|
|
53
61
|
this.createConfigMap();
|
|
@@ -57,22 +65,22 @@ class AbstractKubernetesConfigurationServiceTest extends test_1.WebdaTest {
|
|
|
57
65
|
}
|
|
58
66
|
createConfigMap() {
|
|
59
67
|
this.dataFolder = `..${Date.now()}`;
|
|
60
|
-
fs_1.mkdirSync(path.join(this.folder, this.dataFolder));
|
|
61
|
-
fs_extra_1.ensureSymlinkSync(path.join(this.folder, this.dataFolder), path.join(this.folder, "..data"));
|
|
68
|
+
(0, fs_1.mkdirSync)(path.join(this.folder, this.dataFolder));
|
|
69
|
+
(0, fs_extra_1.ensureSymlinkSync)(path.join(this.folder, this.dataFolder), path.join(this.folder, "..data"));
|
|
62
70
|
Object.keys(this.content).forEach(f => {
|
|
63
|
-
fs_extra_1.outputFileSync(path.join(this.folder, this.dataFolder, f), this.content[f]);
|
|
64
|
-
fs_extra_1.ensureSymlinkSync(path.join(this.folder, "..data", f), path.join(this.folder, f));
|
|
71
|
+
(0, fs_extra_1.outputFileSync)(path.join(this.folder, this.dataFolder, f), this.content[f]);
|
|
72
|
+
(0, fs_extra_1.ensureSymlinkSync)(path.join(this.folder, "..data", f), path.join(this.folder, f));
|
|
65
73
|
});
|
|
66
74
|
}
|
|
67
75
|
updateConfigMap(content) {
|
|
68
76
|
this.dataFolder = `..${Date.now()}`;
|
|
69
77
|
this.content = content;
|
|
70
|
-
fs_1.mkdirSync(path.join(this.folder, this.dataFolder));
|
|
78
|
+
(0, fs_1.mkdirSync)(path.join(this.folder, this.dataFolder));
|
|
71
79
|
Object.keys(this.content).forEach(f => {
|
|
72
|
-
fs_extra_1.outputFileSync(path.join(this.folder, this.dataFolder, f), this.content[f]);
|
|
80
|
+
(0, fs_extra_1.outputFileSync)(path.join(this.folder, this.dataFolder, f), this.content[f]);
|
|
73
81
|
});
|
|
74
|
-
fs_1.unlinkSync(path.join(this.folder, "..data"));
|
|
75
|
-
fs_extra_1.ensureSymlinkSync(path.join(this.folder, this.dataFolder), path.join(this.folder, "..data"));
|
|
82
|
+
(0, fs_1.unlinkSync)(path.join(this.folder, "..data"));
|
|
83
|
+
(0, fs_extra_1.ensureSymlinkSync)(path.join(this.folder, this.dataFolder), path.join(this.folder, "..data"));
|
|
76
84
|
}
|
|
77
85
|
}
|
|
78
86
|
let KubernetesConfigurationServiceTest = class KubernetesConfigurationServiceTest extends AbstractKubernetesConfigurationServiceTest {
|
|
@@ -91,31 +99,47 @@ let KubernetesConfigurationServiceTest = class KubernetesConfigurationServiceTes
|
|
|
91
99
|
assert.rejects(() => serv.init(), /Need a source for KubernetesConfigurationService/);
|
|
92
100
|
serv.getParameters().source = "/notexisting";
|
|
93
101
|
assert.rejects(() => serv.init(), /Need a source for KubernetesConfigurationService/);
|
|
102
|
+
let mock = (0, sinon_1.stub)(serv, "loadAndStoreConfiguration").callsFake(() => { });
|
|
103
|
+
yield serv.initConfiguration();
|
|
104
|
+
assert.strictEqual(mock.callCount, 1);
|
|
94
105
|
});
|
|
95
106
|
}
|
|
96
107
|
updatedConfigMap() {
|
|
97
108
|
return __awaiter(this, void 0, void 0, function* () {
|
|
98
|
-
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "
|
|
109
|
+
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop1");
|
|
110
|
+
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text2, "Plop6");
|
|
99
111
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
100
112
|
yield new Promise(resolve => {
|
|
101
113
|
this.webda.getService("KubernetesConfigurationService").on("Configuration.Applied", resolve);
|
|
102
114
|
this.updateConfigMap(Object.assign(Object.assign({}, this.content), { "webda.json": JSON.stringify({
|
|
103
115
|
services: {
|
|
104
|
-
|
|
116
|
+
Authentication: {
|
|
117
|
+
providers: {
|
|
118
|
+
email: {
|
|
119
|
+
text: "Plop2"
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
105
123
|
}
|
|
106
124
|
}) }));
|
|
107
125
|
});
|
|
108
|
-
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "
|
|
126
|
+
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop2");
|
|
109
127
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
110
128
|
yield new Promise(resolve => {
|
|
111
129
|
this.webda.getService("KubernetesConfigurationService").on("Configuration.Applied", resolve);
|
|
112
130
|
this.updateConfigMap(Object.assign(Object.assign({}, this.content), { "webda.json": JSON.stringify({
|
|
113
131
|
services: {
|
|
114
|
-
|
|
132
|
+
Authentication: {
|
|
133
|
+
providers: {
|
|
134
|
+
email: {
|
|
135
|
+
text: "Plop3"
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
}
|
|
115
139
|
}
|
|
116
140
|
}) }));
|
|
117
141
|
});
|
|
118
|
-
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "
|
|
142
|
+
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop3");
|
|
119
143
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
120
144
|
});
|
|
121
145
|
}
|
|
@@ -132,7 +156,7 @@ KubernetesConfigurationServiceTest = __decorate([
|
|
|
132
156
|
let EmptyKubernetesConfigurationServiceTest = class EmptyKubernetesConfigurationServiceTest extends AbstractKubernetesConfigurationServiceTest {
|
|
133
157
|
unmountedConfigMap() {
|
|
134
158
|
return __awaiter(this, void 0, void 0, function* () {
|
|
135
|
-
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "
|
|
159
|
+
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop0");
|
|
136
160
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
137
161
|
});
|
|
138
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubernetesconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,kCAAoC;AACpC,uCAA2E;AAC3E,6BAA6B;AAC7B,6BAA6B;AAC7B,2BAA2C;AAC3C,0BAAoD;
|
|
1
|
+
{"version":3,"file":"kubernetesconfiguration.spec.js","sourceRoot":"","sources":["../../src/services/kubernetesconfiguration.spec.ts"],"names":[],"mappings":"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"}
|