From f5692f06a5ee9eed405e73bd8fc75342214d4b52 Mon Sep 17 00:00:00 2001 From: Karl Persson Date: Fri, 22 Mar 2024 14:30:58 +0100 Subject: [PATCH] FeatureToggles: Remove unused feature flag (#84988) Remove unused flag --- packages/grafana-data/src/types/featureToggles.gen.ts | 1 - pkg/services/featuremgmt/registry.go | 8 -------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/services/featuremgmt/toggles_gen.json | 3 ++- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 7839b7f1fcd..fc29cd63dc4 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -173,6 +173,5 @@ export interface FeatureToggles { groupByVariable?: boolean; betterPageScrolling?: boolean; scopeFilters?: boolean; - emailVerificationEnforcement?: boolean; ssoSettingsSAML?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index f0a315c568e..e31c61a3b2f 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1157,14 +1157,6 @@ var ( HideFromDocs: true, HideFromAdminPage: true, }, - { - Name: "emailVerificationEnforcement", - Description: "Force email verification for users, even when authenticating through sso.", - Stage: FeatureStageExperimental, - Owner: identityAccessTeam, - HideFromDocs: true, - HideFromAdminPage: true, - }, { Name: "ssoSettingsSAML", Description: "Use the new SSO Settings API to configure the SAML connector", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index f6d0e45ac98..5787afcccf8 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -154,5 +154,4 @@ expressionParser,experimental,@grafana/grafana-app-platform-squad,false,true,fal groupByVariable,experimental,@grafana/dashboards-squad,false,false,false betterPageScrolling,GA,@grafana/grafana-frontend-platform,false,false,true scopeFilters,experimental,@grafana/dashboards-squad,false,false,false -emailVerificationEnforcement,experimental,@grafana/identity-access-team,false,false,false ssoSettingsSAML,experimental,@grafana/identity-access-team,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index bfd8551e109..a92e4e8a6ea 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -627,10 +627,6 @@ const ( // Enables the use of scope filters in Grafana FlagScopeFilters = "scopeFilters" - // FlagEmailVerificationEnforcement - // Force email verification for users, even when authenticating through sso. - FlagEmailVerificationEnforcement = "emailVerificationEnforcement" - // FlagSsoSettingsSAML // Use the new SSO Settings API to configure the SAML connector FlagSsoSettingsSAML = "ssoSettingsSAML" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 8041d3886a5..75faf7053a1 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2137,7 +2137,8 @@ "metadata": { "name": "emailVerificationEnforcement", "resourceVersion": "1710164083965", - "creationTimestamp": "2024-03-11T13:34:43Z" + "creationTimestamp": "2024-03-11T13:34:43Z", + "deletionTimestamp": "2024-03-22T11:25:34Z" }, "spec": { "description": "Force email verification for users, even when authenticating through sso.",