From 3e89ffa2e69713e364fc0218f9bbcdf6faaf43f7 Mon Sep 17 00:00:00 2001
From: Artur Wierzbicki <artur.wierzbicki@grafana.com>
Date: Wed, 8 Mar 2023 21:25:12 +0400
Subject: [PATCH] Chore: assign feature flag ownership for GaaS (#64420)

* ownership for GaaS

* fix tests

* merge
---
 pkg/services/featuremgmt/codeowners.go       |  1 +
 pkg/services/featuremgmt/registry.go         |  4 ++++
 pkg/services/featuremgmt/toggles_gen_test.go | 24 ++++++++------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkg/services/featuremgmt/codeowners.go b/pkg/services/featuremgmt/codeowners.go
index b53d08c58fc..956ef9766a6 100644
--- a/pkg/services/featuremgmt/codeowners.go
+++ b/pkg/services/featuremgmt/codeowners.go
@@ -18,4 +18,5 @@ const (
 	grafanaObservabilityLogsSquad               codeowner = "@grafana/observability-logs"
 	grafanaObservabilityTracesAndProfilingSquad codeowner = "@grafana/observability-traces-and-profiling"
 	grafanaAlertingSquad                        codeowner = "@grafana/alerting-squad"
+	hostedGrafanaTeam                           codeowner = "@grafana/hosted-grafana-team"
 )
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 1022d660ab1..8c94209c18d 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -31,6 +31,7 @@ var (
 			Name:        "database_metrics",
 			Description: "Add Prometheus metrics for database tables",
 			State:       FeatureStateStable,
+			Owner:       hostedGrafanaTeam,
 		},
 		{
 			Name:        "dashboardPreviews",
@@ -228,11 +229,13 @@ var (
 			Description:     "Disable duplicated secret storage in legacy tables",
 			State:           FeatureStateAlpha,
 			RequiresRestart: true,
+			Owner:           hostedGrafanaTeam,
 		},
 		{
 			Name:        "logRequestsInstrumentedAsUnknown",
 			Description: "Logs the path for requests that are instrumented as unknown",
 			State:       FeatureStateAlpha,
+			Owner:       hostedGrafanaTeam,
 		},
 		{
 			Name:        "dataConnectionsConsole",
@@ -343,6 +346,7 @@ var (
 			Name:        "secureSocksDatasourceProxy",
 			Description: "Enable secure socks tunneling for supported core datasources",
 			State:       FeatureStateAlpha,
+			Owner:       hostedGrafanaTeam,
 		},
 		{
 			Name:        "authnService",
diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go
index b798dcce42e..733f9b25811 100644
--- a/pkg/services/featuremgmt/toggles_gen_test.go
+++ b/pkg/services/featuremgmt/toggles_gen_test.go
@@ -42,20 +42,16 @@ func TestFeatureToggleFiles(t *testing.T) {
 	})
 
 	ownerlessFeatures := map[string]bool{
-		"database_metrics":                 true,
-		"prometheusAzureOverrideAudience":  true,
-		"tracing":                          true,
-		"cloudWatchDynamicLabels":          true,
-		"disableSecretsCompatibility":      true,
-		"logRequestsInstrumentedAsUnknown": true,
-		"cloudWatchCrossAccountQuerying":   true,
-		"redshiftAsyncQueryDataSupport":    true,
-		"athenaAsyncQueryDataSupport":      true,
-		"newPanelChromeUI":                 true,
-		"showDashboardValidationWarnings":  true,
-		"datasourceOnboarding":             true,
-		"secureSocksDatasourceProxy":       true,
-		"individualCookiePreferences":      true,
+		"prometheusAzureOverrideAudience": true,
+		"tracing":                         true,
+		"cloudWatchDynamicLabels":         true,
+		"cloudWatchCrossAccountQuerying":  true,
+		"redshiftAsyncQueryDataSupport":   true,
+		"athenaAsyncQueryDataSupport":     true,
+		"newPanelChromeUI":                true,
+		"showDashboardValidationWarnings": true,
+		"datasourceOnboarding":            true,
+		"individualCookiePreferences":     true,
 	}
 
 	t.Run("all new features should have an owner", func(t *testing.T) {