unleash-server 4.2.0-0 → 4.2.0-beta.2
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/README.md +1 -1
- package/dist/lib/addons/datadog-definition.js +7 -0
- package/dist/lib/addons/datadog-definition.js.map +1 -1
- package/dist/lib/addons/datadog.d.ts +5 -0
- package/dist/lib/addons/datadog.js +53 -0
- package/dist/lib/addons/datadog.js.map +1 -1
- package/dist/lib/addons/datadog.test.js +26 -1
- package/dist/lib/addons/datadog.test.js.map +1 -1
- package/dist/lib/addons/slack-definition.js +7 -0
- package/dist/lib/addons/slack-definition.js.map +1 -1
- package/dist/lib/addons/slack.d.ts +5 -0
- package/dist/lib/addons/slack.js +62 -9
- package/dist/lib/addons/slack.js.map +1 -1
- package/dist/lib/addons/slack.test.js +25 -0
- package/dist/lib/addons/slack.test.js.map +1 -1
- package/dist/lib/addons/teams-definition.js +7 -0
- package/dist/lib/addons/teams-definition.js.map +1 -1
- package/dist/lib/addons/teams.d.ts +5 -0
- package/dist/lib/addons/teams.js +54 -1
- package/dist/lib/addons/teams.js.map +1 -1
- package/dist/lib/addons/teams.test.js +25 -0
- package/dist/lib/addons/teams.test.js.map +1 -1
- package/dist/lib/addons/webhook-definition.js +8 -0
- package/dist/lib/addons/webhook-definition.js.map +1 -1
- package/dist/lib/create-config.js +25 -3
- package/dist/lib/create-config.js.map +1 -1
- package/dist/{test/e2e/api/admin/project/feature.strategy.e2e.test.d.ts → lib/create-config.test.d.ts} +0 -0
- package/dist/lib/create-config.test.js +57 -0
- package/dist/lib/create-config.test.js.map +1 -0
- package/dist/lib/db/client-instance-store.js +5 -2
- package/dist/lib/db/client-instance-store.js.map +1 -1
- package/dist/lib/db/client-metrics-store-v2.d.ts +19 -0
- package/dist/lib/db/client-metrics-store-v2.js +126 -0
- package/dist/lib/db/client-metrics-store-v2.js.map +1 -0
- package/dist/lib/db/context-field-store.d.ts +5 -5
- package/dist/lib/db/context-field-store.js +2 -7
- package/dist/lib/db/context-field-store.js.map +1 -1
- package/dist/lib/db/environment-store.d.ts +2 -2
- package/dist/lib/db/environment-store.js +6 -5
- package/dist/lib/db/environment-store.js.map +1 -1
- package/dist/lib/db/feature-environment-store.d.ts +1 -0
- package/dist/lib/db/feature-environment-store.js +13 -1
- package/dist/lib/db/feature-environment-store.js.map +1 -1
- package/dist/lib/db/feature-strategy-store.js +10 -5
- package/dist/lib/db/feature-strategy-store.js.map +1 -1
- package/dist/lib/db/feature-toggle-client-store.js +19 -13
- package/dist/lib/db/feature-toggle-client-store.js.map +1 -1
- package/dist/lib/db/index.js +2 -0
- package/dist/lib/db/index.js.map +1 -1
- package/dist/lib/db/project-store.d.ts +2 -2
- package/dist/lib/db/project-store.js +2 -1
- package/dist/lib/db/project-store.js.map +1 -1
- package/dist/lib/routes/admin-api/client-metrics.d.ts +12 -0
- package/dist/lib/routes/admin-api/client-metrics.js +35 -0
- package/dist/lib/routes/admin-api/client-metrics.js.map +1 -0
- package/dist/lib/routes/admin-api/index.js +2 -0
- package/dist/lib/routes/admin-api/index.js.map +1 -1
- package/dist/lib/routes/admin-api/project/features.d.ts +5 -1
- package/dist/lib/routes/admin-api/project/features.js +12 -6
- package/dist/lib/routes/admin-api/project/features.js.map +1 -1
- package/dist/lib/routes/admin-api/project/index.d.ts +3 -0
- package/dist/lib/routes/admin-api/project/index.js +8 -0
- package/dist/lib/routes/admin-api/project/index.js.map +1 -1
- package/dist/lib/routes/admin-api/state.js +2 -2
- package/dist/lib/routes/admin-api/state.js.map +1 -1
- package/dist/lib/routes/client-api/metrics.d.ts +5 -1
- package/dist/lib/routes/client-api/metrics.js +22 -5
- package/dist/lib/routes/client-api/metrics.js.map +1 -1
- package/dist/lib/routes/client-api/metrics.test.js +25 -2
- package/dist/lib/routes/client-api/metrics.test.js.map +1 -1
- package/dist/lib/routes/client-api/register.d.ts +4 -2
- package/dist/lib/routes/client-api/register.js +15 -2
- package/dist/lib/routes/client-api/register.js.map +1 -1
- package/dist/lib/server-impl.js +1 -0
- package/dist/lib/server-impl.js.map +1 -1
- package/dist/lib/services/client-metrics/client-metrics-service-v2.d.ts +16 -0
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js +68 -0
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js.map +1 -0
- package/dist/lib/services/client-metrics/index.d.ts +0 -1
- package/dist/lib/services/client-metrics/index.js +4 -2
- package/dist/lib/services/client-metrics/index.js.map +1 -1
- package/dist/lib/services/client-metrics/register-schema.js +1 -0
- package/dist/lib/services/client-metrics/register-schema.js.map +1 -1
- package/dist/lib/services/event-service.js +1 -3
- package/dist/lib/services/event-service.js.map +1 -1
- package/dist/lib/services/feature-toggle-service-v2.d.ts +10 -4
- package/dist/lib/services/feature-toggle-service-v2.js +55 -12
- package/dist/lib/services/feature-toggle-service-v2.js.map +1 -1
- package/dist/lib/services/index.js +3 -0
- package/dist/lib/services/index.js.map +1 -1
- package/dist/lib/services/project-health-service.js +2 -0
- package/dist/lib/services/project-health-service.js.map +1 -1
- package/dist/lib/services/project-service.d.ts +2 -1
- package/dist/lib/services/project-service.js +10 -5
- package/dist/lib/services/project-service.js.map +1 -1
- package/dist/lib/services/state-service.test.js +0 -6
- package/dist/lib/services/state-service.test.js.map +1 -1
- package/dist/lib/services/state-util.js +1 -1
- package/dist/lib/services/state-util.js.map +1 -1
- package/dist/lib/services/user-service.js +2 -2
- package/dist/lib/services/user-service.js.map +1 -1
- package/dist/lib/types/model.d.ts +4 -4
- package/dist/lib/types/models/metrics.d.ts +11 -0
- package/dist/lib/types/models/metrics.js +3 -0
- package/dist/lib/types/models/metrics.js.map +1 -0
- package/dist/lib/types/option.d.ts +16 -1
- package/dist/lib/types/services.d.ts +2 -0
- package/dist/lib/types/stores/client-instance-store.d.ts +1 -0
- package/dist/lib/types/stores/client-metrics-store-v2.d.ts +17 -0
- package/dist/lib/types/stores/client-metrics-store-v2.js +3 -0
- package/dist/lib/types/stores/client-metrics-store-v2.js.map +1 -0
- package/dist/lib/types/stores/environment-store.d.ts +1 -1
- package/dist/lib/types/stores/feature-environment-store.d.ts +1 -0
- package/dist/lib/types/stores/project-store.d.ts +4 -0
- package/dist/lib/types/stores.d.ts +2 -0
- package/dist/migrations/20210928065411-remove-displayname-from-environments.d.ts +2 -0
- package/dist/migrations/20210928065411-remove-displayname-from-environments.js +10 -0
- package/dist/migrations/20210928065411-remove-displayname-from-environments.js.map +1 -0
- package/dist/migrations/20210928080601-add-development-and-production-environments.d.ts +2 -0
- package/dist/migrations/20210928080601-add-development-and-production-environments.js +16 -0
- package/dist/migrations/20210928080601-add-development-and-production-environments.js.map +1 -0
- package/dist/migrations/20210928082228-connect-default-environment-to-all-existing-projects.d.ts +2 -0
- package/dist/migrations/20210928082228-connect-default-environment-to-all-existing-projects.js +16 -0
- package/dist/migrations/20210928082228-connect-default-environment-to-all-existing-projects.js.map +1 -0
- package/dist/migrations/20211004104917-client-metrics-env.d.ts +2 -0
- package/dist/migrations/20211004104917-client-metrics-env.js +22 -0
- package/dist/migrations/20211004104917-client-metrics-env.js.map +1 -0
- package/dist/migrations/20211011094226-add-environment-to-client-instances.d.ts +5 -0
- package/dist/migrations/20211011094226-add-environment-to-client-instances.js +21 -0
- package/dist/migrations/20211011094226-add-environment-to-client-instances.js.map +1 -0
- package/dist/migrations/20211013093114-feature-strategies-parameters-not-null.d.ts +2 -0
- package/dist/migrations/20211013093114-feature-strategies-parameters-not-null.js +12 -0
- package/dist/migrations/20211013093114-feature-strategies-parameters-not-null.js.map +1 -0
- package/dist/server-dev.js +5 -0
- package/dist/server-dev.js.map +1 -1
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.d.ts +1 -0
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.js +219 -0
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.js.map +1 -0
- package/dist/test/e2e/api/admin/context.e2e.test.js +23 -0
- package/dist/test/e2e/api/admin/context.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/environment.test.js +0 -5
- package/dist/test/e2e/api/admin/environment.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/environments.e2e.test.js +0 -2
- package/dist/test/e2e/api/admin/project/environments.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.d.ts +1 -0
- package/dist/test/e2e/api/admin/project/{feature.strategy.e2e.test.js → features.e2e.test.js} +321 -20
- package/dist/test/e2e/api/admin/project/features.e2e.test.js.map +1 -0
- package/dist/test/e2e/api/admin/project/project.health.e2e.test.js +76 -0
- package/dist/test/e2e/api/admin/project/project.health.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/projects.e2e.test.d.ts +1 -0
- package/dist/test/e2e/api/admin/project/projects.e2e.test.js +30 -0
- package/dist/test/e2e/api/admin/project/projects.e2e.test.js.map +1 -0
- package/dist/test/e2e/api/admin/state.e2e.test.js +0 -3
- package/dist/test/e2e/api/admin/state.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/feature.e2e.test.js +11 -13
- package/dist/test/e2e/api/client/feature.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.d.ts +1 -0
- package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js +49 -0
- package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js.map +1 -0
- package/dist/test/e2e/api/client/feature.token.access.e2e.test.js +0 -1
- package/dist/test/e2e/api/client/feature.token.access.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/metrics.e2e.access.e2e.test.js +0 -1
- package/dist/test/e2e/api/client/metrics.e2e.access.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/metrics.e2e.test.js +2 -5
- package/dist/test/e2e/api/client/metrics.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/metricsV2.e2e.test.d.ts +1 -0
- package/dist/test/e2e/api/client/metricsV2.e2e.test.js +95 -0
- package/dist/test/e2e/api/client/metricsV2.e2e.test.js.map +1 -0
- package/dist/test/e2e/helpers/database.json +0 -1
- package/dist/test/e2e/helpers/test-helper.d.ts +1 -1
- package/dist/test/e2e/helpers/test-helper.js +4 -5
- package/dist/test/e2e/helpers/test-helper.js.map +1 -1
- package/dist/test/e2e/services/environment-service.test.js +0 -7
- package/dist/test/e2e/services/environment-service.test.js.map +1 -1
- package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js +1 -1
- package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/project-service.e2e.test.js +24 -1
- package/dist/test/e2e/services/project-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/user-service.e2e.test.js +12 -0
- package/dist/test/e2e/services/user-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.d.ts +1 -0
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js +338 -0
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js.map +1 -0
- package/dist/test/e2e/stores/project-store.e2e.test.js +0 -1
- package/dist/test/e2e/stores/project-store.e2e.test.js.map +1 -1
- package/dist/test/fixtures/fake-client-metrics-store-v2.d.ts +20 -0
- package/dist/test/fixtures/fake-client-metrics-store-v2.js +52 -0
- package/dist/test/fixtures/fake-client-metrics-store-v2.js.map +1 -0
- package/dist/test/fixtures/fake-environment-store.d.ts +1 -1
- package/dist/test/fixtures/fake-environment-store.js.map +1 -1
- package/dist/test/fixtures/fake-feature-environment-store.d.ts +1 -0
- package/dist/test/fixtures/fake-feature-environment-store.js +7 -0
- package/dist/test/fixtures/fake-feature-environment-store.js.map +1 -1
- package/dist/test/fixtures/store.js +2 -0
- package/dist/test/fixtures/store.js.map +1 -1
- package/package.json +13 -12
- package/CHANGELOG.md +0 -920
- package/dist/test/e2e/api/admin/project/feature.strategy.e2e.test.js.map +0 -1
- package/docs/api/oas/swagger-ui-bundle.js +0 -3
- package/docs/api/oas/swagger-ui-bundle.js.map +0 -1
- package/docs/api/oas/swagger-ui-es-bundle-core.js +0 -3
- package/docs/api/oas/swagger-ui-es-bundle-core.js.map +0 -1
- package/docs/api/oas/swagger-ui-es-bundle.js +0 -3
- package/docs/api/oas/swagger-ui-es-bundle.js.map +0 -1
- package/docs/api/oas/swagger-ui-standalone-preset.js +0 -3
- package/docs/api/oas/swagger-ui-standalone-preset.js.map +0 -1
- package/docs/api/oas/swagger-ui.css +0 -8906
- package/docs/api/oas/swagger-ui.css.map +0 -1
- package/docs/api/oas/swagger-ui.js +0 -3
- package/docs/api/oas/swagger-ui.js.map +0 -1
- package/docs/api/oas/swagger.json +0 -1479
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-definition.js","sourceRoot":"","sources":["../../../src/lib/addons/webhook-definition.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"webhook-definition.js","sourceRoot":"","sources":["../../../src/lib/addons/webhook-definition.ts"],"names":[],"mappings":";;AAAA,4CAcyB;AAGzB,MAAM,iBAAiB,GAAqB;IACxC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;IACtB,WAAW,EACP,mFAAmF;IACvF,gBAAgB,EAAE,gDAAgD;IAClE,UAAU,EAAE;QACR;YACI,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,aAAa;YAC1B,WAAW,EACP,qGAAqG;YACzG,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAClB;QACD;YACI,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,cAAc;YAC3B,WAAW,EAAE,kBAAkB;YAC/B,WAAW,EACP,4EAA4E;YAChF,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,KAAK;SACnB;QACD;YACI,IAAI,EAAE,cAAc;YACpB,WAAW,EAAE,eAAe;YAC5B,WAAW,EAAE;;;;;EAKvB;YACU,WAAW,EACP,8LAA8L;YAClM,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,KAAK;SACnB;KACJ;IACD,MAAM,EAAE;QACJ,wBAAe;QACf,wBAAe;QACf,yBAAgB;QAChB,iCAAwB;QACxB,wBAAe;QACf,yBAAgB;QAChB,0BAAiB;QACjB,oCAA2B;QAC3B,qCAA4B;QAC5B,gCAAuB;QACvB,gCAAuB;QACvB,6BAAoB;QACpB,iCAAwB;QACxB,+BAAsB;KACzB;CACJ,CAAC;AAEF,kBAAe,iBAAiB,CAAC"}
|
|
@@ -57,6 +57,28 @@ function safeBoolean(envVar, defaultVal) {
|
|
|
57
57
|
function mergeAll(objects) {
|
|
58
58
|
return deepmerge_1.default.all(objects.filter((i) => i));
|
|
59
59
|
}
|
|
60
|
+
function loadExperimental(options) {
|
|
61
|
+
const experimental = options.experimental || {};
|
|
62
|
+
if (safeBoolean(process.env.EXP_ENVIRONMENTS, false)) {
|
|
63
|
+
experimental.environments = { enabled: true };
|
|
64
|
+
}
|
|
65
|
+
if (safeBoolean(process.env.EXP_METRICS_V2, false) ||
|
|
66
|
+
//@ts-ignore
|
|
67
|
+
experimental.environments?.enabled) {
|
|
68
|
+
experimental.metricsV2 = { enabled: true };
|
|
69
|
+
}
|
|
70
|
+
return experimental;
|
|
71
|
+
}
|
|
72
|
+
function loadUI(options, experimental = {}) {
|
|
73
|
+
const uiO = options.ui || {};
|
|
74
|
+
const ui = {};
|
|
75
|
+
if (experimental.environments?.enabled) {
|
|
76
|
+
ui.flags = {
|
|
77
|
+
E: true,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
return mergeAll([uiO, ui]);
|
|
81
|
+
}
|
|
60
82
|
const defaultDbOptions = {
|
|
61
83
|
user: process.env.DATABASE_USERNAME,
|
|
62
84
|
password: process.env.DATABASE_PASSWORD,
|
|
@@ -186,12 +208,12 @@ function createConfig(options) {
|
|
|
186
208
|
? removeUndefinedKeys(options.authentication)
|
|
187
209
|
: options.authentication,
|
|
188
210
|
]);
|
|
189
|
-
const ui = options.ui || {};
|
|
190
211
|
const importSetting = mergeAll([
|
|
191
212
|
defaultImport,
|
|
192
213
|
options.import,
|
|
193
214
|
]);
|
|
194
|
-
const experimental = options
|
|
215
|
+
const experimental = loadExperimental(options);
|
|
216
|
+
const ui = loadUI(options, experimental);
|
|
195
217
|
const email = mergeAll([defaultEmail, options.email]);
|
|
196
218
|
let listen;
|
|
197
219
|
if (server.pipe) {
|
|
@@ -212,7 +234,7 @@ function createConfig(options) {
|
|
|
212
234
|
authentication,
|
|
213
235
|
ui,
|
|
214
236
|
import: importSetting,
|
|
215
|
-
experimental
|
|
237
|
+
experimental,
|
|
216
238
|
email,
|
|
217
239
|
secureHeaders,
|
|
218
240
|
enableOAS,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-config.js","sourceRoot":"","sources":["../../src/lib/create-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,0DAA8B;AAC9B,uCAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"create-config.js","sourceRoot":"","sources":["../../src/lib/create-config.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
// @ts-nocheck
|
|
4
|
+
const create_config_1 = require("./create-config");
|
|
5
|
+
test('should create default config', async () => {
|
|
6
|
+
const config = (0, create_config_1.createConfig)({
|
|
7
|
+
db: {
|
|
8
|
+
host: 'localhost',
|
|
9
|
+
port: 4242,
|
|
10
|
+
user: 'unleash',
|
|
11
|
+
password: 'password',
|
|
12
|
+
database: 'unleash_db',
|
|
13
|
+
},
|
|
14
|
+
server: {
|
|
15
|
+
port: 4242,
|
|
16
|
+
},
|
|
17
|
+
});
|
|
18
|
+
expect(config).toMatchSnapshot();
|
|
19
|
+
});
|
|
20
|
+
test('should enabled metricsV2 via options', async () => {
|
|
21
|
+
const config = (0, create_config_1.createConfig)({
|
|
22
|
+
experimental: {
|
|
23
|
+
metricsV2: { enabled: true },
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
expect(config.experimental.metricsV2.enabled).toBe(true);
|
|
27
|
+
});
|
|
28
|
+
test('should enabled metricsV2 via env variable', async () => {
|
|
29
|
+
process.env.EXP_METRICS_V2 = 'true';
|
|
30
|
+
const config = (0, create_config_1.createConfig)({});
|
|
31
|
+
expect(config.experimental.metricsV2.enabled).toBe(true);
|
|
32
|
+
delete process.env.EXP_METRICS_V2;
|
|
33
|
+
});
|
|
34
|
+
test('should enabled metricsV2 when environments is enabled via env variable', async () => {
|
|
35
|
+
process.env.EXP_ENVIRONMENTS = 'true';
|
|
36
|
+
const config = (0, create_config_1.createConfig)({});
|
|
37
|
+
expect(config.experimental.environments.enabled).toBe(true);
|
|
38
|
+
expect(config.experimental.metricsV2.enabled).toBe(true);
|
|
39
|
+
delete process.env.EXP_ENVIRONMENTS;
|
|
40
|
+
});
|
|
41
|
+
test('should enabled metricsV2 when environments is enabled via options', async () => {
|
|
42
|
+
const config = (0, create_config_1.createConfig)({
|
|
43
|
+
experimental: {
|
|
44
|
+
environments: { enabled: true },
|
|
45
|
+
},
|
|
46
|
+
});
|
|
47
|
+
expect(config.experimental.environments.enabled).toBe(true);
|
|
48
|
+
expect(config.experimental.metricsV2.enabled).toBe(true);
|
|
49
|
+
});
|
|
50
|
+
test('should set UI flag when environments is enabled', async () => {
|
|
51
|
+
process.env.EXP_ENVIRONMENTS = 'true';
|
|
52
|
+
const config = (0, create_config_1.createConfig)({});
|
|
53
|
+
expect(config.experimental.environments.enabled).toBe(true);
|
|
54
|
+
expect(config.ui.flags?.E).toBe(true);
|
|
55
|
+
delete process.env.EXP_ENVIRONMENTS;
|
|
56
|
+
});
|
|
57
|
+
//# sourceMappingURL=create-config.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-config.test.js","sourceRoot":"","sources":["../../src/lib/create-config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ const COLUMNS = [
|
|
|
9
9
|
'client_ip',
|
|
10
10
|
'last_seen',
|
|
11
11
|
'created_at',
|
|
12
|
+
'environment',
|
|
12
13
|
];
|
|
13
14
|
const TABLE = 'client_instances';
|
|
14
15
|
const ONE_DAY = 24 * 61 * 60 * 1000;
|
|
@@ -19,6 +20,7 @@ const mapRow = (row) => ({
|
|
|
19
20
|
clientIp: row.client_ip,
|
|
20
21
|
lastSeen: row.last_seen,
|
|
21
22
|
createdAt: row.created_at,
|
|
23
|
+
environment: row.environment,
|
|
22
24
|
});
|
|
23
25
|
const mapToDb = (client) => ({
|
|
24
26
|
app_name: client.appName,
|
|
@@ -26,6 +28,7 @@ const mapToDb = (client) => ({
|
|
|
26
28
|
sdk_version: client.sdkVersion || '',
|
|
27
29
|
client_ip: client.clientIp,
|
|
28
30
|
last_seen: client.lastSeen || 'now()',
|
|
31
|
+
environment: client.environment || 'default',
|
|
29
32
|
});
|
|
30
33
|
class ClientInstanceStore {
|
|
31
34
|
constructor(db, eventBus, getLogger) {
|
|
@@ -52,7 +55,7 @@ class ClientInstanceStore {
|
|
|
52
55
|
const rows = instances.map(mapToDb);
|
|
53
56
|
await this.db(TABLE)
|
|
54
57
|
.insert(rows)
|
|
55
|
-
.onConflict(['app_name', 'instance_id'])
|
|
58
|
+
.onConflict(['app_name', 'instance_id', 'environment'])
|
|
56
59
|
.merge();
|
|
57
60
|
}
|
|
58
61
|
async delete({ appName, instanceId, }) {
|
|
@@ -78,7 +81,7 @@ class ClientInstanceStore {
|
|
|
78
81
|
const stopTimer = this.metricTimer('insert');
|
|
79
82
|
await this.db(TABLE)
|
|
80
83
|
.insert(mapToDb(details))
|
|
81
|
-
.onConflict(['app_name', 'instance_id'])
|
|
84
|
+
.onConflict(['app_name', 'instance_id', 'environment'])
|
|
82
85
|
.merge();
|
|
83
86
|
stopTimer();
|
|
84
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-instance-store.js","sourceRoot":"","sources":["../../../src/lib/db/client-instance-store.ts"],"names":[],"mappings":";;AAUA,MAAM,aAAa,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACxD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAEhD,MAAM,OAAO,GAAG;IACZ,UAAU;IACV,aAAa;IACb,aAAa;IACb,WAAW;IACX,WAAW;IACX,YAAY;
|
|
1
|
+
{"version":3,"file":"client-instance-store.js","sourceRoot":"","sources":["../../../src/lib/db/client-instance-store.ts"],"names":[],"mappings":";;AAUA,MAAM,aAAa,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACxD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAEhD,MAAM,OAAO,GAAG;IACZ,UAAU;IACV,aAAa;IACb,aAAa;IACb,WAAW;IACX,WAAW;IACX,YAAY;IACZ,aAAa;CAChB,CAAC;AACF,MAAM,KAAK,GAAG,kBAAkB,CAAC;AAEjC,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEpC,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACrB,OAAO,EAAE,GAAG,CAAC,QAAQ;IACrB,UAAU,EAAE,GAAG,CAAC,WAAW;IAC3B,UAAU,EAAE,GAAG,CAAC,WAAW;IAC3B,QAAQ,EAAE,GAAG,CAAC,SAAS;IACvB,QAAQ,EAAE,GAAG,CAAC,SAAS;IACvB,SAAS,EAAE,GAAG,CAAC,UAAU;IACzB,WAAW,EAAE,GAAG,CAAC,WAAW;CAC/B,CAAC,CAAC;AAEH,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,OAAO;IACxB,WAAW,EAAE,MAAM,CAAC,UAAU;IAC9B,WAAW,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE;IACpC,SAAS,EAAE,MAAM,CAAC,QAAQ;IAC1B,SAAS,EAAE,MAAM,CAAC,QAAQ,IAAI,OAAO;IACrC,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,SAAS;CAC/C,CAAC,CAAC;AAEH,MAAqB,mBAAmB;IAWpC,YAAY,EAAQ,EAAE,QAAsB,EAAE,SAAsB;QAChE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,0BAA0B,CAAC,CAAC;QACpD,IAAI,CAAC,WAAW,GAAG,CAAC,MAAM,EAAE,EAAE,CAC1B,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE;YACvC,KAAK,EAAE,UAAU;YACjB,MAAM;SACT,CAAC,CAAC;QACP,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAC9D,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,gCAAgC;QAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aAC5B,QAAQ,CAAC,wCAAwC,CAAC;aAClD,GAAG,EAAE,CAAC;QAEX,IAAI,IAAI,GAAG,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,IAAI,YAAY,CAAC,CAAC;SAClD;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAA+B;QAC5C,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aACf,MAAM,CAAC,IAAI,CAAC;aACZ,UAAU,CAAC,CAAC,UAAU,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;aACtD,KAAK,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EACT,OAAO,EACP,UAAU,GACuC;QACjD,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aACf,KAAK,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;aACrD,GAAG,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EACN,OAAO,EACP,UAAU,GAIb;QACG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aAC3B,KAAK,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;aACrD,KAAK,EAAE,CAAC;QACb,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EACT,OAAO,EACP,UAAU,GACuC;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B,gCAAgC,KAAK,qDAAqD,EAC1F,CAAC,OAAO,EAAE,UAAU,CAAC,CACxB,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAA2B;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE7C,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACxB,UAAU,CAAC,CAAC,UAAU,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;aACtD,KAAK,EAAE,CAAC;QAEb,SAAS,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,KAAK,CAAC;aACX,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAElC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEjC,SAAS,EAAE,CAAC;QAEZ,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAe;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,EAAE;aACR,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC;aAC1B,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAElC,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,uBAAuB;QACzB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,QAAQ,CAAC,UAAU,CAAC;aACpB,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;aACpB,IAAI,CAAC,KAAK,CAAC;aACX,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAEjC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,OAAe;QACtC,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;IAC3D,CAAC;IAED,OAAO;QACH,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;CACJ;AAtID,sCAsIC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Knex } from 'knex';
|
|
2
|
+
import { LogProvider } from '../logger';
|
|
3
|
+
import { IClientMetricsEnv, IClientMetricsEnvKey, IClientMetricsStoreV2 } from '../types/stores/client-metrics-store-v2';
|
|
4
|
+
export declare function roundDownToHour(date: Date): Date;
|
|
5
|
+
export declare class ClientMetricsStoreV2 implements IClientMetricsStoreV2 {
|
|
6
|
+
private db;
|
|
7
|
+
private logger;
|
|
8
|
+
constructor(db: Knex, getLogger: LogProvider);
|
|
9
|
+
get(key: IClientMetricsEnvKey): Promise<IClientMetricsEnv>;
|
|
10
|
+
getAll(query?: Object): Promise<IClientMetricsEnv[]>;
|
|
11
|
+
exists(key: IClientMetricsEnvKey): Promise<boolean>;
|
|
12
|
+
delete(key: IClientMetricsEnvKey): Promise<void>;
|
|
13
|
+
deleteAll(): Promise<void>;
|
|
14
|
+
destroy(): void;
|
|
15
|
+
batchInsertMetrics(metrics: IClientMetricsEnv[]): Promise<void>;
|
|
16
|
+
getMetricsForFeatureToggle(featureName: string, hoursBack?: number): Promise<IClientMetricsEnv[]>;
|
|
17
|
+
getSeenAppsForFeatureToggle(featureName: string, hoursBack?: number): Promise<string[]>;
|
|
18
|
+
clearMetrics(hoursAgo: number): Promise<void>;
|
|
19
|
+
}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ClientMetricsStoreV2 = exports.roundDownToHour = void 0;
|
|
7
|
+
const notfound_error_1 = __importDefault(require("../error/notfound-error"));
|
|
8
|
+
const TABLE = 'client_metrics_env';
|
|
9
|
+
function roundDownToHour(date) {
|
|
10
|
+
return new Date(date.getTime() - (date.getTime() % 3600000));
|
|
11
|
+
}
|
|
12
|
+
exports.roundDownToHour = roundDownToHour;
|
|
13
|
+
const fromRow = (row) => ({
|
|
14
|
+
featureName: row.feature_name,
|
|
15
|
+
appName: row.app_name,
|
|
16
|
+
environment: row.environment,
|
|
17
|
+
timestamp: row.timestamp,
|
|
18
|
+
yes: row.yes,
|
|
19
|
+
no: row.no,
|
|
20
|
+
});
|
|
21
|
+
const toRow = (metric) => ({
|
|
22
|
+
feature_name: metric.featureName,
|
|
23
|
+
app_name: metric.appName,
|
|
24
|
+
environment: metric.environment,
|
|
25
|
+
timestamp: roundDownToHour(metric.timestamp),
|
|
26
|
+
yes: metric.yes,
|
|
27
|
+
no: metric.no,
|
|
28
|
+
});
|
|
29
|
+
class ClientMetricsStoreV2 {
|
|
30
|
+
constructor(db, getLogger) {
|
|
31
|
+
this.db = db;
|
|
32
|
+
this.logger = getLogger('client-metrics-store-v2.js');
|
|
33
|
+
}
|
|
34
|
+
async get(key) {
|
|
35
|
+
const row = await this.db(TABLE)
|
|
36
|
+
.where({
|
|
37
|
+
feature_name: key.featureName,
|
|
38
|
+
app_name: key.appName,
|
|
39
|
+
environment: key.environment,
|
|
40
|
+
timestamp: roundDownToHour(key.timestamp),
|
|
41
|
+
})
|
|
42
|
+
.first();
|
|
43
|
+
if (row) {
|
|
44
|
+
return fromRow(row);
|
|
45
|
+
}
|
|
46
|
+
throw new notfound_error_1.default(`Could not find metric`);
|
|
47
|
+
}
|
|
48
|
+
async getAll(query = {}) {
|
|
49
|
+
const rows = await this.db(TABLE)
|
|
50
|
+
.select('*')
|
|
51
|
+
.where(query);
|
|
52
|
+
return rows.map(fromRow);
|
|
53
|
+
}
|
|
54
|
+
async exists(key) {
|
|
55
|
+
try {
|
|
56
|
+
await this.get(key);
|
|
57
|
+
return true;
|
|
58
|
+
}
|
|
59
|
+
catch (e) {
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
async delete(key) {
|
|
64
|
+
return this.db(TABLE)
|
|
65
|
+
.where({
|
|
66
|
+
feature_name: key.featureName,
|
|
67
|
+
app_name: key.appName,
|
|
68
|
+
environment: key.environment,
|
|
69
|
+
timestamp: roundDownToHour(key.timestamp),
|
|
70
|
+
})
|
|
71
|
+
.del();
|
|
72
|
+
}
|
|
73
|
+
deleteAll() {
|
|
74
|
+
return this.db(TABLE).del();
|
|
75
|
+
}
|
|
76
|
+
destroy() {
|
|
77
|
+
// Nothing to do!
|
|
78
|
+
}
|
|
79
|
+
// this function will collapse metrics before sending it to the database.
|
|
80
|
+
async batchInsertMetrics(metrics) {
|
|
81
|
+
if (!metrics || metrics.length == 0) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
const rows = metrics.map(toRow);
|
|
85
|
+
const batch = rows.reduce((prev, curr) => {
|
|
86
|
+
// eslint-disable-next-line prettier/prettier
|
|
87
|
+
const key = `${curr.feature_name}_${curr.app_name}_${curr.environment}_${curr.timestamp.getTime()}`;
|
|
88
|
+
if (prev[key]) {
|
|
89
|
+
prev[key].yes += curr.yes;
|
|
90
|
+
prev[key].no += curr.no;
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
prev[key] = curr;
|
|
94
|
+
}
|
|
95
|
+
return prev;
|
|
96
|
+
}, {});
|
|
97
|
+
// Consider rewriting to SQL batch!
|
|
98
|
+
const insert = this.db(TABLE)
|
|
99
|
+
.insert(Object.values(batch))
|
|
100
|
+
.toQuery();
|
|
101
|
+
const query = `${insert.toString()} ON CONFLICT (feature_name, app_name, environment, timestamp) DO UPDATE SET "yes" = "client_metrics_env"."yes" + EXCLUDED.yes, "no" = "client_metrics_env"."no" + EXCLUDED.no`;
|
|
102
|
+
await this.db.raw(query);
|
|
103
|
+
}
|
|
104
|
+
async getMetricsForFeatureToggle(featureName, hoursBack = 24) {
|
|
105
|
+
const rows = await this.db(TABLE)
|
|
106
|
+
.select('*')
|
|
107
|
+
.where({ feature_name: featureName })
|
|
108
|
+
.andWhereRaw(`timestamp >= NOW() - INTERVAL '${hoursBack} hours'`);
|
|
109
|
+
return rows.map(fromRow);
|
|
110
|
+
}
|
|
111
|
+
async getSeenAppsForFeatureToggle(featureName, hoursBack = 24) {
|
|
112
|
+
return this.db(TABLE)
|
|
113
|
+
.distinct()
|
|
114
|
+
.where({ feature_name: featureName })
|
|
115
|
+
.andWhereRaw(`timestamp >= NOW() - INTERVAL '${hoursBack} hours'`)
|
|
116
|
+
.pluck('app_name')
|
|
117
|
+
.orderBy('app_name');
|
|
118
|
+
}
|
|
119
|
+
async clearMetrics(hoursAgo) {
|
|
120
|
+
return this.db(TABLE)
|
|
121
|
+
.whereRaw(`timestamp <= NOW() - INTERVAL '${hoursAgo} hours'`)
|
|
122
|
+
.del();
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
exports.ClientMetricsStoreV2 = ClientMetricsStoreV2;
|
|
126
|
+
//# sourceMappingURL=client-metrics-store-v2.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client-metrics-store-v2.js","sourceRoot":"","sources":["../../../src/lib/db/client-metrics-store-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
import { Knex } from 'knex';
|
|
2
2
|
import { LogProvider } from '../logger';
|
|
3
|
-
import { IContextField, IContextFieldStore } from '../types/stores/context-field-store';
|
|
3
|
+
import { IContextField, IContextFieldDto, IContextFieldStore } from '../types/stores/context-field-store';
|
|
4
4
|
interface ICreateContextField {
|
|
5
5
|
name: string;
|
|
6
6
|
description: string;
|
|
7
7
|
stickiness: boolean;
|
|
8
8
|
sort_order: number;
|
|
9
|
-
legal_values?: string
|
|
9
|
+
legal_values?: string;
|
|
10
10
|
updated_at: Date;
|
|
11
11
|
}
|
|
12
12
|
declare class ContextFieldStore implements IContextFieldStore {
|
|
13
13
|
private db;
|
|
14
14
|
private logger;
|
|
15
15
|
constructor(db: Knex, getLogger: LogProvider);
|
|
16
|
-
fieldToRow(data:
|
|
16
|
+
fieldToRow(data: IContextFieldDto): Omit<ICreateContextField, 'updated_at'>;
|
|
17
17
|
getAll(): Promise<IContextField[]>;
|
|
18
18
|
get(key: string): Promise<IContextField>;
|
|
19
19
|
deleteAll(): Promise<void>;
|
|
20
20
|
destroy(): void;
|
|
21
21
|
exists(key: string): Promise<boolean>;
|
|
22
|
-
create(contextField:
|
|
23
|
-
update(data:
|
|
22
|
+
create(contextField: IContextFieldDto): Promise<IContextField>;
|
|
23
|
+
update(data: IContextFieldDto): Promise<IContextField>;
|
|
24
24
|
delete(name: string): Promise<void>;
|
|
25
25
|
}
|
|
26
26
|
export default ContextFieldStore;
|
|
@@ -22,15 +22,13 @@ class ContextFieldStore {
|
|
|
22
22
|
this.db = db;
|
|
23
23
|
this.logger = getLogger('context-field-store.ts');
|
|
24
24
|
}
|
|
25
|
-
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
26
25
|
fieldToRow(data) {
|
|
27
26
|
return {
|
|
28
27
|
name: data.name,
|
|
29
28
|
description: data.description,
|
|
30
29
|
stickiness: data.stickiness,
|
|
31
30
|
sort_order: data.sortOrder,
|
|
32
|
-
legal_values: data.legalValues ? data.legalValues.join(',') :
|
|
33
|
-
updated_at: data.createdAt, // eslint-disable-line
|
|
31
|
+
legal_values: data.legalValues ? data.legalValues.join(',') : undefined, // eslint-disable-line
|
|
34
32
|
};
|
|
35
33
|
}
|
|
36
34
|
async getAll() {
|
|
@@ -56,16 +54,14 @@ class ContextFieldStore {
|
|
|
56
54
|
const { present } = result.rows[0];
|
|
57
55
|
return present;
|
|
58
56
|
}
|
|
59
|
-
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
60
57
|
async create(contextField) {
|
|
61
58
|
const row = await this.db(TABLE)
|
|
62
59
|
.insert(this.fieldToRow(contextField))
|
|
63
60
|
.returning('*');
|
|
64
61
|
return mapRow(row);
|
|
65
62
|
}
|
|
66
|
-
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
67
63
|
async update(data) {
|
|
68
|
-
const row = this.db(TABLE)
|
|
64
|
+
const row = await this.db(TABLE)
|
|
69
65
|
.where({ name: data.name })
|
|
70
66
|
.update(this.fieldToRow(data))
|
|
71
67
|
.returning('*');
|
|
@@ -76,5 +72,4 @@ class ContextFieldStore {
|
|
|
76
72
|
}
|
|
77
73
|
}
|
|
78
74
|
exports.default = ContextFieldStore;
|
|
79
|
-
module.exports = ContextFieldStore;
|
|
80
75
|
//# sourceMappingURL=context-field-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-field-store.js","sourceRoot":"","sources":["../../../src/lib/db/context-field-store.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"context-field-store.js","sourceRoot":"","sources":["../../../src/lib/db/context-field-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,12 +12,12 @@ export default class EnvironmentStore implements IEnvironmentStore {
|
|
|
12
12
|
importEnvironments(environments: IEnvironment[]): Promise<IEnvironment[]>;
|
|
13
13
|
deleteAll(): Promise<void>;
|
|
14
14
|
get(key: string): Promise<IEnvironment>;
|
|
15
|
-
getAll(): Promise<IEnvironment[]>;
|
|
15
|
+
getAll(query?: Object): Promise<IEnvironment[]>;
|
|
16
16
|
exists(name: string): Promise<boolean>;
|
|
17
17
|
getByName(name: string): Promise<IEnvironment>;
|
|
18
18
|
updateProperty(id: string, field: string, value: string | number): Promise<void>;
|
|
19
19
|
updateSortOrder(id: string, value: number): Promise<void>;
|
|
20
|
-
update(env: Pick<IEnvironment, '
|
|
20
|
+
update(env: Pick<IEnvironment, 'type' | 'protected'>, name: string): Promise<IEnvironment>;
|
|
21
21
|
create(env: IEnvironmentCreate): Promise<IEnvironment>;
|
|
22
22
|
delete(name: string): Promise<void>;
|
|
23
23
|
destroy(): void;
|
|
@@ -9,7 +9,6 @@ const notfound_error_1 = __importDefault(require("../error/notfound-error"));
|
|
|
9
9
|
const snakeCase_1 = require("../util/snakeCase");
|
|
10
10
|
const COLUMNS = [
|
|
11
11
|
'type',
|
|
12
|
-
'display_name',
|
|
13
12
|
'name',
|
|
14
13
|
'created_at',
|
|
15
14
|
'sort_order',
|
|
@@ -19,7 +18,6 @@ const COLUMNS = [
|
|
|
19
18
|
function mapRow(row) {
|
|
20
19
|
return {
|
|
21
20
|
name: row.name,
|
|
22
|
-
displayName: row.display_name,
|
|
23
21
|
type: row.type,
|
|
24
22
|
sortOrder: row.sort_order,
|
|
25
23
|
enabled: row.enabled,
|
|
@@ -29,7 +27,6 @@ function mapRow(row) {
|
|
|
29
27
|
function fieldToRow(env) {
|
|
30
28
|
return {
|
|
31
29
|
name: env.name,
|
|
32
|
-
display_name: env.displayName,
|
|
33
30
|
type: env.type,
|
|
34
31
|
sort_order: env.sortOrder,
|
|
35
32
|
enabled: env.enabled,
|
|
@@ -66,10 +63,14 @@ class EnvironmentStore {
|
|
|
66
63
|
}
|
|
67
64
|
throw new notfound_error_1.default(`Could not find environment with name: ${key}`);
|
|
68
65
|
}
|
|
69
|
-
async getAll() {
|
|
70
|
-
|
|
66
|
+
async getAll(query) {
|
|
67
|
+
let qB = this.db(TABLE)
|
|
71
68
|
.select('*')
|
|
72
69
|
.orderBy('sort_order', 'created_at');
|
|
70
|
+
if (query) {
|
|
71
|
+
qB = qB.where(query);
|
|
72
|
+
}
|
|
73
|
+
const rows = await qB;
|
|
73
74
|
return rows.map(mapRow);
|
|
74
75
|
}
|
|
75
76
|
async exists(name) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/environment-store.ts"],"names":[],"mappings":";;;;;AAGA,4EAAmD;AACnD,oDAA2C;AAE3C,6EAAoD;AAEpD,iDAAkD;
|
|
1
|
+
{"version":3,"file":"environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/environment-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export declare class FeatureEnvironmentStore implements IFeatureEnvironmentStore
|
|
|
15
15
|
exists({ featureName, environment, }: FeatureEnvironmentKey): Promise<boolean>;
|
|
16
16
|
get({ featureName, environment, }: FeatureEnvironmentKey): Promise<IFeatureEnvironment>;
|
|
17
17
|
getAll(): Promise<IFeatureEnvironment[]>;
|
|
18
|
+
disableEnvironmentIfNoStrategies(featureName: string, environment: string): Promise<void>;
|
|
18
19
|
addEnvironmentToFeature(featureName: string, environment: string, enabled?: boolean): Promise<void>;
|
|
19
20
|
disconnectFeatures(environment: string, project: string): Promise<void>;
|
|
20
21
|
featureHasEnvironment(environment: string, featureName: string): Promise<boolean>;
|
|
@@ -7,7 +7,10 @@ exports.FeatureEnvironmentStore = void 0;
|
|
|
7
7
|
const metrics_helper_1 = __importDefault(require("../util/metrics-helper"));
|
|
8
8
|
const metric_events_1 = require("../metric-events");
|
|
9
9
|
const notfound_error_1 = __importDefault(require("../error/notfound-error"));
|
|
10
|
-
const T = {
|
|
10
|
+
const T = {
|
|
11
|
+
featureEnvs: 'feature_environments',
|
|
12
|
+
featureStrategies: 'feature_strategies',
|
|
13
|
+
};
|
|
11
14
|
class FeatureEnvironmentStore {
|
|
12
15
|
constructor(db, eventBus, getLogger) {
|
|
13
16
|
this.db = db;
|
|
@@ -54,6 +57,15 @@ class FeatureEnvironmentStore {
|
|
|
54
57
|
environment: r.environment,
|
|
55
58
|
}));
|
|
56
59
|
}
|
|
60
|
+
async disableEnvironmentIfNoStrategies(featureName, environment) {
|
|
61
|
+
const result = await this.db.raw(`SELECT EXISTS (SELECT 1 FROM ${T.featureStrategies} WHERE feature_name = ? AND environment = ?) AS enabled`, [featureName, environment]);
|
|
62
|
+
const { enabled } = result.rows[0];
|
|
63
|
+
if (!enabled) {
|
|
64
|
+
await this.db(T.featureEnvs)
|
|
65
|
+
.update({ enabled: false })
|
|
66
|
+
.where({ feature_name: featureName, environment });
|
|
67
|
+
}
|
|
68
|
+
}
|
|
57
69
|
async addEnvironmentToFeature(featureName, environment, enabled = false) {
|
|
58
70
|
await this.db('feature_environments')
|
|
59
71
|
.insert({ feature_name: featureName, environment, enabled })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-environment-store.ts"],"names":[],"mappings":";;;;;;AAOA,4EAAmD;AACnD,oDAA2C;AAE3C,6EAAoD;AAEpD,MAAM,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"feature-environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-environment-store.ts"],"names":[],"mappings":";;;;;;AAOA,4EAAmD;AACnD,oDAA2C;AAE3C,6EAAoD;AAEpD,MAAM,CAAC,GAAG;IACN,WAAW,EAAE,sBAAsB;IACnC,iBAAiB,EAAE,oBAAoB;CAC1C,CAAC;AAQF,MAAa,uBAAuB;IAOhC,YAAY,EAAQ,EAAE,QAAsB,EAAE,SAAsB;QAChE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,8BAA8B,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,GAAG,CAAC,MAAM,EAAE,EAAE,CACpB,wBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,uBAAO,EAAE;YACvC,KAAK,EAAE,sBAAsB;YAC7B,MAAM;SACT,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EACT,WAAW,EACX,WAAW,GACS;QACpB,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aACvB,KAAK,CAAC,cAAc,EAAE,WAAW,CAAC;aAClC,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC;aACpC,GAAG,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC;IACvC,CAAC;IAED,OAAO,KAAU,CAAC;IAElB,KAAK,CAAC,MAAM,CAAC,EACT,WAAW,EACX,WAAW,GACS;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B,gCAAgC,CAAC,CAAC,WAAW,yDAAyD,EACtG,CAAC,WAAW,EAAE,WAAW,CAAC,CAC7B,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EACN,WAAW,EACX,WAAW,GACS;QACpB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aAClC,KAAK,CAAC,cAAc,EAAE,WAAW,CAAC;aAClC,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC;aACpC,KAAK,EAAE,CAAC;QACb,IAAI,EAAE,EAAE;YACJ,OAAO;gBACH,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,WAAW;gBACX,WAAW;aACd,CAAC;SACL;QACD,MAAM,IAAI,wBAAa,CACnB,kBAAkB,WAAW,OAAO,WAAW,EAAE,CACpD,CAAC;IACN,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,WAAW,EAAE,CAAC,CAAC,YAAY;YAC3B,WAAW,EAAE,CAAC,CAAC,WAAW;SAC7B,CAAC,CAAC,CAAC;IACR,CAAC;IAED,KAAK,CAAC,gCAAgC,CAClC,WAAmB,EACnB,WAAmB;QAEnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B,gCAAgC,CAAC,CAAC,iBAAiB,yDAAyD,EAC5G,CAAC,WAAW,EAAE,WAAW,CAAC,CAC7B,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;iBACvB,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;iBAC1B,KAAK,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;SAC1D;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB,CACzB,WAAmB,EACnB,WAAmB,EACnB,UAAmB,KAAK;QAExB,MAAM,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC;aAChC,MAAM,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;aAC3D,UAAU,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;aAC3C,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1B,CAAC;IAED,+BAA+B;IAC/B,KAAK,CAAC,kBAAkB,CACpB,WAAmB,EACnB,OAAe;QAEf,MAAM,eAAe,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC;aACtC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;aAClB,MAAM,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aACvB,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;aACtB,QAAQ,CAAC,cAAc,EAAE,IAAI,EAAE,eAAe,CAAC;aAC/C,GAAG,EAAE,CAAC;QACX,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC;YACtC,WAAW;YACX,YAAY,EAAE,OAAO;SACxB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,qBAAqB,CACvB,WAAmB,EACnB,WAAmB;QAEnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B,gCAAgC,CAAC,CAAC,WAAW,0DAA0D,EACvG,CAAC,WAAW,EAAE,WAAW,CAAC,CAC7B,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,WAAmB,EACnB,WAAmB;QAEnB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aAClC,KAAK,CAAC,cAAc,EAAE,WAAW,CAAC;aAClC,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC;aACpC,KAAK,EAAE,CAAC;QACb,IAAI,EAAE,EAAE;YACJ,OAAO;gBACH,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,WAAW;gBACX,WAAW;aACd,CAAC;SACL;QACD,MAAM,IAAI,wBAAa,CACnB,kBAAkB,WAAW,OAAO,WAAW,EAAE,CACpD,CAAC;IACN,CAAC;IAED,KAAK,CAAC,oBAAoB,CACtB,WAAmB,EACnB,WAAmB;QAEnB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aACnC,MAAM,CAAC,SAAS,CAAC;aACjB,KAAK,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;aACjD,KAAK,EAAE,CAAC;QACb,OAAO,GAAG,CAAC,OAAO,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC7B,WAAmB,EACnB,WAAmB;QAEnB,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aACvB,KAAK,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;aACjD,GAAG,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC7B,WAAmB,EACnB,WAAmB,EACnB,OAAgB;QAEhB,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aACvB,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;aACnB,KAAK,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC;QACvD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,WAAmB,EACnB,SAAiB;QAEjB,MAAM,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,MAAM,CAAC;YACzC,gBAAgB,EAAE,WAAW;YAC7B,UAAU,EAAE,SAAS;SACxB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,WAAmB,EACnB,SAAiB;QAEjB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC;aAC7C,MAAM,CAAC,MAAM,CAAC;aACd,KAAK,CAAC;YACH,OAAO,EAAE,SAAS;SACrB,CAAC,CAAC;QACP,MAAM,IAAI,GAA6B,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChE,WAAW;YACX,YAAY,EAAE,CAAC,CAAC,IAAI;YACpB,OAAO,EAAE,KAAK;SACjB,CAAC,CAAC,CAAC;QACJ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACjB,MAAM,IAAI,CAAC,EAAE,CAAyB,sBAAsB,CAAC;iBACxD,MAAM,CAAC,IAAI,CAAC;iBACZ,UAAU,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;iBAC3C,MAAM,EAAE,CAAC;SACjB;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CACnB,WAAmB,EACnB,SAAiB;QAEjB,MAAM,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC;aAChC,KAAK,CAAC,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;aAC/D,GAAG,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,sCAAsC,CACxC,WAAmB,EACnB,SAAiB;QAEjB,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC;aAC7D,MAAM,CAAC,kBAAkB,CAAC;aAC1B,KAAK,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC;QACtC,MAAM,OAAO,CAAC,GAAG,CACb,oBAAoB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACnC,MAAM,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC;iBAChC,MAAM,CAAC;gBACJ,WAAW,EAAE,GAAG,CAAC,gBAAgB;gBACjC,YAAY,EAAE,WAAW;gBACzB,OAAO,EAAE,KAAK;aACjB,CAAC;iBACD,UAAU,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;iBAC3C,MAAM,EAAE,CAAC;QAClB,CAAC,CAAC,CACL,CAAC;IACN,CAAC;CACJ;AAnPD,0DAmPC"}
|