From 1f96c1646c521f4975e905afee51059a85ba9270 Mon Sep 17 00:00:00 2001 From: Jaanus Sellin Date: Fri, 25 Aug 2023 10:19:08 +0300 Subject: [PATCH] chore: remove configurableFeatureTypeLifetimes flag (#4569) --- .../__snapshots__/routes.test.tsx.snap | 1 - frontend/src/component/menu/routes.ts | 1 - frontend/src/interfaces/uiConfig.ts | 1 - .../__snapshots__/create-config.test.ts.snap | 2 -- src/lib/routes/admin-api/feature-type.ts | 24 ++++++++----------- src/lib/types/experimental.ts | 5 ---- src/server-dev.ts | 1 - src/test/e2e/api/admin/feature-type.test.ts | 1 - 8 files changed, 10 insertions(+), 26 deletions(-) diff --git a/frontend/src/component/menu/__tests__/__snapshots__/routes.test.tsx.snap b/frontend/src/component/menu/__tests__/__snapshots__/routes.test.tsx.snap index fac26dffde..bfe0a24394 100644 --- a/frontend/src/component/menu/__tests__/__snapshots__/routes.test.tsx.snap +++ b/frontend/src/component/menu/__tests__/__snapshots__/routes.test.tsx.snap @@ -195,7 +195,6 @@ exports[`returns all baseRoutes 1`] = ` }, { "component": [Function], - "flag": "configurableFeatureTypeLifetimes", "menu": { "advanced": true, "mobile": true, diff --git a/frontend/src/component/menu/routes.ts b/frontend/src/component/menu/routes.ts index 84f02c9987..9f81bdf100 100644 --- a/frontend/src/component/menu/routes.ts +++ b/frontend/src/component/menu/routes.ts @@ -216,7 +216,6 @@ export const routes: IRoute[] = [ component: FeatureTypesList, type: 'protected', menu: { mobile: true, advanced: true }, - flag: 'configurableFeatureTypeLifetimes', }, // Strategies diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 6bec529696..20668013bd 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -52,7 +52,6 @@ export interface IFlags { advancedPlayground?: boolean; customRootRolesKillSwitch?: boolean; strategyVariant?: boolean; - configurableFeatureTypeLifetimes?: boolean; segmentChangeRequests?: boolean; changeRequestReject?: boolean; lastSeenByEnvironment?: boolean; diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index ce54dfc01a..cce04bf77f 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -71,7 +71,6 @@ exports[`should create default config 1`] = ` "anonymiseEventLog": false, "caseInsensitiveInOperators": false, "changeRequestReject": false, - "configurableFeatureTypeLifetimes": false, "customRootRolesKillSwitch": false, "demo": false, "disableBulkToggle": false, @@ -107,7 +106,6 @@ exports[`should create default config 1`] = ` "anonymiseEventLog": false, "caseInsensitiveInOperators": false, "changeRequestReject": false, - "configurableFeatureTypeLifetimes": false, "customRootRolesKillSwitch": false, "demo": false, "disableBulkToggle": false, diff --git a/src/lib/routes/admin-api/feature-type.ts b/src/lib/routes/admin-api/feature-type.ts index bb57bc65e2..2edbb27c28 100644 --- a/src/lib/routes/admin-api/feature-type.ts +++ b/src/lib/routes/admin-api/feature-type.ts @@ -113,20 +113,16 @@ When a feature toggle type's expected lifetime is changed, this will also cause >, res: Response, ): Promise { - if (this.flagResolver.isEnabled('configurableFeatureTypeLifetimes')) { - const result = await this.featureTypeService.updateLifetime( - req.params.id.toLowerCase(), - req.body.lifetimeDays, - ); + const result = await this.featureTypeService.updateLifetime( + req.params.id.toLowerCase(), + req.body.lifetimeDays, + ); - this.openApiService.respondWithValidation( - 200, - res, - featureTypeSchema.$id, - result, - ); - } else { - res.status(409).end(); - } + this.openApiService.respondWithValidation( + 200, + res, + featureTypeSchema.$id, + result, + ); } } diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 9985bc75ae..12b8641be6 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -22,7 +22,6 @@ export type IFlagKey = | 'advancedPlayground' | 'strategyVariant' | 'slackAppAddon' - | 'configurableFeatureTypeLifetimes' | 'filterInvalidClientMetrics' | 'lastSeenByEnvironment' | 'segmentChangeRequests' @@ -105,10 +104,6 @@ const flags: IFlags = { process.env.UNLEASH_SLACK_APP_ADDON, false, ), - configurableFeatureTypeLifetimes: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_CONFIGURABLE_FEATURE_TYPE_LIFETIMES, - false, - ), filterInvalidClientMetrics: parseEnvVarBoolean( process.env.FILTER_INVALID_CLIENT_METRICS, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 6389c7c140..7922fe17e9 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -39,7 +39,6 @@ process.nextTick(async () => { responseTimeWithAppNameKillSwitch: false, strategyVariant: true, slackAppAddon: true, - configurableFeatureTypeLifetimes: true, lastSeenByEnvironment: true, segmentChangeRequests: true, newApplicationList: true, diff --git a/src/test/e2e/api/admin/feature-type.test.ts b/src/test/e2e/api/admin/feature-type.test.ts index d1c78d9334..c1a1bf3a11 100644 --- a/src/test/e2e/api/admin/feature-type.test.ts +++ b/src/test/e2e/api/admin/feature-type.test.ts @@ -12,7 +12,6 @@ beforeAll(async () => { app = await setupAppWithCustomConfig(db.stores, { experimental: { flags: { - configurableFeatureTypeLifetimes: true, strictSchemaValidation: true, }, },