unleash-server 4.2.0-2 → 4.2.0-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (160) hide show
  1. package/README.md +4 -1
  2. package/dist/lib/addons/datadog-definition.js +7 -0
  3. package/dist/lib/addons/datadog-definition.js.map +1 -1
  4. package/dist/lib/addons/datadog.d.ts +5 -0
  5. package/dist/lib/addons/datadog.js +53 -0
  6. package/dist/lib/addons/datadog.js.map +1 -1
  7. package/dist/lib/addons/datadog.test.js +26 -1
  8. package/dist/lib/addons/datadog.test.js.map +1 -1
  9. package/dist/lib/addons/slack-definition.js +7 -0
  10. package/dist/lib/addons/slack-definition.js.map +1 -1
  11. package/dist/lib/addons/slack.d.ts +5 -0
  12. package/dist/lib/addons/slack.js +53 -0
  13. package/dist/lib/addons/slack.js.map +1 -1
  14. package/dist/lib/addons/slack.test.js +25 -0
  15. package/dist/lib/addons/slack.test.js.map +1 -1
  16. package/dist/lib/addons/teams-definition.js +7 -0
  17. package/dist/lib/addons/teams-definition.js.map +1 -1
  18. package/dist/lib/addons/teams.d.ts +5 -0
  19. package/dist/lib/addons/teams.js +53 -0
  20. package/dist/lib/addons/teams.js.map +1 -1
  21. package/dist/lib/addons/teams.test.js +25 -0
  22. package/dist/lib/addons/teams.test.js.map +1 -1
  23. package/dist/lib/addons/webhook-definition.js +8 -0
  24. package/dist/lib/addons/webhook-definition.js.map +1 -1
  25. package/dist/lib/app.js +3 -2
  26. package/dist/lib/app.js.map +1 -1
  27. package/dist/lib/create-config.js +25 -3
  28. package/dist/lib/create-config.js.map +1 -1
  29. package/dist/{test/e2e/api/admin/project/feature.strategy.e2e.test.d.ts → lib/create-config.test.d.ts} +0 -0
  30. package/dist/lib/create-config.test.js +57 -0
  31. package/dist/lib/create-config.test.js.map +1 -0
  32. package/dist/lib/db/client-instance-store.js +5 -2
  33. package/dist/lib/db/client-instance-store.js.map +1 -1
  34. package/dist/lib/db/client-metrics-store-v2.d.ts +19 -0
  35. package/dist/lib/db/client-metrics-store-v2.js +126 -0
  36. package/dist/lib/db/client-metrics-store-v2.js.map +1 -0
  37. package/dist/lib/db/context-field-store.d.ts +5 -5
  38. package/dist/lib/db/context-field-store.js +2 -7
  39. package/dist/lib/db/context-field-store.js.map +1 -1
  40. package/dist/lib/db/feature-environment-store.d.ts +1 -0
  41. package/dist/lib/db/feature-environment-store.js +13 -1
  42. package/dist/lib/db/feature-environment-store.js.map +1 -1
  43. package/dist/lib/db/feature-strategy-store.d.ts +1 -0
  44. package/dist/lib/db/feature-strategy-store.js +13 -1
  45. package/dist/lib/db/feature-strategy-store.js.map +1 -1
  46. package/dist/lib/db/feature-toggle-client-store.js +5 -7
  47. package/dist/lib/db/feature-toggle-client-store.js.map +1 -1
  48. package/dist/lib/db/index.js +2 -0
  49. package/dist/lib/db/index.js.map +1 -1
  50. package/dist/lib/middleware/demo-authentication.d.ts +2 -1
  51. package/dist/lib/middleware/demo-authentication.js +33 -10
  52. package/dist/lib/middleware/demo-authentication.js.map +1 -1
  53. package/dist/lib/routes/admin-api/client-metrics.d.ts +12 -0
  54. package/dist/lib/routes/admin-api/client-metrics.js +35 -0
  55. package/dist/lib/routes/admin-api/client-metrics.js.map +1 -0
  56. package/dist/lib/routes/admin-api/index.js +2 -0
  57. package/dist/lib/routes/admin-api/index.js.map +1 -1
  58. package/dist/lib/routes/admin-api/project/features.d.ts +5 -1
  59. package/dist/lib/routes/admin-api/project/features.js +12 -6
  60. package/dist/lib/routes/admin-api/project/features.js.map +1 -1
  61. package/dist/lib/routes/client-api/metrics.d.ts +5 -1
  62. package/dist/lib/routes/client-api/metrics.js +22 -5
  63. package/dist/lib/routes/client-api/metrics.js.map +1 -1
  64. package/dist/lib/routes/client-api/metrics.test.js +25 -2
  65. package/dist/lib/routes/client-api/metrics.test.js.map +1 -1
  66. package/dist/lib/routes/client-api/register.d.ts +4 -2
  67. package/dist/lib/routes/client-api/register.js +15 -2
  68. package/dist/lib/routes/client-api/register.js.map +1 -1
  69. package/dist/lib/server-impl.js +1 -0
  70. package/dist/lib/server-impl.js.map +1 -1
  71. package/dist/lib/services/access-service.js +4 -2
  72. package/dist/lib/services/access-service.js.map +1 -1
  73. package/dist/lib/services/client-metrics/client-metrics-service-v2.d.ts +16 -0
  74. package/dist/lib/services/client-metrics/client-metrics-service-v2.js +68 -0
  75. package/dist/lib/services/client-metrics/client-metrics-service-v2.js.map +1 -0
  76. package/dist/lib/services/client-metrics/index.d.ts +0 -1
  77. package/dist/lib/services/client-metrics/index.js.map +1 -1
  78. package/dist/lib/services/client-metrics/register-schema.js +1 -0
  79. package/dist/lib/services/client-metrics/register-schema.js.map +1 -1
  80. package/dist/lib/services/event-service.js.map +1 -1
  81. package/dist/lib/services/feature-toggle-service-v2.d.ts +11 -4
  82. package/dist/lib/services/feature-toggle-service-v2.js +58 -12
  83. package/dist/lib/services/feature-toggle-service-v2.js.map +1 -1
  84. package/dist/lib/services/index.js +3 -0
  85. package/dist/lib/services/index.js.map +1 -1
  86. package/dist/lib/services/project-service.js +1 -0
  87. package/dist/lib/services/project-service.js.map +1 -1
  88. package/dist/lib/services/user-service.js +2 -2
  89. package/dist/lib/services/user-service.js.map +1 -1
  90. package/dist/lib/types/model.d.ts +2 -1
  91. package/dist/lib/types/model.js.map +1 -1
  92. package/dist/lib/types/models/metrics.d.ts +11 -0
  93. package/dist/lib/types/models/metrics.js +3 -0
  94. package/dist/lib/types/models/metrics.js.map +1 -0
  95. package/dist/lib/types/option.d.ts +16 -1
  96. package/dist/lib/types/services.d.ts +2 -0
  97. package/dist/lib/types/stores/client-instance-store.d.ts +1 -0
  98. package/dist/lib/types/stores/client-metrics-store-v2.d.ts +17 -0
  99. package/dist/lib/types/stores/client-metrics-store-v2.js +3 -0
  100. package/dist/lib/types/stores/client-metrics-store-v2.js.map +1 -0
  101. package/dist/lib/types/stores/feature-environment-store.d.ts +1 -0
  102. package/dist/lib/types/stores/feature-strategies-store.d.ts +1 -0
  103. package/dist/lib/types/stores.d.ts +2 -0
  104. package/dist/migrations/20211004104917-client-metrics-env.d.ts +2 -0
  105. package/dist/migrations/20211004104917-client-metrics-env.js +22 -0
  106. package/dist/migrations/20211004104917-client-metrics-env.js.map +1 -0
  107. package/dist/migrations/20211011094226-add-environment-to-client-instances.d.ts +5 -0
  108. package/dist/migrations/20211011094226-add-environment-to-client-instances.js +21 -0
  109. package/dist/migrations/20211011094226-add-environment-to-client-instances.js.map +1 -0
  110. package/dist/migrations/20211013093114-feature-strategies-parameters-not-null.d.ts +2 -0
  111. package/dist/migrations/20211013093114-feature-strategies-parameters-not-null.js +12 -0
  112. package/dist/migrations/20211013093114-feature-strategies-parameters-not-null.js.map +1 -0
  113. package/dist/server-dev.js +5 -0
  114. package/dist/server-dev.js.map +1 -1
  115. package/dist/test/e2e/api/admin/client-metrics.e2e.test.d.ts +1 -0
  116. package/dist/test/e2e/api/admin/client-metrics.e2e.test.js +219 -0
  117. package/dist/test/e2e/api/admin/client-metrics.e2e.test.js.map +1 -0
  118. package/dist/test/e2e/api/admin/context.e2e.test.js +23 -0
  119. package/dist/test/e2e/api/admin/context.e2e.test.js.map +1 -1
  120. package/dist/test/e2e/api/admin/project/features.e2e.test.d.ts +1 -0
  121. package/dist/test/e2e/api/admin/project/{feature.strategy.e2e.test.js → features.e2e.test.js} +321 -1
  122. package/dist/test/e2e/api/admin/project/features.e2e.test.js.map +1 -0
  123. package/dist/test/e2e/api/admin/project/project.health.e2e.test.js +74 -0
  124. package/dist/test/e2e/api/admin/project/project.health.e2e.test.js.map +1 -1
  125. package/dist/test/e2e/api/client/feature.e2e.test.js +11 -12
  126. package/dist/test/e2e/api/client/feature.e2e.test.js.map +1 -1
  127. package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js +1 -1
  128. package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js.map +1 -1
  129. package/dist/test/e2e/api/client/metrics.e2e.test.js +2 -5
  130. package/dist/test/e2e/api/client/metrics.e2e.test.js.map +1 -1
  131. package/dist/test/e2e/api/client/metricsV2.e2e.test.d.ts +1 -0
  132. package/dist/test/e2e/api/client/metricsV2.e2e.test.js +95 -0
  133. package/dist/test/e2e/api/client/metricsV2.e2e.test.js.map +1 -0
  134. package/dist/test/e2e/helpers/test-helper.d.ts +1 -1
  135. package/dist/test/e2e/helpers/test-helper.js +4 -5
  136. package/dist/test/e2e/helpers/test-helper.js.map +1 -1
  137. package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js +1 -1
  138. package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js.map +1 -1
  139. package/dist/test/e2e/services/user-service.e2e.test.js +12 -0
  140. package/dist/test/e2e/services/user-service.e2e.test.js.map +1 -1
  141. package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.d.ts +1 -0
  142. package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js +338 -0
  143. package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js.map +1 -0
  144. package/dist/test/e2e/stores/feature-strategies-store.e2e.test.d.ts +1 -0
  145. package/dist/test/e2e/stores/feature-strategies-store.e2e.test.js +53 -0
  146. package/dist/test/e2e/stores/feature-strategies-store.e2e.test.js.map +1 -0
  147. package/dist/test/fixtures/fake-client-metrics-store-v2.d.ts +20 -0
  148. package/dist/test/fixtures/fake-client-metrics-store-v2.js +52 -0
  149. package/dist/test/fixtures/fake-client-metrics-store-v2.js.map +1 -0
  150. package/dist/test/fixtures/fake-feature-environment-store.d.ts +1 -0
  151. package/dist/test/fixtures/fake-feature-environment-store.js +7 -0
  152. package/dist/test/fixtures/fake-feature-environment-store.js.map +1 -1
  153. package/dist/test/fixtures/fake-feature-strategies-store.d.ts +1 -0
  154. package/dist/test/fixtures/fake-feature-strategies-store.js +9 -0
  155. package/dist/test/fixtures/fake-feature-strategies-store.js.map +1 -1
  156. package/dist/test/fixtures/store.js +2 -0
  157. package/dist/test/fixtures/store.js.map +1 -1
  158. package/package.json +13 -12
  159. package/CHANGELOG.md +0 -920
  160. package/dist/test/e2e/api/admin/project/feature.strategy.e2e.test.js.map +0 -1
@@ -11,7 +11,7 @@ export interface IStrategyConfig {
11
11
  id?: string;
12
12
  name: string;
13
13
  constraints: IConstraint[];
14
- parameters: Object;
14
+ parameters: object;
15
15
  sortOrder?: number;
16
16
  }
17
17
  export interface IFeatureStrategy {
@@ -222,6 +222,7 @@ export interface IClientApp {
222
222
  appName: string;
223
223
  instanceId: string;
224
224
  clientIp?: string;
225
+ environment?: string;
225
226
  seenToggles?: string[];
226
227
  metricsCount?: number;
227
228
  strategies?: string[] | Record<string, string>[];
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/lib/types/model.ts"],"names":[],"mappings":";;;AAwOA,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,qCAAmB,CAAA;AACvB,CAAC,EAHW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAGzB;AAED,IAAY,QAOX;AAPD,WAAY,QAAQ;IAChB,wDAAwD;IACxD,2BAAe,CAAA;IACf,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,2BAAe,CAAA;IACf,6BAAiB,CAAA;AACrB,CAAC,EAPW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAOnB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,yBAAa,CAAA;IACb,+BAAmB,CAAA;AACvB,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/lib/types/model.ts"],"names":[],"mappings":";;;AAyOA,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,qCAAmB,CAAA;AACvB,CAAC,EAHW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAGzB;AAED,IAAY,QAOX;AAPD,WAAY,QAAQ;IAChB,wDAAwD;IACxD,2BAAe,CAAA;IACf,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,2BAAe,CAAA;IACf,6BAAiB,CAAA;AACrB,CAAC,EAPW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAOnB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,yBAAa,CAAA;IACb,+BAAmB,CAAA;AACvB,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB"}
@@ -0,0 +1,11 @@
1
+ export interface GroupedClientMetrics {
2
+ environment: string;
3
+ timestamp: Date;
4
+ yes: number;
5
+ no: number;
6
+ }
7
+ export interface ToggleMetricsSummary {
8
+ featureName: string;
9
+ lastHourUsage: GroupedClientMetrics[];
10
+ seenApplications: string[];
11
+ }
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=metrics.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../src/lib/types/models/metrics.ts"],"names":[],"mappings":""}
@@ -104,6 +104,21 @@ export interface IListeningHost {
104
104
  host?: string;
105
105
  port: number;
106
106
  }
107
+ export interface IUIConfig {
108
+ slogan?: string;
109
+ name?: string;
110
+ flags?: {
111
+ [key: string]: boolean;
112
+ };
113
+ links?: [
114
+ {
115
+ value: string;
116
+ icon?: string;
117
+ href: string;
118
+ title: string;
119
+ }
120
+ ];
121
+ }
107
122
  export interface IUnleashConfig {
108
123
  db: IDBOption;
109
124
  session: ISessionOption;
@@ -112,7 +127,7 @@ export interface IUnleashConfig {
112
127
  listen: IListeningHost | IListeningPipe;
113
128
  versionCheck: IVersionOption;
114
129
  authentication: IAuthOption;
115
- ui: object;
130
+ ui: IUIConfig;
116
131
  import: IImportOption;
117
132
  experimental: {
118
133
  [key: string]: object;
@@ -22,11 +22,13 @@ import FeatureToggleServiceV2 from '../services/feature-toggle-service-v2';
22
22
  import EnvironmentService from '../services/environment-service';
23
23
  import FeatureTagService from '../services/feature-tag-service';
24
24
  import ProjectHealthService from '../services/project-health-service';
25
+ import ClientMetricsServiceV2 from '../services/client-metrics/client-metrics-service-v2';
25
26
  export interface IUnleashServices {
26
27
  accessService: AccessService;
27
28
  addonService: AddonService;
28
29
  apiTokenService: ApiTokenService;
29
30
  clientMetricsService: ClientMetricsService;
31
+ clientMetricsServiceV2: ClientMetricsServiceV2;
30
32
  contextService: ContextService;
31
33
  emailService: EmailService;
32
34
  environmentService: EnvironmentService;
@@ -8,6 +8,7 @@ export interface INewClientInstance {
8
8
  sdkVersion?: string;
9
9
  clientIp?: string;
10
10
  lastSeen?: Date;
11
+ environment?: string;
11
12
  }
12
13
  export interface IClientInstanceStore extends Store<IClientInstance, Pick<INewClientInstance, 'appName' | 'instanceId'>> {
13
14
  bulkUpsert(instances: INewClientInstance[]): Promise<void>;
@@ -0,0 +1,17 @@
1
+ import { Store } from './store';
2
+ export interface IClientMetricsEnvKey {
3
+ featureName: string;
4
+ appName: string;
5
+ environment: string;
6
+ timestamp: Date;
7
+ }
8
+ export interface IClientMetricsEnv extends IClientMetricsEnvKey {
9
+ yes: number;
10
+ no: number;
11
+ }
12
+ export interface IClientMetricsStoreV2 extends Store<IClientMetricsEnv, IClientMetricsEnvKey> {
13
+ batchInsertMetrics(metrics: IClientMetricsEnv[]): Promise<void>;
14
+ getMetricsForFeatureToggle(featureName: string, hoursBack?: number): Promise<IClientMetricsEnv[]>;
15
+ getSeenAppsForFeatureToggle(featureName: string, hoursBack?: number): Promise<string[]>;
16
+ clearMetrics(hoursAgo: number): Promise<void>;
17
+ }
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=client-metrics-store-v2.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client-metrics-store-v2.js","sourceRoot":"","sources":["../../../../src/lib/types/stores/client-metrics-store-v2.ts"],"names":[],"mappings":""}
@@ -11,6 +11,7 @@ export interface IFeatureEnvironmentStore extends Store<IFeatureEnvironment, Fea
11
11
  getEnvironmentMetaData(environment: string, featureName: string): Promise<IFeatureEnvironment>;
12
12
  removeEnvironmentForFeature(featureName: string, environment: string): Promise<void>;
13
13
  addEnvironmentToFeature(featureName: string, environment: string, enabled: boolean): Promise<void>;
14
+ disableEnvironmentIfNoStrategies(featureName: string, environment: string): Promise<void>;
14
15
  disconnectFeatures(environment: string, project: string): Promise<void>;
15
16
  connectFeatures(environment: string, projectId: string): Promise<void>;
16
17
  connectFeatureToEnvironmentsForProject(featureName: string, projectId: string): Promise<void>;
@@ -17,4 +17,5 @@ export interface IFeatureStrategiesStore extends Store<IFeatureStrategy, string>
17
17
  getStrategyById(id: string): Promise<IFeatureStrategy>;
18
18
  updateStrategy(id: string, updates: Partial<IFeatureStrategy>): Promise<IFeatureStrategy>;
19
19
  deleteConfigurationsForProjectAndEnvironment(projectId: String, environment: String): Promise<void>;
20
+ setProjectForStrategiesBelongingToFeature(featureName: string, newProjectId: string): Promise<void>;
20
21
  }
@@ -22,6 +22,7 @@ import { IFeatureEnvironmentStore } from './stores/feature-environment-store';
22
22
  import { IFeatureStrategiesStore } from './stores/feature-strategies-store';
23
23
  import { IEnvironmentStore } from './stores/environment-store';
24
24
  import { IFeatureToggleClientStore } from './stores/feature-toggle-client-store';
25
+ import { IClientMetricsStoreV2 } from './stores/client-metrics-store-v2';
25
26
  export interface IUnleashStores {
26
27
  accessStore: IAccessStore;
27
28
  addonStore: IAddonStore;
@@ -29,6 +30,7 @@ export interface IUnleashStores {
29
30
  clientApplicationsStore: IClientApplicationsStore;
30
31
  clientInstanceStore: IClientInstanceStore;
31
32
  clientMetricsStore: IClientMetricsStore;
33
+ clientMetricsStoreV2: IClientMetricsStoreV2;
32
34
  contextFieldStore: IContextFieldStore;
33
35
  environmentStore: IEnvironmentStore;
34
36
  eventStore: IEventStore;
@@ -0,0 +1,2 @@
1
+ export function up(db: any, cb: any): void;
2
+ export function down(db: any, cb: any): void;
@@ -0,0 +1,22 @@
1
+ exports.up = function (db, cb) {
2
+ // TODO: foreign key on env.
3
+ db.runSql(`
4
+ CREATE TABLE client_metrics_env(
5
+ feature_name VARCHAR(255),
6
+ app_name VARCHAR(255),
7
+ environment VARCHAR(100),
8
+ timestamp TIMESTAMP WITH TIME ZONE,
9
+ yes INTEGER DEFAULT 0,
10
+ no INTEGER DEFAULT 0,
11
+ PRIMARY KEY (feature_name, app_name, environment, timestamp)
12
+ );
13
+ CREATE INDEX idx_client_metrics_f_name ON client_metrics_env(feature_name);
14
+
15
+ `, cb);
16
+ };
17
+ exports.down = function (db, cb) {
18
+ db.runSql(`
19
+ DROP TABLE client_metrics_env;
20
+ `, cb);
21
+ };
22
+ //# sourceMappingURL=20211004104917-client-metrics-env.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"20211004104917-client-metrics-env.js","sourceRoot":"","sources":["../../src/migrations/20211004104917-client-metrics-env.js"],"names":[],"mappings":"AAAA,OAAO,CAAC,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IACzB,4BAA4B;IAC5B,EAAE,CAAC,MAAM,CACL;;;;;;;;;;;;GAYL,EACK,EAAE,CACL,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE,EAAE,EAAE;IAC3B,EAAE,CAAC,MAAM,CACL;;SAEC,EACD,EAAE,CACL,CAAC;AACN,CAAC,CAAC"}
@@ -0,0 +1,5 @@
1
+ export function up(db: any, cb: any): void;
2
+ export function down(db: any, cb: any): void;
3
+ export namespace _meta {
4
+ const version: number;
5
+ }
@@ -0,0 +1,21 @@
1
+ 'use strict';
2
+ exports.up = function (db, cb) {
3
+ db.runSql(`
4
+ ALTER TABLE client_instances DROP CONSTRAINT client_instances_pkey;
5
+ ALTER TABLE client_instances ADD COLUMN environment varchar(255) NOT NULL DEFAULT 'default';
6
+ ALTER TABLE client_instances ADD CONSTRAINT client_instances_pkey PRIMARY KEY (app_name, environment, instance_id);
7
+ CREATE INDEX client_instances_environment_idx ON client_instances(environment);
8
+ `, cb);
9
+ };
10
+ exports.down = function (db, cb) {
11
+ db.runSql(`
12
+ DROP INDEX client_instances_environment_idx;
13
+ ALTER TABLE client_instances DROP CONSTRAINT client_instances_pkey;
14
+ ALTER TABLE client_instances ADD CONSTRAINT client_instances_pkey PRIMARY KEY (app_name, instance_id);
15
+ ALTER TABLE client_instances DROP COLUMN environment;
16
+ `, cb);
17
+ };
18
+ exports._meta = {
19
+ version: 1,
20
+ };
21
+ //# sourceMappingURL=20211011094226-add-environment-to-client-instances.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"20211011094226-add-environment-to-client-instances.js","sourceRoot":"","sources":["../../src/migrations/20211011094226-add-environment-to-client-instances.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,CAAC,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IACzB,EAAE,CAAC,MAAM,CACL;;;;;GAKL,EACK,EAAE,CACL,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE,EAAE,EAAE;IAC3B,EAAE,CAAC,MAAM,CACL;;;;;GAKL,EACK,EAAE,CACL,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,CAAC,KAAK,GAAG;IACZ,OAAO,EAAE,CAAC;CACb,CAAC"}
@@ -0,0 +1,2 @@
1
+ export function up(db: any, cb: any): void;
2
+ export function down(db: any, cb: any): void;
@@ -0,0 +1,12 @@
1
+ 'use strict';
2
+ exports.up = function (db, cb) {
3
+ db.runSql(`
4
+ ALTER TABLE feature_strategies ALTER COLUMN parameters SET DEFAULT '{}';
5
+ UPDATE feature_strategies set parameters = '{}' where parameters is null;
6
+ ALTER TABLE feature_strategies ALTER COLUMN parameters SET NOT NULL;
7
+ `, cb);
8
+ };
9
+ exports.down = function (db, cb) {
10
+ cb();
11
+ };
12
+ //# sourceMappingURL=20211013093114-feature-strategies-parameters-not-null.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"20211013093114-feature-strategies-parameters-not-null.js","sourceRoot":"","sources":["../../src/migrations/20211013093114-feature-strategies-parameters-not-null.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,CAAC,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IACzB,EAAE,CAAC,MAAM,CACL;;;;WAIG,EACH,EAAE,CACL,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE,EAAE,EAAE;IAC3B,EAAE,EAAE,CAAC;AACT,CAAC,CAAC"}
@@ -25,6 +25,11 @@ process.nextTick(async () => {
25
25
  versionCheck: {
26
26
  enable: false,
27
27
  },
28
+ experimental: {
29
+ metricsV2: {
30
+ enabled: true,
31
+ },
32
+ },
28
33
  }));
29
34
  }
30
35
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"server-dev.js","sourceRoot":"","sources":["../src/server-dev.ts"],"names":[],"mappings":";;AAAA,mDAA0C;AAC1C,uDAAmD;AACnD,yCAAwC;AAExC,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,SAAS;gBACnB,GAAG,EAAE,KAAK;aACb;YACD,MAAM,EAAE;gBACJ,mBAAmB,EAAE,IAAI;gBACzB,WAAW,EAAE,EAAE;gBACf,uBAAuB;gBACvB,sBAAsB,EAAE,IAAI;aAC/B;YACD,QAAQ,EAAE,iBAAQ,CAAC,KAAK;YACxB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE;gBACV,MAAM,EAAE,KAAK;aAChB;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"}
1
+ {"version":3,"file":"server-dev.js","sourceRoot":"","sources":["../src/server-dev.ts"],"names":[],"mappings":";;AAAA,mDAA0C;AAC1C,uDAAmD;AACnD,yCAAwC;AAExC,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,SAAS;gBACnB,GAAG,EAAE,KAAK;aACb;YACD,MAAM,EAAE;gBACJ,mBAAmB,EAAE,IAAI;gBACzB,WAAW,EAAE,EAAE;gBACf,uBAAuB;gBACvB,sBAAsB,EAAE,IAAI;aAC/B;YACD,QAAQ,EAAE,iBAAQ,CAAC,KAAK;YACxB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE;gBACV,MAAM,EAAE,KAAK;aAChB;YACD,YAAY,EAAE;gBACV,SAAS,EAAE;oBACP,OAAO,EAAE,IAAI;iBAChB;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"}
@@ -0,0 +1,219 @@
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
+ const database_init_1 = __importDefault(require("../../helpers/database-init"));
7
+ const test_helper_1 = require("../../helpers/test-helper");
8
+ const no_logger_1 = __importDefault(require("../../../fixtures/no-logger"));
9
+ let app;
10
+ let db;
11
+ beforeAll(async () => {
12
+ db = await (0, database_init_1.default)('client_metrics_serial', no_logger_1.default);
13
+ app = await (0, test_helper_1.setupAppWithCustomConfig)(db.stores, {
14
+ experimental: { metricsV2: { enabled: true } },
15
+ });
16
+ });
17
+ afterAll(async () => {
18
+ if (db) {
19
+ await db.destroy();
20
+ }
21
+ });
22
+ afterEach(async () => {
23
+ await db.reset();
24
+ await db.stores.clientMetricsStoreV2.deleteAll();
25
+ });
26
+ test('should return raw metrics, aggregated on key', async () => {
27
+ const date = new Date();
28
+ const metrics = [
29
+ {
30
+ featureName: 'demo',
31
+ appName: 'web',
32
+ environment: 'default',
33
+ timestamp: date,
34
+ yes: 2,
35
+ no: 2,
36
+ },
37
+ {
38
+ featureName: 't2',
39
+ appName: 'web',
40
+ environment: 'default',
41
+ timestamp: date,
42
+ yes: 5,
43
+ no: 5,
44
+ },
45
+ {
46
+ featureName: 't2',
47
+ appName: 'web',
48
+ environment: 'default',
49
+ timestamp: date,
50
+ yes: 2,
51
+ no: 99,
52
+ },
53
+ {
54
+ featureName: 'demo',
55
+ appName: 'web',
56
+ environment: 'default',
57
+ timestamp: date,
58
+ yes: 3,
59
+ no: 2,
60
+ },
61
+ {
62
+ featureName: 'demo',
63
+ appName: 'web',
64
+ environment: 'test',
65
+ timestamp: date,
66
+ yes: 1,
67
+ no: 3,
68
+ },
69
+ ];
70
+ await db.stores.clientMetricsStoreV2.batchInsertMetrics(metrics);
71
+ const { body: demo } = await app.request
72
+ .get('/api/admin/client-metrics/features/demo/raw')
73
+ .expect('Content-Type', /json/)
74
+ .expect(200);
75
+ const { body: t2 } = await app.request
76
+ .get('/api/admin/client-metrics/features/t2/raw')
77
+ .expect('Content-Type', /json/)
78
+ .expect(200);
79
+ expect(demo.data).toHaveLength(2);
80
+ expect(demo.data[0].environment).toBe('default');
81
+ expect(demo.data[0].yes).toBe(5);
82
+ expect(demo.data[0].no).toBe(4);
83
+ expect(demo.data[1].environment).toBe('test');
84
+ expect(demo.data[1].yes).toBe(1);
85
+ expect(demo.data[1].no).toBe(3);
86
+ expect(t2.data).toHaveLength(1);
87
+ expect(t2.data[0].environment).toBe('default');
88
+ expect(t2.data[0].yes).toBe(7);
89
+ expect(t2.data[0].no).toBe(104);
90
+ });
91
+ test('should return toggle summary', async () => {
92
+ const date = new Date();
93
+ const metrics = [
94
+ {
95
+ featureName: 'demo',
96
+ appName: 'web',
97
+ environment: 'default',
98
+ timestamp: date,
99
+ yes: 2,
100
+ no: 2,
101
+ },
102
+ {
103
+ featureName: 't2',
104
+ appName: 'web',
105
+ environment: 'default',
106
+ timestamp: date,
107
+ yes: 5,
108
+ no: 5,
109
+ },
110
+ {
111
+ featureName: 't2',
112
+ appName: 'web',
113
+ environment: 'default',
114
+ timestamp: date,
115
+ yes: 2,
116
+ no: 99,
117
+ },
118
+ {
119
+ featureName: 'demo',
120
+ appName: 'web',
121
+ environment: 'default',
122
+ timestamp: date,
123
+ yes: 3,
124
+ no: 2,
125
+ },
126
+ {
127
+ featureName: 'demo',
128
+ appName: 'web',
129
+ environment: 'test',
130
+ timestamp: date,
131
+ yes: 1,
132
+ no: 3,
133
+ },
134
+ {
135
+ featureName: 'demo',
136
+ appName: 'backend-api',
137
+ environment: 'test',
138
+ timestamp: date,
139
+ yes: 1,
140
+ no: 3,
141
+ },
142
+ ];
143
+ await db.stores.clientMetricsStoreV2.batchInsertMetrics(metrics);
144
+ const { body: demo } = await app.request
145
+ .get('/api/admin/client-metrics/features/demo')
146
+ .expect('Content-Type', /json/)
147
+ .expect(200);
148
+ expect(demo.featureName).toBe('demo');
149
+ expect(demo.lastHourUsage).toHaveLength(2);
150
+ expect(demo.lastHourUsage[0].environment).toBe('default');
151
+ expect(demo.lastHourUsage[0].yes).toBe(5);
152
+ expect(demo.lastHourUsage[0].no).toBe(4);
153
+ expect(demo.lastHourUsage[1].environment).toBe('test');
154
+ expect(demo.lastHourUsage[1].yes).toBe(2);
155
+ expect(demo.lastHourUsage[1].no).toBe(6);
156
+ expect(demo.seenApplications).toStrictEqual(['backend-api', 'web']);
157
+ });
158
+ test('should only include last hour of metrics return toggle summary', async () => {
159
+ const date = new Date();
160
+ const dateHoneHourAgo = new Date();
161
+ dateHoneHourAgo.setHours(-1);
162
+ const metrics = [
163
+ {
164
+ featureName: 'demo',
165
+ appName: 'web',
166
+ environment: 'default',
167
+ timestamp: date,
168
+ yes: 2,
169
+ no: 2,
170
+ },
171
+ {
172
+ featureName: 'demo',
173
+ appName: 'web',
174
+ environment: 'default',
175
+ timestamp: date,
176
+ yes: 3,
177
+ no: 2,
178
+ },
179
+ {
180
+ featureName: 'demo',
181
+ appName: 'web',
182
+ environment: 'test',
183
+ timestamp: date,
184
+ yes: 1,
185
+ no: 3,
186
+ },
187
+ {
188
+ featureName: 'demo',
189
+ appName: 'backend-api',
190
+ environment: 'test',
191
+ timestamp: date,
192
+ yes: 1,
193
+ no: 3,
194
+ },
195
+ {
196
+ featureName: 'demo',
197
+ appName: 'backend-api',
198
+ environment: 'test',
199
+ timestamp: dateHoneHourAgo,
200
+ yes: 55,
201
+ no: 55,
202
+ },
203
+ ];
204
+ await db.stores.clientMetricsStoreV2.batchInsertMetrics(metrics);
205
+ const { body: demo } = await app.request
206
+ .get('/api/admin/client-metrics/features/demo')
207
+ .expect('Content-Type', /json/)
208
+ .expect(200);
209
+ expect(demo.featureName).toBe('demo');
210
+ expect(demo.lastHourUsage).toHaveLength(2);
211
+ expect(demo.lastHourUsage[0].environment).toBe('default');
212
+ expect(demo.lastHourUsage[0].yes).toBe(5);
213
+ expect(demo.lastHourUsage[0].no).toBe(4);
214
+ expect(demo.lastHourUsage[1].environment).toBe('test');
215
+ expect(demo.lastHourUsage[1].yes).toBe(2);
216
+ expect(demo.lastHourUsage[1].no).toBe(6);
217
+ expect(demo.seenApplications).toStrictEqual(['backend-api', 'web']);
218
+ });
219
+ //# sourceMappingURL=client-metrics.e2e.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client-metrics.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/admin/client-metrics.e2e.test.ts"],"names":[],"mappings":"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"}
@@ -140,4 +140,27 @@ test('should validate name to not ok for non url-friendly', async () => {
140
140
  .set('Content-Type', 'application/json')
141
141
  .expect(400);
142
142
  });
143
+ test('should update context field with stickiness', async () => {
144
+ const name = 'with-sticky-update';
145
+ await app.request
146
+ .post('/api/admin/context')
147
+ .send({
148
+ name,
149
+ description: 'A context field supporting stickiness',
150
+ })
151
+ .set('Content-Type', 'application/json');
152
+ await app.request
153
+ .put(`/api/admin/context/${name}`)
154
+ .send({
155
+ description: 'asd',
156
+ legalValues: [],
157
+ name,
158
+ stickiness: true,
159
+ })
160
+ .set('Content-Type', 'application/json');
161
+ const res = await app.request.get(`/api/admin/context/${name}`);
162
+ const contextField = res.body;
163
+ expect(contextField.description).toBe('asd');
164
+ expect(contextField.stickiness).toBe(true);
165
+ });
143
166
  //# sourceMappingURL=context.e2e.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"context.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/admin/context.e2e.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/admin/context.e2e.test.ts"],"names":[],"mappings":"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"}