unleash-server 4.13.0-beta.0 → 4.13.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/dist/lib/create-config.js +29 -38
- package/dist/lib/create-config.js.map +1 -1
- package/dist/lib/db/feature-toggle-client-store.d.ts +2 -3
- package/dist/lib/db/feature-toggle-client-store.js +4 -5
- package/dist/lib/db/feature-toggle-client-store.js.map +1 -1
- package/dist/lib/db/index.js +1 -1
- package/dist/lib/db/index.js.map +1 -1
- package/dist/lib/experimental.d.ts +0 -7
- package/dist/lib/experimental.js +0 -9
- package/dist/lib/experimental.js.map +1 -1
- package/dist/lib/routes/admin-api/config.d.ts +13 -2
- package/dist/lib/routes/admin-api/config.js +4 -2
- package/dist/lib/routes/admin-api/config.js.map +1 -1
- package/dist/lib/routes/admin-api/config.test.js +8 -8
- package/dist/lib/routes/admin-api/config.test.js.map +1 -1
- package/dist/lib/routes/client-api/feature.js +1 -2
- package/dist/lib/routes/client-api/feature.js.map +1 -1
- package/dist/lib/routes/client-api/index.js +0 -4
- package/dist/lib/routes/client-api/index.js.map +1 -1
- package/dist/lib/services/segment-service.d.ts +3 -2
- package/dist/lib/services/segment-service.js +13 -15
- package/dist/lib/services/segment-service.js.map +1 -1
- package/dist/lib/types/option.d.ts +4 -0
- package/dist/lib/util/env.d.ts +2 -0
- package/dist/lib/util/env.js +19 -0
- package/dist/lib/util/env.js.map +1 -0
- package/dist/lib/util/env.test.d.ts +1 -0
- package/dist/lib/util/env.test.js +26 -0
- package/dist/lib/util/env.test.js.map +1 -0
- package/dist/lib/util/segments.d.ts +2 -2
- package/dist/lib/util/segments.js +3 -3
- package/dist/lib/util/segments.js.map +1 -1
- package/dist/server-dev.js +0 -2
- package/dist/server-dev.js.map +1 -1
- package/dist/test/config/test-config.js +0 -2
- package/dist/test/config/test-config.js.map +1 -1
- package/dist/test/e2e/api/client/global.segment.e2e.test.js +4 -13
- package/dist/test/e2e/api/client/global.segment.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/segment.e2e.test.js +5 -31
- package/dist/test/e2e/api/client/segment.e2e.test.js.map +1 -1
- package/package.json +5 -10
- package/dist/lib/routes/client-api/segments.d.ts +0 -11
- package/dist/lib/routes/client-api/segments.js +0 -21
- package/dist/lib/routes/client-api/segments.js.map +0 -1
|
@@ -37,36 +37,18 @@ const format_base_uri_1 = require("./util/format-base-uri");
|
|
|
37
37
|
const date_fns_1 = require("date-fns");
|
|
38
38
|
const events_1 = __importDefault(require("events"));
|
|
39
39
|
const api_token_1 = require("./types/models/api-token");
|
|
40
|
+
const env_1 = require("./util/env");
|
|
41
|
+
const segments_1 = require("./util/segments");
|
|
40
42
|
const safeToUpper = (s) => (s ? s.toUpperCase() : s);
|
|
41
43
|
function authTypeFromString(s, defaultType = option_1.IAuthType.OPEN_SOURCE) {
|
|
42
44
|
return option_1.IAuthType[safeToUpper(s)] || defaultType;
|
|
43
45
|
}
|
|
44
46
|
exports.authTypeFromString = authTypeFromString;
|
|
45
|
-
function safeNumber(envVar, defaultVal) {
|
|
46
|
-
if (envVar) {
|
|
47
|
-
try {
|
|
48
|
-
return Number.parseInt(envVar, 10);
|
|
49
|
-
}
|
|
50
|
-
catch (err) {
|
|
51
|
-
return defaultVal;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
return defaultVal;
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
function safeBoolean(envVar, defaultVal) {
|
|
59
|
-
if (envVar) {
|
|
60
|
-
return envVar === 'true' || envVar === '1' || envVar === 't';
|
|
61
|
-
}
|
|
62
|
-
return defaultVal;
|
|
63
|
-
}
|
|
64
47
|
function mergeAll(objects) {
|
|
65
48
|
return deepmerge_1.default.all(objects.filter((i) => i));
|
|
66
49
|
}
|
|
67
50
|
function loadExperimental(options) {
|
|
68
|
-
|
|
69
|
-
return experimental;
|
|
51
|
+
return options.experimental || {};
|
|
70
52
|
}
|
|
71
53
|
function loadUI(options) {
|
|
72
54
|
const uiO = options.ui || {};
|
|
@@ -80,7 +62,7 @@ const defaultDbOptions = {
|
|
|
80
62
|
user: process.env.DATABASE_USERNAME,
|
|
81
63
|
password: process.env.DATABASE_PASSWORD,
|
|
82
64
|
host: process.env.DATABASE_HOST,
|
|
83
|
-
port:
|
|
65
|
+
port: (0, env_1.parseEnvVarNumber)(process.env.DATABASE_PORT, 5432),
|
|
84
66
|
database: process.env.DATABASE_NAME || 'unleash',
|
|
85
67
|
ssl: process.env.DATABASE_SSL != null
|
|
86
68
|
? JSON.parse(process.env.DATABASE_SSL)
|
|
@@ -89,9 +71,9 @@ const defaultDbOptions = {
|
|
|
89
71
|
version: process.env.DATABASE_VERSION,
|
|
90
72
|
acquireConnectionTimeout: (0, date_fns_1.secondsToMilliseconds)(30),
|
|
91
73
|
pool: {
|
|
92
|
-
min:
|
|
93
|
-
max:
|
|
94
|
-
idleTimeoutMillis:
|
|
74
|
+
min: (0, env_1.parseEnvVarNumber)(process.env.DATABASE_POOL_MIN, 0),
|
|
75
|
+
max: (0, env_1.parseEnvVarNumber)(process.env.DATABASE_POOL_MAX, 4),
|
|
76
|
+
idleTimeoutMillis: (0, env_1.parseEnvVarNumber)(process.env.DATABASE_POOL_IDLE_TIMEOUT_MS, (0, date_fns_1.secondsToMilliseconds)(30)),
|
|
95
77
|
propagateCreateError: false,
|
|
96
78
|
},
|
|
97
79
|
schema: process.env.DATABASE_SCHEMA || 'public',
|
|
@@ -99,13 +81,13 @@ const defaultDbOptions = {
|
|
|
99
81
|
applicationName: process.env.DATABASE_APPLICATION_NAME || 'unleash',
|
|
100
82
|
};
|
|
101
83
|
const defaultSessionOption = {
|
|
102
|
-
ttlHours:
|
|
84
|
+
ttlHours: (0, env_1.parseEnvVarNumber)(process.env.SESSION_TTL_HOURS, 48),
|
|
103
85
|
db: true,
|
|
104
86
|
};
|
|
105
87
|
const defaultServerOption = {
|
|
106
88
|
pipe: undefined,
|
|
107
89
|
host: process.env.HTTP_HOST,
|
|
108
|
-
port:
|
|
90
|
+
port: (0, env_1.parseEnvVarNumber)(process.env.HTTP_PORT || process.env.PORT, 4242),
|
|
109
91
|
baseUriPath: (0, format_base_uri_1.formatBaseUri)(process.env.BASE_URI_PATH),
|
|
110
92
|
cdnPrefix: process.env.CDN_PREFIX,
|
|
111
93
|
unleashUrl: process.env.UNLEASH_URL || 'http://localhost:4242',
|
|
@@ -113,16 +95,16 @@ const defaultServerOption = {
|
|
|
113
95
|
keepAliveTimeout: (0, date_fns_1.minutesToMilliseconds)(1),
|
|
114
96
|
headersTimeout: (0, date_fns_1.secondsToMilliseconds)(61),
|
|
115
97
|
enableRequestLogger: false,
|
|
116
|
-
gracefulShutdownEnable:
|
|
117
|
-
gracefulShutdownTimeout:
|
|
98
|
+
gracefulShutdownEnable: (0, env_1.parseEnvVarBoolean)(process.env.GRACEFUL_SHUTDOWN_ENABLE, true),
|
|
99
|
+
gracefulShutdownTimeout: (0, env_1.parseEnvVarNumber)(process.env.GRACEFUL_SHUTDOWN_TIMEOUT, (0, date_fns_1.secondsToMilliseconds)(1)),
|
|
118
100
|
secret: process.env.UNLEASH_SECRET || 'super-secret',
|
|
119
101
|
};
|
|
120
102
|
const defaultVersionOption = {
|
|
121
103
|
url: process.env.UNLEASH_VERSION_URL || 'https://version.unleash.run',
|
|
122
|
-
enable:
|
|
104
|
+
enable: (0, env_1.parseEnvVarBoolean)(process.env.CHECK_VERSION, true),
|
|
123
105
|
};
|
|
124
106
|
const defaultAuthentication = {
|
|
125
|
-
enableApiToken:
|
|
107
|
+
enableApiToken: (0, env_1.parseEnvVarBoolean)(process.env.AUTH_ENABLE_API_TOKEN, true),
|
|
126
108
|
type: authTypeFromString(process.env.AUTH_TYPE),
|
|
127
109
|
customAuthHandler: default_custom_auth_deny_all_1.defaultCustomAuthDenyAll,
|
|
128
110
|
createAdminUser: true,
|
|
@@ -130,13 +112,13 @@ const defaultAuthentication = {
|
|
|
130
112
|
};
|
|
131
113
|
const defaultImport = {
|
|
132
114
|
file: process.env.IMPORT_FILE,
|
|
133
|
-
dropBeforeImport:
|
|
134
|
-
keepExisting:
|
|
115
|
+
dropBeforeImport: (0, env_1.parseEnvVarBoolean)(process.env.IMPORT_DROP_BEFORE_IMPORT, false),
|
|
116
|
+
keepExisting: (0, env_1.parseEnvVarBoolean)(process.env.IMPORT_KEEP_EXISTING, false),
|
|
135
117
|
};
|
|
136
118
|
const defaultEmail = {
|
|
137
119
|
host: process.env.EMAIL_HOST,
|
|
138
|
-
secure:
|
|
139
|
-
port:
|
|
120
|
+
secure: (0, env_1.parseEnvVarBoolean)(process.env.EMAIL_SECURE, false),
|
|
121
|
+
port: (0, env_1.parseEnvVarNumber)(process.env.EMAIL_PORT, 587),
|
|
140
122
|
sender: process.env.EMAIL_SENDER || 'noreply@unleash-hosted.com',
|
|
141
123
|
smtpuser: process.env.EMAIL_USER,
|
|
142
124
|
smtppass: process.env.EMAIL_PASSWORD,
|
|
@@ -285,12 +267,18 @@ function createConfig(options) {
|
|
|
285
267
|
else {
|
|
286
268
|
listen = { host: server.host || undefined, port: server.port };
|
|
287
269
|
}
|
|
288
|
-
const secureHeaders = options.secureHeaders ||
|
|
289
|
-
|
|
270
|
+
const secureHeaders = options.secureHeaders ||
|
|
271
|
+
(0, env_1.parseEnvVarBoolean)(process.env.SECURE_HEADERS, false);
|
|
272
|
+
const enableOAS = options.enableOAS || (0, env_1.parseEnvVarBoolean)(process.env.ENABLE_OAS, false);
|
|
290
273
|
const disableLegacyFeaturesApi = options.disableLegacyFeaturesApi ||
|
|
291
|
-
|
|
274
|
+
(0, env_1.parseEnvVarBoolean)(process.env.DISABLE_LEGACY_FEATURES_API, false);
|
|
292
275
|
const additionalCspAllowedDomains = parseCspConfig(options.additionalCspAllowedDomains) ||
|
|
293
276
|
parseCspEnvironmentVariables();
|
|
277
|
+
const inlineSegmentConstraints = typeof options.inlineSegmentConstraints === 'boolean'
|
|
278
|
+
? options.inlineSegmentConstraints
|
|
279
|
+
: true;
|
|
280
|
+
const segmentValuesLimit = (0, env_1.parseEnvVarNumber)(process.env.UNLEASH_SEGMENT_VALUES_LIMIT, segments_1.DEFAULT_SEGMENT_VALUES_LIMIT);
|
|
281
|
+
const strategySegmentsLimit = (0, env_1.parseEnvVarNumber)(process.env.UNLEASH_STRATEGY_SEGMENTS_LIMIT, segments_1.DEFAULT_STRATEGY_SEGMENTS_LIMIT);
|
|
294
282
|
return {
|
|
295
283
|
db,
|
|
296
284
|
session,
|
|
@@ -313,6 +301,9 @@ function createConfig(options) {
|
|
|
313
301
|
eventBus: new events_1.default(),
|
|
314
302
|
environmentEnableOverrides,
|
|
315
303
|
additionalCspAllowedDomains,
|
|
304
|
+
inlineSegmentConstraints,
|
|
305
|
+
segmentValuesLimit,
|
|
306
|
+
strategySegmentsLimit,
|
|
316
307
|
};
|
|
317
308
|
}
|
|
318
309
|
exports.createConfig = createConfig;
|
|
@@ -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,2CAgBwB;AACxB,qCAAgF;AAChF,iFAA0E;AAC1E,4DAAuD;AACvD,uCAAwE;AACxE,oDAAkC;AAClC,wDAIkC;
|
|
1
|
+
{"version":3,"file":"create-config.js","sourceRoot":"","sources":["../../src/lib/create-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { Knex } from 'knex';
|
|
|
3
3
|
import { LogProvider } from '../logger';
|
|
4
4
|
import { IFeatureToggleClient, IFeatureToggleQuery } from '../types/model';
|
|
5
5
|
import { IFeatureToggleClientStore } from '../types/stores/feature-toggle-client-store';
|
|
6
|
-
import { IExperimentalOptions } from '../experimental';
|
|
7
6
|
import EventEmitter from 'events';
|
|
8
7
|
export interface FeaturesTable {
|
|
9
8
|
name: string;
|
|
@@ -18,9 +17,9 @@ export interface FeaturesTable {
|
|
|
18
17
|
export default class FeatureToggleClientStore implements IFeatureToggleClientStore {
|
|
19
18
|
private db;
|
|
20
19
|
private logger;
|
|
21
|
-
private
|
|
20
|
+
private inlineSegmentConstraints;
|
|
22
21
|
private timer;
|
|
23
|
-
constructor(db: Knex, eventBus: EventEmitter, getLogger: LogProvider,
|
|
22
|
+
constructor(db: Knex, eventBus: EventEmitter, getLogger: LogProvider, inlineSegmentConstraints: boolean);
|
|
24
23
|
private getAll;
|
|
25
24
|
private static rowToStrategy;
|
|
26
25
|
private static removeIdsFromStrategies;
|
|
@@ -7,10 +7,10 @@ const metrics_helper_1 = __importDefault(require("../util/metrics-helper"));
|
|
|
7
7
|
const metric_events_1 = require("../metric-events");
|
|
8
8
|
const constants_1 = require("../util/constants");
|
|
9
9
|
class FeatureToggleClientStore {
|
|
10
|
-
constructor(db, eventBus, getLogger,
|
|
10
|
+
constructor(db, eventBus, getLogger, inlineSegmentConstraints) {
|
|
11
11
|
this.db = db;
|
|
12
12
|
this.logger = getLogger('feature-toggle-client-store.ts');
|
|
13
|
-
this.
|
|
13
|
+
this.inlineSegmentConstraints = inlineSegmentConstraints;
|
|
14
14
|
this.timer = (action) => metrics_helper_1.default.wrapTimer(eventBus, metric_events_1.DB_TIME, {
|
|
15
15
|
store: 'feature-toggle',
|
|
16
16
|
action,
|
|
@@ -19,7 +19,6 @@ class FeatureToggleClientStore {
|
|
|
19
19
|
async getAll(featureQuery, archived = false, isAdmin = true) {
|
|
20
20
|
const environment = featureQuery?.environment || constants_1.DEFAULT_ENV;
|
|
21
21
|
const stopTimer = this.timer('getFeatureAdmin');
|
|
22
|
-
const { inlineSegmentConstraints = false } = this.experimental?.segments ?? {};
|
|
23
22
|
let selectColumns = [
|
|
24
23
|
'features.name as name',
|
|
25
24
|
'features.description as description',
|
|
@@ -78,10 +77,10 @@ class FeatureToggleClientStore {
|
|
|
78
77
|
if (this.isUnseenStrategyRow(feature, r)) {
|
|
79
78
|
feature.strategies.push(FeatureToggleClientStore.rowToStrategy(r));
|
|
80
79
|
}
|
|
81
|
-
if (inlineSegmentConstraints && r.segment_id) {
|
|
80
|
+
if (this.inlineSegmentConstraints && r.segment_id) {
|
|
82
81
|
this.addSegmentToStrategy(feature, r);
|
|
83
82
|
}
|
|
84
|
-
else if (!inlineSegmentConstraints && r.segment_id) {
|
|
83
|
+
else if (!this.inlineSegmentConstraints && r.segment_id) {
|
|
85
84
|
this.addSegmentIdsToStrategy(feature, r);
|
|
86
85
|
}
|
|
87
86
|
feature.impressionData = r.impression_data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-toggle-client-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-toggle-client-store.ts"],"names":[],"mappings":";;;;;AACA,4EAAmD;AACnD,oDAA2C;AAQ3C,iDAAgD;
|
|
1
|
+
{"version":3,"file":"feature-toggle-client-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-toggle-client-store.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/db/index.js
CHANGED
|
@@ -55,7 +55,7 @@ const createStores = (config, db) => {
|
|
|
55
55
|
sessionStore: new session_store_1.default(db, eventBus, getLogger),
|
|
56
56
|
userFeedbackStore: new user_feedback_store_1.default(db, eventBus, getLogger),
|
|
57
57
|
featureStrategiesStore: new feature_strategy_store_1.default(db, eventBus, getLogger),
|
|
58
|
-
featureToggleClientStore: new feature_toggle_client_store_1.default(db, eventBus, getLogger, config.
|
|
58
|
+
featureToggleClientStore: new feature_toggle_client_store_1.default(db, eventBus, getLogger, config.inlineSegmentConstraints),
|
|
59
59
|
environmentStore: new environment_store_1.default(db, eventBus, getLogger),
|
|
60
60
|
featureTagStore: new feature_tag_store_1.default(db, eventBus, getLogger),
|
|
61
61
|
featureEnvironmentStore: new feature_environment_store_1.FeatureEnvironmentStore(db, eventBus, getLogger),
|
package/dist/lib/db/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/db/index.ts"],"names":[],"mappings":";;;;;;AAIA,gEAAuC;AACvC,kFAAwD;AACxD,8EAAoD;AACpD,sEAA6C;AAC7C,oFAA0D;AAC1D,4FAAkE;AAClE,gFAAsD;AACtD,oEAA2C;AAC3C,8DAAqC;AACrC,oEAA2C;AAC3C,4DAAmC;AACnC,sEAA4C;AAC5C,gEAAuC;AACvC,uDAAkD;AAClD,oEAA2C;AAC3C,iDAA6C;AAC7C,2DAAsD;AACtD,gFAAsD;AACtD,sFAA4D;AAC5D,gGAAqE;AACrE,4EAAmD;AACnD,4EAAkD;AAClD,2EAAsE;AACtE,uEAAiE;AACjE,4EAAkD;AAClD,8DAAqC;AACrC,oEAA2C;AAEpC,MAAM,YAAY,GAAG,CACxB,MAAsB,EACtB,EAAQ,EACM,EAAE;IAChB,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACvC,MAAM,UAAU,GAAG,IAAI,qBAAU,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAEjD,OAAO;QACH,UAAU;QACV,kBAAkB,EAAE,IAAI,8BAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QACnE,gBAAgB,EAAE,IAAI,4BAAgB,CAAC,EAAE,EAAE,SAAS,CAAC;QACrD,aAAa,EAAE,IAAI,wBAAa,CAAC,EAAE,EAAE,SAAS,CAAC;QAC/C,uBAAuB,EAAE,IAAI,mCAAuB,CAChD,EAAE,EACF,QAAQ,EACR,SAAS,CACZ;QACD,mBAAmB,EAAE,IAAI,+BAAmB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QACrE,oBAAoB,EAAE,IAAI,8CAAoB,CAAC,EAAE,EAAE,SAAS,CAAC;QAC7D,iBAAiB,EAAE,IAAI,6BAAiB,CAAC,EAAE,EAAE,SAAS,CAAC;QACvD,YAAY,EAAE,IAAI,uBAAY,CAAC,EAAE,EAAE,SAAS,CAAC;QAC7C,SAAS,EAAE,IAAI,oBAAS,CAAC,EAAE,EAAE,SAAS,CAAC;QACvC,YAAY,EAAE,IAAI,uBAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QACvD,QAAQ,EAAE,IAAI,mBAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QAC/C,YAAY,EAAE,IAAI,wBAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QACvD,UAAU,EAAE,IAAI,qBAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QACnD,WAAW,EAAE,IAAI,0BAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QACrD,aAAa,EAAE,IAAI,+BAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QACzD,eAAe,EAAE,IAAI,mCAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QAC7D,YAAY,EAAE,IAAI,uBAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QACvD,iBAAiB,EAAE,IAAI,6BAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC;QACjE,sBAAsB,EAAE,IAAI,gCAAoB,CAC5C,EAAE,EACF,QAAQ,EACR,SAAS,CACZ;QACD,wBAAwB,EAAE,IAAI,qCAAwB,CAClD,EAAE,EACF,QAAQ,EACR,SAAS,EACT,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/db/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,8 @@
|
|
|
1
1
|
export interface IExperimentalOptions {
|
|
2
2
|
metricsV2?: IExperimentalToggle;
|
|
3
3
|
clientFeatureMemoize?: IExperimentalToggle;
|
|
4
|
-
segments?: IExperimentalSegments;
|
|
5
4
|
anonymiseEventLog?: boolean;
|
|
6
5
|
}
|
|
7
6
|
export interface IExperimentalToggle {
|
|
8
7
|
enabled: boolean;
|
|
9
8
|
}
|
|
10
|
-
export interface IExperimentalSegments {
|
|
11
|
-
enableSegmentsClientApi: boolean;
|
|
12
|
-
enableSegmentsAdminApi: boolean;
|
|
13
|
-
inlineSegmentConstraints: boolean;
|
|
14
|
-
}
|
|
15
|
-
export declare const experimentalSegmentsConfig: () => IExperimentalSegments;
|
package/dist/lib/experimental.js
CHANGED
|
@@ -1,12 +1,3 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.experimentalSegmentsConfig = void 0;
|
|
4
|
-
const experimentalSegmentsConfig = () => {
|
|
5
|
-
return {
|
|
6
|
-
enableSegmentsAdminApi: true,
|
|
7
|
-
enableSegmentsClientApi: true,
|
|
8
|
-
inlineSegmentConstraints: true,
|
|
9
|
-
};
|
|
10
|
-
};
|
|
11
|
-
exports.experimentalSegmentsConfig = experimentalSegmentsConfig;
|
|
12
3
|
//# sourceMappingURL=experimental.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"experimental.js","sourceRoot":"","sources":["../../src/lib/experimental.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"experimental.js","sourceRoot":"","sources":["../../src/lib/experimental.ts"],"names":[],"mappings":""}
|
|
@@ -1,12 +1,23 @@
|
|
|
1
1
|
import { Request, Response } from 'express';
|
|
2
2
|
import { IUnleashServices } from '../../types/services';
|
|
3
|
-
import { IUnleashConfig } from '../../types/option';
|
|
3
|
+
import { IAuthType, IUIConfig, IUnleashConfig } from '../../types/option';
|
|
4
4
|
import Controller from '../controller';
|
|
5
|
+
import { IVersionHolder } from '../../services/version-service';
|
|
6
|
+
interface IUIConfigResponse extends IUIConfig {
|
|
7
|
+
version: string;
|
|
8
|
+
unleashUrl: string;
|
|
9
|
+
baseUriPath: string;
|
|
10
|
+
authenticationType?: IAuthType;
|
|
11
|
+
versionInfo: IVersionHolder;
|
|
12
|
+
disablePasswordAuth: boolean;
|
|
13
|
+
segmentValuesLimit: number;
|
|
14
|
+
strategySegmentsLimit: number;
|
|
15
|
+
}
|
|
5
16
|
declare class ConfigController extends Controller {
|
|
6
17
|
private versionService;
|
|
7
18
|
private settingService;
|
|
8
19
|
private uiConfig;
|
|
9
20
|
constructor(config: IUnleashConfig, { versionService, settingService, }: Pick<IUnleashServices, 'versionService' | 'settingService'>);
|
|
10
|
-
getUIConfig(req: Request, res: Response): Promise<void>;
|
|
21
|
+
getUIConfig(req: Request, res: Response<IUIConfigResponse>): Promise<void>;
|
|
11
22
|
}
|
|
12
23
|
export default ConfigController;
|
|
@@ -15,10 +15,12 @@ class ConfigController extends controller_1.default {
|
|
|
15
15
|
const authenticationType = config.authentication && config.authentication.type;
|
|
16
16
|
this.uiConfig = {
|
|
17
17
|
...config.ui,
|
|
18
|
-
|
|
18
|
+
version: version_1.default,
|
|
19
19
|
unleashUrl: config.server.unleashUrl,
|
|
20
20
|
baseUriPath: config.server.baseUriPath,
|
|
21
|
-
|
|
21
|
+
authenticationType,
|
|
22
|
+
segmentValuesLimit: config.segmentValuesLimit,
|
|
23
|
+
strategySegmentsLimit: config.strategySegmentsLimit,
|
|
22
24
|
};
|
|
23
25
|
this.get('/', this.getUIConfig);
|
|
24
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/config.ts"],"names":[],"mappings":";;;;;AAEA,+
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/config.ts"],"names":[],"mappings":";;;;;AAEA,+CAA0E;AAC1E,iEAAyC;AACzC,+DAAuC;AAGvC,oFAGmD;AAanD,MAAM,gBAAiB,SAAQ,oBAAU;IAUrC,YACI,MAAsB,EACtB,EACI,cAAc,EACd,cAAc,GAC4C;QAE9D,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,MAAM,kBAAkB,GACpB,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC;QACxD,IAAI,CAAC,QAAQ,GAAG;YACZ,GAAG,MAAM,CAAC,EAAE;YACZ,OAAO,EAAP,iBAAO;YACP,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;YACpC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;YACtC,kBAAkB;YAClB,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;YAC7C,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;SACtD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,WAAW,CACb,GAAY,EACZ,GAAgC;QAEhC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC7B,MAAM,kBAAkB,GACpB,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAqB,oCAAa,CAAC,CAAC;QAErE,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QACzD,MAAM,mBAAmB,GACrB,kBAAkB,EAAE,QAAQ;YAC5B,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,kBAAS,CAAC,IAAI,CAAC;QACtD,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAC9D,CAAC;CACJ;AACD,kBAAe,gBAAgB,CAAC"}
|
|
@@ -8,6 +8,7 @@ const test_config_1 = require("../../../test/config/test-config");
|
|
|
8
8
|
const store_1 = __importDefault(require("../../../test/fixtures/store"));
|
|
9
9
|
const app_1 = __importDefault(require("../../app"));
|
|
10
10
|
const services_1 = require("../../services");
|
|
11
|
+
const segments_1 = require("../../util/segments");
|
|
11
12
|
const uiConfig = {
|
|
12
13
|
headerBackground: 'red',
|
|
13
14
|
slogan: 'hello',
|
|
@@ -43,15 +44,14 @@ beforeEach(async () => {
|
|
|
43
44
|
afterEach(() => {
|
|
44
45
|
destroy();
|
|
45
46
|
});
|
|
46
|
-
test('should get ui config', () => {
|
|
47
|
-
|
|
48
|
-
return request
|
|
47
|
+
test('should get ui config', async () => {
|
|
48
|
+
const { body } = await request
|
|
49
49
|
.get(`${base}/api/admin/ui-config`)
|
|
50
50
|
.expect('Content-Type', /json/)
|
|
51
|
-
.expect(200)
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
51
|
+
.expect(200);
|
|
52
|
+
expect(body.slogan).toEqual('hello');
|
|
53
|
+
expect(body.headerBackground).toEqual('red');
|
|
54
|
+
expect(body.segmentValuesLimit).toEqual(segments_1.DEFAULT_SEGMENT_VALUES_LIMIT);
|
|
55
|
+
expect(body.strategySegmentsLimit).toEqual(segments_1.DEFAULT_STRATEGY_SEGMENTS_LIMIT);
|
|
56
56
|
});
|
|
57
57
|
//# sourceMappingURL=config.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/config.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,kEAAoE;AAEpE,yEAAwD;AACxD,oDAA+B;AAC/B,6CAAgD;
|
|
1
|
+
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/config.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,kEAAoE;AAEpE,yEAAwD;AACxD,oDAA+B;AAC/B,6CAAgD;AAChD,kDAG6B;AAE7B,MAAM,QAAQ,GAAG;IACb,gBAAgB,EAAE,KAAK;IACvB,MAAM,EAAE,OAAO;CAClB,CAAC;AAEF,KAAK,UAAU,QAAQ;IACnB,MAAM,IAAI,GAAG,UAAU,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC;QAC5B,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;QAC7B,EAAE,EAAE,QAAQ;KACf,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,IAAA,eAAY,GAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,IAAA,aAAM,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEnD,OAAO;QACH,IAAI;QACJ,OAAO,EAAE,IAAA,mBAAS,EAAC,GAAG,CAAC;QACvB,OAAO,EAAE,GAAG,EAAE;YACV,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;YAClC,QAAQ,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;YACzC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QACvC,CAAC;KACJ,CAAC;AACN,CAAC;AAED,IAAI,OAAO,CAAC;AACZ,IAAI,IAAI,CAAC;AACT,IAAI,OAAO,CAAC;AAEZ,UAAU,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,KAAK,GAAG,MAAM,QAAQ,EAAE,CAAC;IAC/B,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IACxB,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAClB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,SAAS,CAAC,GAAG,EAAE;IACX,OAAO,EAAE,CAAC;AACd,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;IACpC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO;SACzB,GAAG,CAAC,GAAG,IAAI,sBAAsB,CAAC;SAClC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;IAEjB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,uCAA4B,CAAC,CAAC;IACtE,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,0CAA+B,CAAC,CAAC;AAChF,CAAC,CAAC,CAAC"}
|
|
@@ -17,10 +17,9 @@ class FeatureController extends controller_1.default {
|
|
|
17
17
|
this.featureToggleServiceV2 = featureToggleServiceV2;
|
|
18
18
|
this.segmentService = segmentService;
|
|
19
19
|
this.logger = config.getLogger('client-api/feature.js');
|
|
20
|
+
this.useGlobalSegments = !this.config.inlineSegmentConstraints;
|
|
20
21
|
this.get('/', this.getAll);
|
|
21
22
|
this.get('/:featureName', this.getFeatureToggle);
|
|
22
|
-
this.useGlobalSegments =
|
|
23
|
-
experimental && !experimental?.segments?.inlineSegmentConstraints;
|
|
24
23
|
if (experimental && experimental.clientFeatureMemoize) {
|
|
25
24
|
// @ts-ignore
|
|
26
25
|
this.cache = experimental.clientFeatureMemoize.enabled;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/feature.ts"],"names":[],"mappings":";;;;;AAAA,wDAAgC;AAEhC,+DAAuC;AAKvC,gEAA0D;AAE1D,gFAAuD;AAEvD,oEAA2C;AAC3C,4DAAkE;AAIlE,MAAM,OAAO,GAAG,CAAC,CAAC;AAOlB,MAAqB,iBAAkB,SAAQ,oBAAU;IAarD,YACI,EACI,sBAAsB,EACtB,cAAc,GACoD,EACtE,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QAChC,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"feature.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/feature.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ const controller_1 = __importDefault(require("../controller"));
|
|
|
7
7
|
const feature_1 = __importDefault(require("./feature"));
|
|
8
8
|
const metrics_1 = __importDefault(require("./metrics"));
|
|
9
9
|
const register_1 = __importDefault(require("./register"));
|
|
10
|
-
const segments_1 = require("./segments");
|
|
11
10
|
const apiDef = require('./api-def.json');
|
|
12
11
|
class ClientApi extends controller_1.default {
|
|
13
12
|
constructor(config, services) {
|
|
@@ -16,9 +15,6 @@ class ClientApi extends controller_1.default {
|
|
|
16
15
|
this.use('/features', new feature_1.default(services, config).router);
|
|
17
16
|
this.use('/metrics', new metrics_1.default(services, config).router);
|
|
18
17
|
this.use('/register', new register_1.default(services, config).router);
|
|
19
|
-
if (config.experimental?.segments?.enableSegmentsClientApi) {
|
|
20
|
-
this.use('/segments', new segments_1.SegmentsController(services, config).router);
|
|
21
|
-
}
|
|
22
18
|
}
|
|
23
19
|
index(req, res) {
|
|
24
20
|
res.json(apiDef);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/index.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AACvC,wDAA0C;AAC1C,wDAA0C;AAC1C,0DAA4C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/index.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AACvC,wDAA0C;AAC1C,wDAA0C;AAC1C,0DAA4C;AAI5C,MAAM,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEzC,MAAqB,SAAU,SAAQ,oBAAU;IAC7C,YAAY,MAAsB,EAAE,QAA0B;QAC1D,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACtE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,GAAY,EAAE,GAAa;QAC7B,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;CACJ;AAbD,4BAaC;AAED,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC"}
|
|
@@ -7,7 +7,8 @@ export declare class SegmentService {
|
|
|
7
7
|
private segmentStore;
|
|
8
8
|
private featureStrategiesStore;
|
|
9
9
|
private eventStore;
|
|
10
|
-
|
|
10
|
+
private config;
|
|
11
|
+
constructor({ segmentStore, featureStrategiesStore, eventStore, }: Pick<IUnleashStores, 'segmentStore' | 'featureStrategiesStore' | 'eventStore'>, config: IUnleashConfig);
|
|
11
12
|
get(id: number): Promise<ISegment>;
|
|
12
13
|
getAll(): Promise<ISegment[]>;
|
|
13
14
|
getActive(): Promise<ISegment[]>;
|
|
@@ -20,5 +21,5 @@ export declare class SegmentService {
|
|
|
20
21
|
removeFromStrategy(id: number, strategyId: string): Promise<void>;
|
|
21
22
|
validateName(name: string): Promise<void>;
|
|
22
23
|
private validateStrategySegmentLimit;
|
|
23
|
-
private
|
|
24
|
+
private validateSegmentValuesLimit;
|
|
24
25
|
}
|
|
@@ -8,13 +8,13 @@ const name_exists_error_1 = __importDefault(require("../error/name-exists-error"
|
|
|
8
8
|
const segment_schema_1 = require("./segment-schema");
|
|
9
9
|
const events_1 = require("../types/events");
|
|
10
10
|
const bad_data_error_1 = __importDefault(require("../error/bad-data-error"));
|
|
11
|
-
const segments_1 = require("../util/segments");
|
|
12
11
|
class SegmentService {
|
|
13
|
-
constructor({ segmentStore, featureStrategiesStore, eventStore, },
|
|
12
|
+
constructor({ segmentStore, featureStrategiesStore, eventStore, }, config) {
|
|
14
13
|
this.segmentStore = segmentStore;
|
|
15
14
|
this.featureStrategiesStore = featureStrategiesStore;
|
|
16
15
|
this.eventStore = eventStore;
|
|
17
|
-
this.logger = getLogger('services/segment-service.ts');
|
|
16
|
+
this.logger = config.getLogger('services/segment-service.ts');
|
|
17
|
+
this.config = config;
|
|
18
18
|
}
|
|
19
19
|
async get(id) {
|
|
20
20
|
return this.segmentStore.get(id);
|
|
@@ -35,7 +35,7 @@ class SegmentService {
|
|
|
35
35
|
}
|
|
36
36
|
async create(data, user) {
|
|
37
37
|
const input = await segment_schema_1.segmentSchema.validateAsync(data);
|
|
38
|
-
|
|
38
|
+
this.validateSegmentValuesLimit(input);
|
|
39
39
|
await this.validateName(input.name);
|
|
40
40
|
const segment = await this.segmentStore.create(input, user);
|
|
41
41
|
await this.eventStore.store({
|
|
@@ -46,7 +46,7 @@ class SegmentService {
|
|
|
46
46
|
}
|
|
47
47
|
async update(id, data, user) {
|
|
48
48
|
const input = await segment_schema_1.segmentSchema.validateAsync(data);
|
|
49
|
-
|
|
49
|
+
this.validateSegmentValuesLimit(input);
|
|
50
50
|
const preData = await this.segmentStore.get(id);
|
|
51
51
|
if (preData.name !== input.name) {
|
|
52
52
|
await this.validateName(input.name);
|
|
@@ -86,21 +86,19 @@ class SegmentService {
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
async validateStrategySegmentLimit(strategyId) {
|
|
89
|
-
const
|
|
90
|
-
if (
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
if ((await this.getByStrategy(strategyId)).length >= limit) {
|
|
94
|
-
throw new bad_data_error_1.default(`Strategies may not have more than ${limit} segments`);
|
|
89
|
+
const { strategySegmentsLimit } = this.config;
|
|
90
|
+
if ((await this.getByStrategy(strategyId)).length >=
|
|
91
|
+
strategySegmentsLimit) {
|
|
92
|
+
throw new bad_data_error_1.default(`Strategies may not have more than ${strategySegmentsLimit} segments`);
|
|
95
93
|
}
|
|
96
94
|
}
|
|
97
|
-
|
|
98
|
-
const
|
|
95
|
+
validateSegmentValuesLimit(segment) {
|
|
96
|
+
const { segmentValuesLimit } = this.config;
|
|
99
97
|
const valuesCount = segment.constraints
|
|
100
98
|
.flatMap((constraint) => constraint.values?.length ?? 0)
|
|
101
99
|
.reduce((acc, length) => acc + length, 0);
|
|
102
|
-
if (valuesCount >
|
|
103
|
-
throw new bad_data_error_1.default(`Segments may not have more than ${
|
|
100
|
+
if (valuesCount > segmentValuesLimit) {
|
|
101
|
+
throw new bad_data_error_1.default(`Segments may not have more than ${segmentValuesLimit} values`);
|
|
104
102
|
}
|
|
105
103
|
}
|
|
106
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segment-service.js","sourceRoot":"","sources":["../../../src/lib/services/segment-service.ts"],"names":[],"mappings":";;;;;;AAIA,mFAAyD;AAGzD,qDAAiD;AACjD,4CAIyB;AAGzB,6EAAmD;
|
|
1
|
+
{"version":3,"file":"segment-service.js","sourceRoot":"","sources":["../../../src/lib/services/segment-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,6 +96,7 @@ export interface IUnleashOptions {
|
|
|
96
96
|
eventHook?: EventHook;
|
|
97
97
|
enterpriseVersion?: string;
|
|
98
98
|
disableLegacyFeaturesApi?: boolean;
|
|
99
|
+
inlineSegmentConstraints?: boolean;
|
|
99
100
|
}
|
|
100
101
|
export interface IEmailOption {
|
|
101
102
|
host?: string;
|
|
@@ -164,4 +165,7 @@ export interface IUnleashConfig {
|
|
|
164
165
|
eventBus: EventEmitter;
|
|
165
166
|
disableLegacyFeaturesApi?: boolean;
|
|
166
167
|
environmentEnableOverrides?: string[];
|
|
168
|
+
inlineSegmentConstraints: boolean;
|
|
169
|
+
segmentValuesLimit: number;
|
|
170
|
+
strategySegmentsLimit: number;
|
|
167
171
|
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseEnvVarBoolean = exports.parseEnvVarNumber = void 0;
|
|
4
|
+
function parseEnvVarNumber(envVar, defaultVal) {
|
|
5
|
+
const parsed = Number.parseInt(envVar, 10);
|
|
6
|
+
if (Number.isNaN(parsed)) {
|
|
7
|
+
return defaultVal;
|
|
8
|
+
}
|
|
9
|
+
return parsed;
|
|
10
|
+
}
|
|
11
|
+
exports.parseEnvVarNumber = parseEnvVarNumber;
|
|
12
|
+
function parseEnvVarBoolean(envVar, defaultVal) {
|
|
13
|
+
if (envVar) {
|
|
14
|
+
return envVar === 'true' || envVar === '1' || envVar === 't';
|
|
15
|
+
}
|
|
16
|
+
return defaultVal;
|
|
17
|
+
}
|
|
18
|
+
exports.parseEnvVarBoolean = parseEnvVarBoolean;
|
|
19
|
+
//# sourceMappingURL=env.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../src/lib/util/env.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB,CAAC,MAAc,EAAE,UAAkB;IAChE,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAE3C,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;QACtB,OAAO,UAAU,CAAC;KACrB;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AARD,8CAQC;AAED,SAAgB,kBAAkB,CAC9B,MAAc,EACd,UAAmB;IAEnB,IAAI,MAAM,EAAE;QACR,OAAO,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,CAAC;KAChE;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AATD,gDASC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const env_1 = require("./env");
|
|
4
|
+
test('parseEnvVarNumber', () => {
|
|
5
|
+
expect((0, env_1.parseEnvVarNumber)('', 1)).toEqual(1);
|
|
6
|
+
expect((0, env_1.parseEnvVarNumber)('', 2)).toEqual(2);
|
|
7
|
+
expect((0, env_1.parseEnvVarNumber)(' ', 1)).toEqual(1);
|
|
8
|
+
expect((0, env_1.parseEnvVarNumber)('a', 1)).toEqual(1);
|
|
9
|
+
expect((0, env_1.parseEnvVarNumber)('1', 1)).toEqual(1);
|
|
10
|
+
expect((0, env_1.parseEnvVarNumber)('2', 1)).toEqual(2);
|
|
11
|
+
expect((0, env_1.parseEnvVarNumber)('2e2', 1)).toEqual(2);
|
|
12
|
+
expect((0, env_1.parseEnvVarNumber)('-1', 1)).toEqual(-1);
|
|
13
|
+
});
|
|
14
|
+
test('parseEnvVarBoolean', () => {
|
|
15
|
+
expect((0, env_1.parseEnvVarBoolean)('', true)).toEqual(true);
|
|
16
|
+
expect((0, env_1.parseEnvVarBoolean)('', false)).toEqual(false);
|
|
17
|
+
expect((0, env_1.parseEnvVarBoolean)(' ', false)).toEqual(false);
|
|
18
|
+
expect((0, env_1.parseEnvVarBoolean)('1', false)).toEqual(true);
|
|
19
|
+
expect((0, env_1.parseEnvVarBoolean)('2', false)).toEqual(false);
|
|
20
|
+
expect((0, env_1.parseEnvVarBoolean)('t', false)).toEqual(true);
|
|
21
|
+
expect((0, env_1.parseEnvVarBoolean)('f', false)).toEqual(false);
|
|
22
|
+
expect((0, env_1.parseEnvVarBoolean)('true', false)).toEqual(true);
|
|
23
|
+
expect((0, env_1.parseEnvVarBoolean)('false', false)).toEqual(false);
|
|
24
|
+
expect((0, env_1.parseEnvVarBoolean)('test', false)).toEqual(false);
|
|
25
|
+
});
|
|
26
|
+
//# sourceMappingURL=env.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.test.js","sourceRoot":"","sources":["../../../src/lib/util/env.test.ts"],"names":[],"mappings":";;AAAA,+BAA8D;AAE9D,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC3B,MAAM,CAAC,IAAA,uBAAiB,EAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,IAAA,uBAAiB,EAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7C,MAAM,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7C,MAAM,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7C,MAAM,CAAC,IAAA,uBAAiB,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7C,MAAM,CAAC,IAAA,uBAAiB,EAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,IAAA,uBAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC5B,MAAM,CAAC,IAAA,wBAAkB,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,IAAA,wBAAkB,EAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrD,MAAM,CAAC,IAAA,wBAAkB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,CAAC,IAAA,wBAAkB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,CAAC,IAAA,wBAAkB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,CAAC,IAAA,wBAAkB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,CAAC,IAAA,wBAAkB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,CAAC,IAAA,wBAAkB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,CAAC,IAAA,wBAAkB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,CAAC,IAAA,wBAAkB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const
|
|
2
|
-
export declare const
|
|
1
|
+
export declare const DEFAULT_SEGMENT_VALUES_LIMIT = 100;
|
|
2
|
+
export declare const DEFAULT_STRATEGY_SEGMENTS_LIMIT = 5;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
exports.
|
|
3
|
+
exports.DEFAULT_STRATEGY_SEGMENTS_LIMIT = exports.DEFAULT_SEGMENT_VALUES_LIMIT = void 0;
|
|
4
|
+
exports.DEFAULT_SEGMENT_VALUES_LIMIT = 100;
|
|
5
|
+
exports.DEFAULT_STRATEGY_SEGMENTS_LIMIT = 5;
|
|
6
6
|
//# sourceMappingURL=segments.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/lib/util/segments.ts"],"names":[],"mappings":";;;AAAa,QAAA,
|
|
1
|
+
{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/lib/util/segments.ts"],"names":[],"mappings":";;;AAAa,QAAA,4BAA4B,GAAG,GAAG,CAAC;AACnC,QAAA,+BAA+B,GAAG,CAAC,CAAC"}
|
package/dist/server-dev.js
CHANGED
|
@@ -4,7 +4,6 @@ const server_impl_1 = require("./lib/server-impl");
|
|
|
4
4
|
const create_config_1 = require("./lib/create-config");
|
|
5
5
|
const logger_1 = require("./lib/logger");
|
|
6
6
|
const api_token_1 = require("./lib/types/models/api-token");
|
|
7
|
-
const experimental_1 = require("./lib/experimental");
|
|
8
7
|
process.nextTick(async () => {
|
|
9
8
|
try {
|
|
10
9
|
await (0, server_impl_1.start)((0, create_config_1.createConfig)({
|
|
@@ -33,7 +32,6 @@ process.nextTick(async () => {
|
|
|
33
32
|
},
|
|
34
33
|
experimental: {
|
|
35
34
|
metricsV2: { enabled: true },
|
|
36
|
-
segments: (0, experimental_1.experimentalSegmentsConfig)(),
|
|
37
35
|
anonymiseEventLog: false,
|
|
38
36
|
},
|
|
39
37
|
authentication: {
|
package/dist/server-dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-dev.js","sourceRoot":"","sources":["../src/server-dev.ts"],"names":[],"mappings":";;AAAA,mDAA0C;AAC1C,uDAAmD;AACnD,yCAAwC;AACxC,4DAA4D;
|
|
1
|
+
{"version":3,"file":"server-dev.js","sourceRoot":"","sources":["../src/server-dev.ts"],"names":[],"mappings":";;AAAA,mDAA0C;AAC1C,uDAAmD;AACnD,yCAAwC;AACxC,4DAA4D;AAE5D,OAAO,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;IACxB,IAAI;QACA,MAAM,IAAA,mBAAK,EACP,IAAA,4BAAY,EAAC;YACT,EAAE,EAAE;gBACA,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,SAAS;gBACnB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,SAAS;gBACxD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;gBAC3C,GAAG,EAAE,KAAK;gBACV,eAAe,EAAE,SAAS;aAC7B;YACD,MAAM,EAAE;gBACJ,mBAAmB,EAAE,IAAI;gBACzB,WAAW,EAAE,EAAE;gBACf,uBAAuB;gBACvB,sBAAsB,EAAE,IAAI;gBAC5B,yDAAyD;aAC5D;YACD,QAAQ,EAAE,iBAAQ,CAAC,KAAK;YACxB,SAAS,EAAE,IAAI;YACf,uBAAuB;YACvB,YAAY,EAAE;gBACV,MAAM,EAAE,KAAK;aAChB;YACD,YAAY,EAAE;gBACV,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;gBAC5B,iBAAiB,EAAE,KAAK;aAC3B;YACD,cAAc,EAAE;gBACZ,aAAa,EAAE;oBACX;wBACI,WAAW,EAAE,GAAG;wBAChB,OAAO,EAAE,GAAG;wBACZ,MAAM,EAAE,sCAAsC;wBAC9C,IAAI,EAAE,wBAAY,CAAC,KAAK;wBACxB,QAAQ,EAAE,WAAW;qBACxB;iBACJ;aACJ;SACJ,CAAC,CACL,CAAC;KACL;IAAC,OAAO,KAAK,EAAE;QACZ,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;YAC7B,sCAAsC;YACtC,OAAO,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;SACpE;aAAM;YACH,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,IAAI,EAAE,CAAC;SAClB;KACJ;AACL,CAAC,EAAE,CAAC,CAAC,CAAC"}
|
|
@@ -8,7 +8,6 @@ const deepmerge_1 = __importDefault(require("deepmerge"));
|
|
|
8
8
|
const option_1 = require("../../lib/types/option");
|
|
9
9
|
const no_logger_1 = __importDefault(require("../fixtures/no-logger"));
|
|
10
10
|
const create_config_1 = require("../../lib/create-config");
|
|
11
|
-
const experimental_1 = require("../../lib/experimental");
|
|
12
11
|
function mergeAll(objects) {
|
|
13
12
|
return deepmerge_1.default.all(objects.filter((i) => i));
|
|
14
13
|
}
|
|
@@ -18,7 +17,6 @@ function createTestConfig(config) {
|
|
|
18
17
|
authentication: { type: option_1.IAuthType.NONE, createAdminUser: false },
|
|
19
18
|
server: { secret: 'really-secret' },
|
|
20
19
|
session: { db: false },
|
|
21
|
-
experimental: { segments: (0, experimental_1.experimentalSegmentsConfig)() },
|
|
22
20
|
versionCheck: { enable: false },
|
|
23
21
|
enableOAS: true,
|
|
24
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-config.js","sourceRoot":"","sources":["../../../src/test/config/test-config.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA8B;AAC9B,mDAIgC;AAChC,sEAA8C;
|
|
1
|
+
{"version":3,"file":"test-config.js","sourceRoot":"","sources":["../../../src/test/config/test-config.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA8B;AAC9B,mDAIgC;AAChC,sEAA8C;AAC9C,2DAAuD;AAEvD,SAAS,QAAQ,CAAI,OAAqB;IACtC,OAAO,mBAAK,CAAC,GAAG,CAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAwB;IACrD,MAAM,UAAU,GAAoB;QAChC,SAAS,EAAT,mBAAS;QACT,cAAc,EAAE,EAAE,IAAI,EAAE,kBAAS,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE;QAChE,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;QACnC,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;QACtB,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;QAC/B,SAAS,EAAE,IAAI;KAClB,CAAC;IACF,MAAM,OAAO,GAAG,QAAQ,CAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,OAAO,IAAA,4BAAY,EAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AAXD,4CAWC"}
|
|
@@ -67,19 +67,9 @@ const createTestSegments = async () => {
|
|
|
67
67
|
await addSegmentToStrategy(segment2.id, feature2.strategies[0].id);
|
|
68
68
|
};
|
|
69
69
|
beforeAll(async () => {
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
enableSegmentsClientApi: true,
|
|
74
|
-
inlineSegmentConstraints: false,
|
|
75
|
-
},
|
|
76
|
-
};
|
|
77
|
-
db = await (0, database_init_1.default)('global_segments', no_logger_1.default, {
|
|
78
|
-
experimental: experimentalConfig,
|
|
79
|
-
});
|
|
80
|
-
app = await (0, test_helper_1.setupAppWithCustomConfig)(db.stores, {
|
|
81
|
-
experimental: experimentalConfig,
|
|
82
|
-
});
|
|
70
|
+
const config = { inlineSegmentConstraints: false };
|
|
71
|
+
db = await (0, database_init_1.default)('global_segments', no_logger_1.default, config);
|
|
72
|
+
app = await (0, test_helper_1.setupAppWithCustomConfig)(db.stores, config);
|
|
83
73
|
});
|
|
84
74
|
afterAll(async () => {
|
|
85
75
|
await app.destroy();
|
|
@@ -104,6 +94,7 @@ test('should send all segments that are in use by feature', async () => {
|
|
|
104
94
|
await createTestSegments();
|
|
105
95
|
const clientFeatures = await fetchClientResponse();
|
|
106
96
|
const globalSegments = clientFeatures.segments;
|
|
97
|
+
expect(globalSegments).toHaveLength(2);
|
|
107
98
|
const globalSegmentIds = globalSegments.map((segment) => segment.id);
|
|
108
99
|
const allSegmentIds = clientFeatures.features
|
|
109
100
|
.map((feat) => feat.strategies.map((strategy) => strategy.segments))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.segment.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/client/global.segment.e2e.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"global.segment.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/client/global.segment.e2e.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const database_init_1 = __importDefault(require("../../helpers/database-init"));
|
|
7
7
|
const no_logger_1 = __importDefault(require("../../../fixtures/no-logger"));
|
|
8
8
|
const test_helper_1 = require("../../helpers/test-helper");
|
|
9
|
-
const collect_ids_1 = require("../../../../lib/util/collect-ids");
|
|
10
9
|
const random_id_1 = require("../../../../lib/util/random-id");
|
|
11
10
|
const segments_1 = require("../../../../lib/util/segments");
|
|
12
11
|
let db;
|
|
@@ -34,12 +33,6 @@ const fetchGlobalSegments = () => {
|
|
|
34
33
|
.expect(200)
|
|
35
34
|
.then((res) => res.body.segments);
|
|
36
35
|
};
|
|
37
|
-
const fetchClientSegmentsActive = () => {
|
|
38
|
-
return app.request
|
|
39
|
-
.get('/api/client/segments/active')
|
|
40
|
-
.expect(200)
|
|
41
|
-
.then((res) => res.body.segments);
|
|
42
|
-
};
|
|
43
36
|
const createSegment = (postData) => {
|
|
44
37
|
const user = { email: 'test@example.com' };
|
|
45
38
|
return app.services.segmentService.create(postData, user);
|
|
@@ -110,40 +103,22 @@ test('should add segments to features as constraints', async () => {
|
|
|
110
103
|
expect(clientValues.length).toEqual(5 * 6 * 3);
|
|
111
104
|
expect(uniqueValues.length).toEqual(3);
|
|
112
105
|
});
|
|
113
|
-
test('should list active segments', async () => {
|
|
114
|
-
const constraints = mockConstraints();
|
|
115
|
-
await createSegment({ name: 'S1', constraints });
|
|
116
|
-
await createSegment({ name: 'S2', constraints });
|
|
117
|
-
await createSegment({ name: 'S3', constraints });
|
|
118
|
-
await createFeatureToggle(mockFeatureToggle());
|
|
119
|
-
await createFeatureToggle(mockFeatureToggle());
|
|
120
|
-
await createFeatureToggle(mockFeatureToggle());
|
|
121
|
-
const [feature1, feature2] = await fetchFeatures();
|
|
122
|
-
const [segment1, segment2] = await fetchSegments();
|
|
123
|
-
await addSegmentToStrategy(segment1.id, feature1.strategies[0].id);
|
|
124
|
-
await addSegmentToStrategy(segment2.id, feature1.strategies[0].id);
|
|
125
|
-
await addSegmentToStrategy(segment2.id, feature2.strategies[0].id);
|
|
126
|
-
const clientSegments = await fetchClientSegmentsActive();
|
|
127
|
-
expect((0, collect_ids_1.collectIds)(clientSegments)).toEqual((0, collect_ids_1.collectIds)([segment1, segment2]));
|
|
128
|
-
});
|
|
129
106
|
test('should validate segment constraint values limit', async () => {
|
|
130
|
-
const limit = segments_1.SEGMENT_VALUES_LIMIT;
|
|
131
107
|
const constraints = [
|
|
132
108
|
{
|
|
133
109
|
contextName: (0, random_id_1.randomId)(),
|
|
134
110
|
operator: 'IN',
|
|
135
|
-
values: mockConstraintValues(
|
|
111
|
+
values: mockConstraintValues(segments_1.DEFAULT_SEGMENT_VALUES_LIMIT + 1),
|
|
136
112
|
},
|
|
137
113
|
];
|
|
138
|
-
await expect(createSegment({ name: (0, random_id_1.randomId)(), constraints })).rejects.toThrow(`Segments may not have more than ${
|
|
114
|
+
await expect(createSegment({ name: (0, random_id_1.randomId)(), constraints })).rejects.toThrow(`Segments may not have more than ${segments_1.DEFAULT_SEGMENT_VALUES_LIMIT} values`);
|
|
139
115
|
});
|
|
140
116
|
test('should validate segment constraint values limit with multiple constraints', async () => {
|
|
141
|
-
const limit = segments_1.SEGMENT_VALUES_LIMIT;
|
|
142
117
|
const constraints = [
|
|
143
118
|
{
|
|
144
119
|
contextName: (0, random_id_1.randomId)(),
|
|
145
120
|
operator: 'IN',
|
|
146
|
-
values: mockConstraintValues(
|
|
121
|
+
values: mockConstraintValues(segments_1.DEFAULT_SEGMENT_VALUES_LIMIT),
|
|
147
122
|
},
|
|
148
123
|
{
|
|
149
124
|
contextName: (0, random_id_1.randomId)(),
|
|
@@ -151,10 +126,9 @@ test('should validate segment constraint values limit with multiple constraints'
|
|
|
151
126
|
values: mockConstraintValues(1),
|
|
152
127
|
},
|
|
153
128
|
];
|
|
154
|
-
await expect(createSegment({ name: (0, random_id_1.randomId)(), constraints })).rejects.toThrow(`Segments may not have more than ${
|
|
129
|
+
await expect(createSegment({ name: (0, random_id_1.randomId)(), constraints })).rejects.toThrow(`Segments may not have more than ${segments_1.DEFAULT_SEGMENT_VALUES_LIMIT} values`);
|
|
155
130
|
});
|
|
156
131
|
test('should validate feature strategy segment limit', async () => {
|
|
157
|
-
const limit = segments_1.STRATEGY_SEGMENTS_LIMIT;
|
|
158
132
|
await createSegment({ name: 'S1', constraints: [] });
|
|
159
133
|
await createSegment({ name: 'S2', constraints: [] });
|
|
160
134
|
await createSegment({ name: 'S3', constraints: [] });
|
|
@@ -169,7 +143,7 @@ test('should validate feature strategy segment limit', async () => {
|
|
|
169
143
|
await addSegmentToStrategy(segments[2].id, feature1.strategies[0].id);
|
|
170
144
|
await addSegmentToStrategy(segments[3].id, feature1.strategies[0].id);
|
|
171
145
|
await addSegmentToStrategy(segments[4].id, feature1.strategies[0].id);
|
|
172
|
-
await expect(addSegmentToStrategy(segments[5].id, feature1.strategies[0].id)).rejects.toThrow(`Strategies may not have more than ${
|
|
146
|
+
await expect(addSegmentToStrategy(segments[5].id, feature1.strategies[0].id)).rejects.toThrow(`Strategies may not have more than ${segments_1.DEFAULT_STRATEGY_SEGMENTS_LIMIT} segments`);
|
|
173
147
|
});
|
|
174
148
|
test('should not return segments in base of toggle response if inline is enabled', async () => {
|
|
175
149
|
const constraints = mockConstraints();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segment.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/client/segment.e2e.test.ts"],"names":[],"mappings":";;;;;AAAA,gFAA8D;AAC9D,4EAAoD;AACpD,2DAAmE;
|
|
1
|
+
{"version":3,"file":"segment.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/client/segment.e2e.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "unleash-server",
|
|
3
3
|
"description": "Unleash is an enterprise ready feature toggles service. It provides different strategies for handling feature toggles.",
|
|
4
|
-
"version": "4.13.0-beta.
|
|
4
|
+
"version": "4.13.0-beta.1",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"unleash",
|
|
7
7
|
"feature toggle",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"build:watch": "tsc -w",
|
|
37
37
|
"prebuild": "yarn run clean",
|
|
38
38
|
"build": "yarn run copy-templates && tsc --pretty",
|
|
39
|
-
"prepare": "yarn run build",
|
|
39
|
+
"prepare": "node scripts/husky-install && yarn run build",
|
|
40
40
|
"test": "NODE_ENV=test PORT=4243 jest",
|
|
41
41
|
"test:unit": "NODE_ENV=test PORT=4243 jest --testPathIgnorePatterns=src/test/e2e/**",
|
|
42
42
|
"test:docker": "./scripts/docker-postgres.sh",
|
|
@@ -117,7 +117,7 @@
|
|
|
117
117
|
"stoppable": "^1.1.0",
|
|
118
118
|
"type-is": "^1.6.18",
|
|
119
119
|
"@unleash/express-openapi": "^0.2.0",
|
|
120
|
-
"unleash-frontend": "4.12.
|
|
120
|
+
"unleash-frontend": "4.12.3",
|
|
121
121
|
"uuid": "^8.3.2",
|
|
122
122
|
"semver": "^7.3.5"
|
|
123
123
|
},
|
|
@@ -180,18 +180,13 @@
|
|
|
180
180
|
"json-schema": "^0.4.0"
|
|
181
181
|
},
|
|
182
182
|
"lint-staged": {
|
|
183
|
-
"*.js": [
|
|
183
|
+
"*.{js,ts}": [
|
|
184
184
|
"eslint --fix"
|
|
185
185
|
],
|
|
186
|
-
"*.{json,
|
|
186
|
+
"*.{json,yaml,md}": [
|
|
187
187
|
"prettier --write"
|
|
188
188
|
]
|
|
189
189
|
},
|
|
190
|
-
"husky": {
|
|
191
|
-
"hooks": {
|
|
192
|
-
"pre-commit": "lint-staged"
|
|
193
|
-
}
|
|
194
|
-
},
|
|
195
190
|
"prettier": {
|
|
196
191
|
"proseWrap": "never",
|
|
197
192
|
"singleQuote": true,
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { Response } from 'express';
|
|
2
|
-
import Controller from '../controller';
|
|
3
|
-
import { IUnleashConfig } from '../../types/option';
|
|
4
|
-
import { IUnleashServices } from '../../types';
|
|
5
|
-
import { IAuthRequest } from '../unleash-types';
|
|
6
|
-
export declare class SegmentsController extends Controller {
|
|
7
|
-
private logger;
|
|
8
|
-
private segmentService;
|
|
9
|
-
constructor({ segmentService }: Pick<IUnleashServices, 'segmentService'>, config: IUnleashConfig);
|
|
10
|
-
getActive(req: IAuthRequest, res: Response): Promise<void>;
|
|
11
|
-
}
|
|
@@ -1,21 +0,0 @@
|
|
|
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.SegmentsController = void 0;
|
|
7
|
-
const controller_1 = __importDefault(require("../controller"));
|
|
8
|
-
class SegmentsController extends controller_1.default {
|
|
9
|
-
constructor({ segmentService }, config) {
|
|
10
|
-
super(config);
|
|
11
|
-
this.logger = config.getLogger('/client-api/segments.ts');
|
|
12
|
-
this.segmentService = segmentService;
|
|
13
|
-
this.get('/active', this.getActive);
|
|
14
|
-
}
|
|
15
|
-
async getActive(req, res) {
|
|
16
|
-
const segments = await this.segmentService.getActive();
|
|
17
|
-
res.json({ segments });
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
exports.SegmentsController = SegmentsController;
|
|
21
|
-
//# sourceMappingURL=segments.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/segments.ts"],"names":[],"mappings":";;;;;;AACA,+DAAuC;AAOvC,MAAa,kBAAmB,SAAQ,oBAAU;IAK9C,YACI,EAAE,cAAc,EAA4C,EAC5D,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;QAC1D,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QAErC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAiB,EAAE,GAAa;QAC5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;QACvD,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3B,CAAC;CACJ;AApBD,gDAoBC"}
|