Access: Remove split scopes feature toggle (#81874)

* remove split scopes FT

* Revert "remove split scopes FT"

This reverts commit 349fb081d3.

* make toggle deprecated instead

* fix gen

docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md

@@ -45,7 +45,6 @@ Some features are enabled by default. You can disable these feature by setting t
 | `recordedQueriesMulti`               | Enables writing multiple items from a single query within Recorded Queries                                                                                                                                                   | Yes                |
 | `transformationsRedesign`            | Enables the transformations redesign                                                                                                                                                                                         | Yes                |
 | `awsAsyncQueryCaching`               | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled                                                                                           | Yes                |
-| `splitScopes`                        | Support faster dashboard and folder search by splitting permission scopes into parts                                                                                                                                         | Yes                |
 | `prometheusConfigOverhaulAuth`       | Update the Prometheus configuration page with the new auth component                                                                                                                                                         | Yes                |
 | `influxdbSqlSupport`                 | Enable InfluxDB SQL query language support with new querying UI                                                                                                                                                              | Yes                |
 | `alertingNoDataErrorExecution`       | Changes how Alerting state manager handles execution of NoData/Error                                                                                                                                                         | Yes                |

pkg/services/accesscontrol/acimpl/service.go

@@ -50,14 +50,12 @@ func ProvideService(cfg *setting.Cfg, db db.DB, routeRegister routing.RouteRegis
 		return nil, err
 	}
 
-	if features.IsEnabledGlobally(featuremgmt.FlagSplitScopes) {
+	// Migrating scopes that haven't been split yet to have kind, attribute and identifier in the DB
-		// Migrating scopes that haven't been split yet to have kind, attribute and identifier in the DB
+	// This will be removed once we've:
-		// This will be removed once we've:
+	// 1) removed the feature toggle and
-		// 1) removed the feature toggle and
+	// 2) have released enough versions not to support a version without split scopes
-		// 2) have released enough versions not to support a version without split scopes
+	if err := migrator.MigrateScopeSplit(db, service.log); err != nil {
-		if err := migrator.MigrateScopeSplit(db, service.log); err != nil {
+		return nil, err
-			return nil, err
-		}
 	}
 
 	return service, nil

pkg/services/accesscontrol/resourcepermissions/store.go

@@ -667,9 +667,7 @@ func (s *store) createPermissions(sess *db.Session, roleID int64, resource, reso
 		p.RoleID = roleID
 		p.Created = time.Now()
 		p.Updated = time.Now()
-		if s.features.IsEnabledGlobally(featuremgmt.FlagSplitScopes) {
+		p.Kind, p.Attribute, p.Identifier = p.SplitScope()
-			p.Kind, p.Attribute, p.Identifier = p.SplitScope()
-		}
 		permissions = append(permissions, p)
 	}
 

pkg/services/featuremgmt/registry.go

@@ -731,7 +731,7 @@ var (
 		{
 			Name:              "splitScopes",
 			Description:       "Support faster dashboard and folder search by splitting permission scopes into parts",
-			Stage:             FeatureStageGeneralAvailability,
+			Stage:             FeatureStageDeprecated,
 			FrontendOnly:      false,
 			Expression:        "true", // enabled by default
 			Owner:             identityAccessTeam,

pkg/services/featuremgmt/toggles_gen.csv

@@ -85,7 +85,7 @@ grafanaAPIServerWithExperimentalAPIs,experimental,@grafana/grafana-app-platform-
 grafanaAPIServerEnsureKubectlAccess,experimental,@grafana/grafana-app-platform-squad,2023-12-06,true,true,false
 featureToggleAdminPage,experimental,@grafana/grafana-operator-experience-squad,2023-07-18,false,true,false
 awsAsyncQueryCaching,GA,@grafana/aws-datasources,2023-07-21,false,false,false
-splitScopes,GA,@grafana/identity-access-team,2023-07-21,false,true,false
+splitScopes,deprecated,@grafana/identity-access-team,2023-07-21,false,true,false
 permissionsFilterRemoveSubquery,experimental,@grafana/backend-platform,2023-08-02,false,false,false
 prometheusConfigOverhaulAuth,GA,@grafana/observability-metrics,2023-07-21,false,false,false
 configurableSchedulerTick,experimental,@grafana/alerting-squad,2023-07-26,false,true,false