From 3d51ca7377eff46b39750a8e0311ead7b75fd359 Mon Sep 17 00:00:00 2001
From: linoman <2051016+linoman@users.noreply.github.com>
Date: Thu, 7 Nov 2024 15:38:46 +0100
Subject: [PATCH] SCIM: Add feature flag (#96021)

* Add feature flag
---
 .../configure-grafana/feature-toggles/index.md       |  1 +
 .../grafana-data/src/types/featureToggles.gen.ts     |  1 +
 pkg/services/featuremgmt/registry.go                 |  6 ++++++
 pkg/services/featuremgmt/toggles_gen.csv             |  1 +
 pkg/services/featuremgmt/toggles_gen.go              |  4 ++++
 pkg/services/featuremgmt/toggles_gen.json            | 12 ++++++++++++
 6 files changed, 25 insertions(+)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index eced1cdb1dd..b0c9e642f43 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -220,6 +220,7 @@ Experimental features might be changed or removed without prior notice.
 | `playlistsWatcher`                            | Enables experimental watcher for playlists                                                                                                                                                                                                                                        |
 | `enableExtensionsAdminPage`                   | Enables the extension admin page regardless of development mode                                                                                                                                                                                                                   |
 | `zipkinBackendMigration`                      | Enables querying Zipkin data source without the proxy                                                                                                                                                                                                                             |
+| `enableSCIM`                                  | Enables SCIM support for user and group management                                                                                                                                                                                                                                |
 
 ## Development feature toggles
 
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 31598feb40d..1403f805ffa 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -233,4 +233,5 @@ export interface FeatureToggles {
   exploreMetricsRelatedLogs?: boolean;
   enableExtensionsAdminPage?: boolean;
   zipkinBackendMigration?: boolean;
+  enableSCIM?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 56205974dd2..52b74b826b2 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1608,6 +1608,12 @@ var (
 			Stage:       FeatureStageExperimental,
 			Owner:       grafanaOSSBigTent,
 		},
+		{
+			Name:        "enableSCIM",
+			Description: "Enables SCIM support for user and group management",
+			Stage:       FeatureStageExperimental,
+			Owner:       identityAccessTeam,
+		},
 	}
 )
 
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 4c08229efa4..34708eea3fc 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -214,3 +214,4 @@ playlistsWatcher,experimental,@grafana/grafana-app-platform-squad,false,true,fal
 exploreMetricsRelatedLogs,experimental,@grafana/observability-metrics,false,false,true
 enableExtensionsAdminPage,experimental,@grafana/plugins-platform-backend,false,true,false
 zipkinBackendMigration,experimental,@grafana/oss-big-tent,false,false,false
+enableSCIM,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 aaed13765e3..5b6dd231dc6 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -866,4 +866,8 @@ const (
 	// FlagZipkinBackendMigration
 	// Enables querying Zipkin data source without the proxy
 	FlagZipkinBackendMigration = "zipkinBackendMigration"
+
+	// FlagEnableSCIM
+	// Enables SCIM support for user and group management
+	FlagEnableSCIM = "enableSCIM"
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index b4fc915f062..fa9f0263bab 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -1231,6 +1231,18 @@
         "hideFromAdminPage": true
       }
     },
+    {
+      "metadata": {
+        "name": "enableSCIM",
+        "resourceVersion": "1730980484343",
+        "creationTimestamp": "2024-11-07T11:54:44Z"
+      },
+      "spec": {
+        "description": "Enables SCIM support for user and group management",
+        "stage": "experimental",
+        "codeowner": "@grafana/identity-access-team"
+      }
+    },
     {
       "metadata": {
         "name": "enableScopesInMetricsExplore",