From 0d87de153a2b8406d03efe0cf43b5a926ce7acab Mon Sep 17 00:00:00 2001
From: Gabriel MABILLE <gamab@users.noreply.github.com>
Date: Thu, 31 Mar 2022 11:40:57 +0200
Subject: [PATCH] AccessControl: Add a feature flag for the builtin role
 simplification (#47062)

* AccessControl: Add a feature flag for the builtin role simplification

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Update standardDeatureFlags instead

Co-authored-by: Jguer <joao.guerreiro@grafana.com>
---
 packages/grafana-data/src/types/featureToggles.gen.ts | 1 +
 pkg/services/featuremgmt/registry.go                  | 6 ++++++
 pkg/services/featuremgmt/toggles_gen.go               | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index fefbf338451..c6e013cd332 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -34,6 +34,7 @@ export interface FeatureToggles {
   tempoServiceGraph?: boolean;
   lokiBackendMode?: boolean;
   accesscontrol?: boolean;
+  ['accesscontrol-builtins']?: boolean;
   prometheus_azure_auth?: boolean;
   influxdbBackendMigration?: boolean;
   newNavigation?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index a4e0ba715a9..5164ca65b15 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -99,6 +99,12 @@ var (
 			Description: "Support robust access control",
 			State:       FeatureStateBeta,
 		},
+		{
+			Name:            "accesscontrol-builtins",
+			Description:     "Simplify access control builtin roles",
+			State:           FeatureStateAlpha,
+			RequiresDevMode: true,
+		},
 		{
 			Name:        "prometheus_azure_auth",
 			Description: "Use azure authentication for prometheus datasource",
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 2a51f5e9833..554e2d42992 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -75,6 +75,10 @@ const (
 	// Support robust access control
 	FlagAccesscontrol = "accesscontrol"
 
+	// FlagAccesscontrolBuiltins
+	// Simplify access control builtin roles
+	FlagAccesscontrolBuiltins = "accesscontrol-builtins"
+
 	// FlagPrometheusAzureAuth
 	// Use azure authentication for prometheus datasource
 	FlagPrometheusAzureAuth = "prometheus_azure_auth"