Skip to content

Commit 4ffd3e7

Browse files
gastonfourniergastonfournier
authored
chore: stop using feature service v2 (#9500)
Just replacing references as both are interchangeable https://github.com/Unleash/unleash/blob/143c8a3074977164a9b54ab7b4ac76d6f6ac23c5/src/lib/types/services.ts#L81-L82 Depends on bricks-software/unleash-enterprise#138
1 parent 6b888ab commit 4ffd3e7

21 files changed

+73
-75
lines changed

‎src/lib/features/export-import-toggles/export-import.e2e.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ const createFlag = async (
6464
username: string = 'test',
6565
userId: number = -9999,
6666
) => {
67-
await app.services.featureToggleServiceV2.createFeatureToggle(
67+
await app.services.featureToggleService.createFeatureToggle(
6868
projectId,
6969
flag,
7070
TEST_AUDIT_USER,
7171
);
7272
if (strategy) {
73-
await app.services.featureToggleServiceV2.createStrategy(
73+
await app.services.featureToggleService.createStrategy(
7474
strategy,
7575
{
7676
projectId,

‎src/lib/features/feature-toggle/archive-feature-toggle-controller.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ export default class ArchiveController extends Controller {
3737
config: IUnleashConfig,
3838
{
3939
transactionalFeatureToggleService,
40-
featureToggleServiceV2,
40+
featureToggleService,
4141
openApiService,
4242
}: Pick<
4343
IUnleashServices,
4444
| 'transactionalFeatureToggleService'
45-
| 'featureToggleServiceV2'
45+
| 'featureToggleService'
4646
| 'openApiService'
4747
>,
4848
startTransaction: TransactionCreator<UnleashTransaction>,
4949
) {
5050
super(config);
51-
this.featureService = featureToggleServiceV2;
51+
this.featureService = featureToggleService;
5252
this.openApiService = openApiService;
5353
this.transactionalFeatureToggleService =
5454
transactionalFeatureToggleService;

‎src/lib/features/feature-toggle/fakes/fake-feature-toggle-store.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -248,12 +248,13 @@ export default class FakeFeatureToggleStore implements IFeatureToggleStore {
248248
return Promise.resolve(variants);
249249
}
250250

251-
getVariantsForEnv(
251+
async getVariantsForEnv(
252252
featureName: string,
253-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
254253
environment_name: string,
255254
): Promise<IVariant[]> {
256-
return this.getVariants(featureName);
255+
const feature = await this.get(featureName);
256+
// there's no way to filter by environment in the fake store
257+
return feature.variants as IVariant[];
257258
}
258259

259260
async saveVariants(

‎src/lib/features/feature-toggle/feature-toggle-controller.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const PATH_STRATEGY = `${PATH_STRATEGIES}/:strategyId`;
104104

105105
type ProjectFeaturesServices = Pick<
106106
IUnleashServices,
107-
| 'featureToggleServiceV2'
107+
| 'featureToggleService'
108108
| 'projectHealthService'
109109
| 'openApiService'
110110
| 'transactionalFeatureToggleService'
@@ -131,15 +131,15 @@ export default class ProjectFeaturesController extends Controller {
131131
constructor(
132132
config: IUnleashConfig,
133133
{
134-
featureToggleServiceV2,
134+
featureToggleService,
135135
openApiService,
136136
transactionalFeatureToggleService,
137137
featureTagService,
138138
}: ProjectFeaturesServices,
139139
startTransaction: TransactionCreator<UnleashTransaction>,
140140
) {
141141
super(config);
142-
this.featureService = featureToggleServiceV2;
142+
this.featureService = featureToggleService;
143143
this.transactionalFeatureToggleService =
144144
transactionalFeatureToggleService;
145145
this.startTransaction = startTransaction;

‎src/lib/features/feature-toggle/legacy/feature-toggle-legacy-controller.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ class FeatureController extends Controller {
3737
config: IUnleashConfig,
3838
{
3939
featureTagService,
40-
featureToggleServiceV2,
40+
featureToggleService,
4141
openApiService,
4242
}: Pick<
4343
IUnleashServices,
44-
'featureTagService' | 'featureToggleServiceV2' | 'openApiService'
44+
'featureTagService' | 'featureToggleService' | 'openApiService'
4545
>,
4646
) {
4747
super(config);
4848
this.tagService = featureTagService;
4949
this.openApiService = openApiService;
50-
this.service = featureToggleServiceV2;
50+
this.service = featureToggleService;
5151

5252
this.route({
5353
method: 'post',

‎src/lib/features/feature-toggle/tests/feature-toggles.auth.e2e.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ test('Should not be possible auto-enable feature flag without CREATE_FEATURE_STR
115115
const url = '/api/admin/projects/default/features';
116116
const name = 'auth.flag.enable';
117117

118-
await app.services.featureToggleServiceV2.createFeatureToggle(
118+
await app.services.featureToggleService.createFeatureToggle(
119119
'default',
120120
{ name },
121121
TEST_AUDIT_USER,

‎src/lib/features/frontend-api/createFrontendApiService.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const createFrontendApiService = (
3434
eventService,
3535
);
3636
// TODO: remove this dependency after we migrate frontend API
37-
const featureToggleServiceV2 = createFeatureToggleService(db, config);
37+
const featureToggleService = createFeatureToggleService(db, config);
3838
const clientFeatureToggleReadModel = new ClientFeatureToggleReadModel(
3939
db,
4040
config.eventBus,
@@ -49,7 +49,7 @@ export const createFrontendApiService = (
4949
config,
5050
{ segmentReadModel },
5151
{
52-
featureToggleServiceV2,
52+
featureToggleService,
5353
clientMetricsServiceV2,
5454
settingService,
5555
configurationRevisionService,
@@ -72,7 +72,7 @@ export const createFakeFrontendApiService = (
7272
eventService,
7373
);
7474
// TODO: remove this dependency after we migrate frontend API
75-
const featureToggleServiceV2 =
75+
const featureToggleService =
7676
createFakeFeatureToggleService(config).featureToggleService;
7777
const clientFeatureToggleReadModel = new FakeClientFeatureToggleReadModel();
7878
const globalFrontendApiCache = new GlobalFrontendApiCache(
@@ -85,7 +85,7 @@ export const createFakeFrontendApiService = (
8585
config,
8686
{ segmentReadModel },
8787
{
88-
featureToggleServiceV2,
88+
featureToggleService,
8989
clientMetricsServiceV2,
9090
settingService,
9191
configurationRevisionService,

‎src/lib/features/frontend-api/frontend-api-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export type Stores = Pick<IUnleashStores, 'segmentReadModel'>;
3838

3939
export type Services = Pick<
4040
IUnleashServices,
41-
| 'featureToggleServiceV2'
41+
| 'featureToggleService'
4242
| 'clientMetricsServiceV2'
4343
| 'settingService'
4444
| 'configurationRevisionService'

‎src/lib/features/frontend-api/proxy-repository.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type Stores = Pick<IUnleashStores, 'segmentReadModel'>;
3232

3333
type Services = Pick<
3434
IUnleashServices,
35-
'featureToggleServiceV2' | 'configurationRevisionService'
35+
'featureToggleService' | 'configurationRevisionService'
3636
>;
3737

3838
// TODO: remove after finished migration to global frontend api cache
@@ -170,7 +170,7 @@ export class ProxyRepository
170170
private async featuresForToken(): Promise<FeatureInterface[]> {
171171
const start = Date.now();
172172
const mappedFeatures = await mapFeaturesForClient(
173-
await this.services.featureToggleServiceV2.getClientFeatures({
173+
await this.services.featureToggleService.getClientFeatures({
174174
project: this.token.projects,
175175
environment: this.environmentNameForToken(),
176176
}),

‎src/lib/features/playground/createPlaygroundService.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ export const createPlaygroundService = (
1717
): PlaygroundService => {
1818
const segmentReadModel = new SegmentReadModel(db);
1919
const privateProjectChecker = createPrivateProjectChecker(db, config);
20-
const featureToggleServiceV2 = createFeatureToggleService(db, config);
20+
const featureToggleService = createFeatureToggleService(db, config);
2121

2222
const playgroundService = new PlaygroundService(
2323
config,
2424
{
25-
featureToggleServiceV2,
25+
featureToggleService,
2626
privateProjectChecker,
2727
},
2828
segmentReadModel,
@@ -34,13 +34,13 @@ export const createPlaygroundService = (
3434
export const createFakePlaygroundService = (config: IUnleashConfig) => {
3535
const segmentReadModel = new FakeSegmentReadModel();
3636
const privateProjectChecker = createFakePrivateProjectChecker();
37-
const featureToggleServiceV2 =
37+
const featureToggleService =
3838
createFakeFeatureToggleService(config).featureToggleService;
3939

4040
const playgroundService = new PlaygroundService(
4141
config,
4242
{
43-
featureToggleServiceV2,
43+
featureToggleService,
4444
privateProjectChecker,
4545
},
4646
segmentReadModel,

‎src/lib/features/playground/playground-service.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,17 @@ export class PlaygroundService {
8282
constructor(
8383
config: IUnleashConfig,
8484
{
85-
featureToggleServiceV2,
85+
featureToggleService,
8686
privateProjectChecker,
8787
}: Pick<
8888
IUnleashServices,
89-
'featureToggleServiceV2' | 'privateProjectChecker'
89+
'featureToggleService' | 'privateProjectChecker'
9090
>,
9191
segmentReadModel: ISegmentReadModel,
9292
) {
9393
this.logger = config.getLogger('services/playground-service.ts');
9494
this.flagResolver = config.flagResolver;
95-
this.featureToggleService = featureToggleServiceV2;
95+
this.featureToggleService = featureToggleService;
9696
this.privateProjectChecker = privateProjectChecker;
9797
this.segmentReadModel = segmentReadModel;
9898
}

‎src/lib/routes/admin-api/constraints.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ export default class ConstraintController extends Controller {
1919
constructor(
2020
config: IUnleashConfig,
2121
{
22-
featureToggleServiceV2,
22+
featureToggleService,
2323
openApiService,
24-
}: Pick<IUnleashServices, 'featureToggleServiceV2' | 'openApiService'>,
24+
}: Pick<IUnleashServices, 'featureToggleService' | 'openApiService'>,
2525
) {
2626
super(config);
27-
this.featureService = featureToggleServiceV2;
27+
this.featureService = featureToggleService;
2828
this.openApiService = openApiService;
2929
this.logger = config.getLogger('/admin-api/validation.ts');
3030

‎src/lib/routes/admin-api/project/project-archive.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ export default class ProjectArchiveController extends Controller {
5050
config: IUnleashConfig,
5151
{
5252
transactionalFeatureToggleService,
53-
featureToggleServiceV2,
53+
featureToggleService,
5454
openApiService,
5555
}: Pick<
5656
IUnleashServices,
5757
| 'transactionalFeatureToggleService'
58-
| 'featureToggleServiceV2'
58+
| 'featureToggleService'
5959
| 'openApiService'
6060
>,
6161
startTransaction: TransactionCreator<UnleashTransaction>,
6262
) {
6363
super(config);
6464
this.logger = config.getLogger('/admin-api/archive.js');
65-
this.featureService = featureToggleServiceV2;
65+
this.featureService = featureToggleService;
6666
this.openApiService = openApiService;
6767
this.flagResolver = config.flagResolver;
6868
this.transactionalFeatureToggleService =

‎src/lib/services/index.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ export const createServices = (
282282
? new FeatureCollaboratorsReadModel(db)
283283
: new FakeFeatureCollaboratorsReadModel();
284284

285-
const featureToggleServiceV2 = new FeatureToggleService(
285+
const featureToggleService = new FeatureToggleService(
286286
stores,
287287
config,
288288
segmentService,
@@ -426,8 +426,7 @@ export const createServices = (
426426
accountService,
427427
addonService,
428428
eventAnnouncerService,
429-
featureToggleService: featureToggleServiceV2,
430-
featureToggleServiceV2,
429+
featureToggleService,
431430
featureTypeService,
432431
healthService,
433432
projectService,

‎src/lib/types/services.ts

-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ export interface IUnleashServices {
7878
edgeService: EdgeService;
7979
featureTagService: FeatureTagService;
8080
featureToggleService: FeatureToggleService;
81-
/** @deprecated use featureToggleService instead, both are interchangeable */
82-
featureToggleServiceV2: FeatureToggleService;
8381
featureTypeService: FeatureTypeService;
8482
groupService: GroupService;
8583
healthService: HealthService;

‎src/test/e2e/api/client/feature.e2e.test.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ beforeAll(async () => {
2525
},
2626
db.rawDatabase,
2727
);
28-
await app.services.featureToggleServiceV2.createFeatureToggle(
28+
await app.services.featureToggleService.createFeatureToggle(
2929
'default',
3030
{
3131
name: 'featureX',
@@ -34,7 +34,7 @@ beforeAll(async () => {
3434
},
3535
TEST_AUDIT_USER,
3636
);
37-
await app.services.featureToggleServiceV2.createFeatureToggle(
37+
await app.services.featureToggleService.createFeatureToggle(
3838
'default',
3939
{
4040
name: 'featureY',
@@ -43,15 +43,15 @@ beforeAll(async () => {
4343
TEST_AUDIT_USER,
4444
);
4545

46-
await app.services.featureToggleServiceV2.createFeatureToggle(
46+
await app.services.featureToggleService.createFeatureToggle(
4747
'default',
4848
{
4949
name: 'featureZ',
5050
description: 'terrible feature',
5151
},
5252
TEST_AUDIT_USER,
5353
);
54-
await app.services.featureToggleServiceV2.createFeatureToggle(
54+
await app.services.featureToggleService.createFeatureToggle(
5555
'default',
5656
{
5757
name: 'featureArchivedX',
@@ -66,13 +66,13 @@ beforeAll(async () => {
6666
TEST_AUDIT_USER,
6767
);
6868

69-
await app.services.featureToggleServiceV2.archiveToggle(
69+
await app.services.featureToggleService.archiveToggle(
7070
'featureArchivedX',
7171
testUser,
7272
TEST_AUDIT_USER,
7373
);
7474

75-
await app.services.featureToggleServiceV2.createFeatureToggle(
75+
await app.services.featureToggleService.createFeatureToggle(
7676
'default',
7777
{
7878
name: 'featureArchivedY',
@@ -81,33 +81,33 @@ beforeAll(async () => {
8181
TEST_AUDIT_USER,
8282
);
8383

84-
await app.services.featureToggleServiceV2.archiveToggle(
84+
await app.services.featureToggleService.archiveToggle(
8585
'featureArchivedY',
8686
testUser,
8787
TEST_AUDIT_USER,
8888
);
89-
await app.services.featureToggleServiceV2.createFeatureToggle(
89+
await app.services.featureToggleService.createFeatureToggle(
9090
'default',
9191
{
9292
name: 'featureArchivedZ',
9393
description: 'terrible feature',
9494
},
9595
TEST_AUDIT_USER,
9696
);
97-
await app.services.featureToggleServiceV2.archiveToggle(
97+
await app.services.featureToggleService.archiveToggle(
9898
'featureArchivedZ',
9999
testUser,
100100
TEST_AUDIT_USER,
101101
);
102-
await app.services.featureToggleServiceV2.createFeatureToggle(
102+
await app.services.featureToggleService.createFeatureToggle(
103103
'default',
104104
{
105105
name: 'feature.with.variants',
106106
description: 'A feature flag with variants',
107107
},
108108
TEST_AUDIT_USER,
109109
);
110-
await app.services.featureToggleServiceV2.saveVariants(
110+
await app.services.featureToggleService.saveVariants(
111111
'feature.with.variants',
112112
'default',
113113
[

0 commit comments

Comments
 (0)