Plugins Remove failWrongDSUID feature toggle (#107308)

* remove failWrongDSUID FT

* undo go.mod changes

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

@@ -67,7 +67,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `azureMonitorPrometheusExemplars`      | Allows configuration of Azure Monitor as a data source that can provide Prometheus exemplars                                       | Yes                |
 | `pinNavItems`                          | Enables pinning of nav items                                                                                                       | Yes                |
 | `ssoSettingsLDAP`                      | Use the new SSO Settings API to configure LDAP                                                                                     | Yes                |
-| `failWrongDSUID`                       | Throws an error if a data source has an invalid UIDs                                                                               | Yes                |
 | `cloudWatchRoundUpEndTime`             | Round up end time for metric queries to the next minute to avoid missing data                                                      | Yes                |
 | `newFiltersUI`                         | Enables new combobox style UI for the Ad hoc filters variable in scenes architecture                                               | Yes                |
 | `alertingQueryAndExpressionsStepMode`  | Enables step mode for alerting queries and expressions                                                                             | Yes                |

packages/grafana-data/src/types/featureToggles.gen.ts

@@ -610,11 +610,6 @@ export interface FeatureToggles {
   */
   ssoSettingsLDAP?: boolean;
   /**
-  * Throws an error if a data source has an invalid UIDs
-  * @default true
-  */
-  failWrongDSUID?: boolean;
-  /**
   * Use openFGA as authorization engine.
   */
   zanzana?: boolean;

pkg/services/datasources/service/store.go

@@ -252,9 +252,7 @@ func (ss *SqlStore) AddDataSource(ctx context.Context, cmd *datasources.AddDataS
 			cmd.UID = uid
 		} else if err := util.ValidateUID(cmd.UID); err != nil {
 			logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name, "create", err)
-			if ss.features != nil && ss.features.IsEnabled(ctx, featuremgmt.FlagFailWrongDSUID) {
+			return datasources.ErrDataSourceUIDInvalid.Errorf("invalid UID for datasource %s: %w", cmd.Name, err)
-				return datasources.ErrDataSourceUIDInvalid.Errorf("invalid UID for datasource %s: %w", cmd.Name, err)
-			}
 		}
 
 		ds = &datasources.DataSource{
@@ -329,9 +327,7 @@ func (ss *SqlStore) UpdateDataSource(ctx context.Context, cmd *datasources.Updat
 		if cmd.UID != "" {
 			if err := util.ValidateUID(cmd.UID); err != nil {
 				logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name, "update", err)
-				if ss.features != nil && ss.features.IsEnabled(ctx, featuremgmt.FlagFailWrongDSUID) {
+				return datasources.ErrDataSourceUIDInvalid.Errorf("invalid UID for datasource %s: %w", cmd.Name, err)
-					return datasources.ErrDataSourceUIDInvalid.Errorf("invalid UID for datasource %s: %w", cmd.Name, err)
-				}
 			}
 		}
 

pkg/services/datasources/service/store_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
 func TestIntegrationDataAccess(t *testing.T) {
@@ -102,9 +101,8 @@ func TestIntegrationDataAccess(t *testing.T) {
 		t.Run("fails to create a datasource with an invalid uid", func(t *testing.T) {
 			db := db.InitTestDB(t)
 			ss := SqlStore{
-				db:       db,
+				db:     db,
-				logger:   log.NewNopLogger(),
+				logger: log.NewNopLogger(),
-				features: featuremgmt.WithFeatures(featuremgmt.FlagFailWrongDSUID),
 			}
 			cmd := defaultAddDatasourceCommand
 			cmd.UID = "test/uid"
@@ -236,9 +234,8 @@ func TestIntegrationDataAccess(t *testing.T) {
 			db := db.InitTestDB(t)
 			ds := initDatasource(db)
 			ss := SqlStore{
-				db:       db,
+				db:     db,
-				logger:   log.NewNopLogger(),
+				logger: log.NewNopLogger(),
-				features: featuremgmt.WithFeatures(featuremgmt.FlagFailWrongDSUID),
 			}
 			require.NotEmpty(t, ds.UID)
 

pkg/services/featuremgmt/registry.go

@@ -1042,13 +1042,6 @@ var (
 			RequiresRestart: true,
 			Expression:      "true", // enabled by default
 		},
-		{
-			Name:        "failWrongDSUID",
-			Description: "Throws an error if a data source has an invalid UIDs",
-			Stage:       FeatureStageGeneralAvailability,
-			Owner:       grafanaPluginsPlatformSquad,
-			Expression:  "true", // enabled by default
-		},
 		{
 			Name:              "zanzana",
 			Description:       "Use openFGA as authorization engine.",

pkg/services/featuremgmt/toggles_gen.csv

@@ -135,7 +135,6 @@ azureMonitorPrometheusExemplars,GA,@grafana/partner-datasources,false,false,fals
 pinNavItems,GA,@grafana/grafana-frontend-platform,false,false,false
 authZGRPCServer,experimental,@grafana/identity-access-team,false,false,false
 ssoSettingsLDAP,GA,@grafana/identity-access-team,false,true,false
-failWrongDSUID,GA,@grafana/plugins-platform-backend,false,false,false
 zanzana,experimental,@grafana/identity-access-team,false,false,false
 reloadDashboardsOnParamsChange,experimental,@grafana/dashboards-squad,false,false,false
 enableScopesInMetricsExplore,experimental,@grafana/dashboards-squad,false,false,false

pkg/services/featuremgmt/toggles_gen.go

@@ -551,10 +551,6 @@ const (
 	// Use the new SSO Settings API to configure LDAP
 	FlagSsoSettingsLDAP = "ssoSettingsLDAP"
 
-	// FlagFailWrongDSUID
-	// Throws an error if a data source has an invalid UIDs
-	FlagFailWrongDSUID = "failWrongDSUID"
-
 	// FlagZanzana
 	// Use openFGA as authorization engine.
 	FlagZanzana = "zanzana"

pkg/services/featuremgmt/toggles_gen.json

@@ -1161,7 +1161,8 @@
       "metadata": {
         "name": "failWrongDSUID",
         "resourceVersion": "1750434297879",
-        "creationTimestamp": "2024-06-20T10:56:39Z"
+        "creationTimestamp": "2024-06-20T10:56:39Z",
+        "deletionTimestamp": "2025-06-27T12:51:00Z"
       },
       "spec": {
         "description": "Throws an error if a data source has an invalid UIDs",