Repurpose wrong datasource UID feature flag (#89363)

pkg/services/datasources/errors.go

@@ -18,4 +18,5 @@ var (
 	ErrDataSourceNameInvalid             = errutil.ValidationFailed("datasource.nameInvalid", errutil.WithPublicMessage("Invalid datasource name."))
 	ErrDataSourceURLInvalid              = errutil.ValidationFailed("datasource.urlInvalid", errutil.WithPublicMessage("Invalid datasource url."))
 	ErrDataSourceAPIVersionInvalid       = errutil.ValidationFailed("datasource.apiVersionInvalid", errutil.WithPublicMessage("Invalid datasource apiVersion."))
+	ErrDataSourceUIDInvalid              = errutil.ValidationFailed("datasource.uidInvalid", errutil.WithPublicMessage("Invalid datasource UID."))
 )

pkg/services/datasources/service/store.go

@@ -252,8 +252,8 @@ 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.FlagAutofixDSUID) {
-				return fmt.Errorf("invalid UID for datasource %s: %w", cmd.Name, err)
+			if ss.features != nil && ss.features.IsEnabled(ctx, featuremgmt.FlagFailWrongDSUID) {
+				return datasources.ErrDataSourceUIDInvalid.Errorf("invalid UID for datasource %s: %w", cmd.Name, err)
 			}
 		}
 
@@ -329,8 +329,8 @@ 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.FlagAutofixDSUID) {
-					cmd.UID = util.AutofixUID(cmd.UID)
+				if ss.features != nil && ss.features.IsEnabled(ctx, featuremgmt.FlagFailWrongDSUID) {
+					return datasources.ErrDataSourceUIDInvalid.Errorf("invalid UID for datasource %s: %w", cmd.Name, err)
 				}
 			}
 		}

pkg/services/datasources/service/store_test.go

@@ -104,7 +104,7 @@ func TestIntegrationDataAccess(t *testing.T) {
 			ss := SqlStore{
 				db:       db,
 				logger:   log.NewNopLogger(),
-				features: featuremgmt.WithFeatures(featuremgmt.FlagAutofixDSUID),
+				features: featuremgmt.WithFeatures(featuremgmt.FlagFailWrongDSUID),
 			}
 			cmd := defaultAddDatasourceCommand
 			cmd.UID = "test/uid"
@@ -232,28 +232,21 @@ func TestIntegrationDataAccess(t *testing.T) {
 			require.NoError(t, err)
 		})
 
-		t.Run("updates UID with a valid one", func(t *testing.T) {
+		t.Run("fails to update a datasource with an invalid uid", func(t *testing.T) {
 			db := db.InitTestDB(t)
 			ds := initDatasource(db)
 			ss := SqlStore{
 				db:       db,
 				logger:   log.NewNopLogger(),
-				features: featuremgmt.WithFeatures(featuremgmt.FlagAutofixDSUID),
+				features: featuremgmt.WithFeatures(featuremgmt.FlagFailWrongDSUID),
 			}
 			require.NotEmpty(t, ds.UID)
 
 			cmd := defaultUpdateDatasourceCommand
 			cmd.ID = ds.ID
 			cmd.UID = "new/uid"
-			res, err := ss.UpdateDataSource(context.Background(), &cmd)
-			require.NoError(t, err)
-			require.Equal(t, "new-uid", res.UID)
-
-			// Return the datasource with the valid UID
-			query := datasources.GetDataSourceQuery{UID: "new-uid", OrgID: 10}
-			dataSource, err := ss.GetDataSource(context.Background(), &query)
-			require.NoError(t, err)
-			require.Equal(t, "new-uid", dataSource.UID)
+			_, err := ss.UpdateDataSource(context.Background(), &cmd)
+			require.ErrorContains(t, err, "invalid format of UID")
 		})
 	})
 

pkg/services/featuremgmt/registry.go

@@ -1222,12 +1222,6 @@ var (
 			FrontendOnly:   false,
 			AllowSelfServe: false,
 		},
-		{
-			Name:        "autofixDSUID",
-			Description: "Automatically migrates invalid datasource UIDs",
-			Stage:       FeatureStageExperimental,
-			Owner:       grafanaPluginsPlatformSquad,
-		},
 		{
 			Name:         "logsExploreTableDefaultVisualization",
 			Description:  "Sets the logs table as default visualisation in logs explore",
@@ -1336,6 +1330,12 @@ var (
 			HideFromDocs:      true,
 			HideFromAdminPage: true,
 		},
+		{
+			Name:        "failWrongDSUID",
+			Description: "Throws an error if a datasource has an invalid UIDs",
+			Stage:       FeatureStageExperimental,
+			Owner:       grafanaPluginsPlatformSquad,
+		},
 		{
 			Name:        "databaseReadReplica",
 			Description: "Use a read replica for some database queries.",

pkg/services/featuremgmt/toggles_gen.csv

@@ -161,7 +161,6 @@ accessActionSets,experimental,@grafana/identity-access-team,false,false,false
 disableNumericMetricsSortingInExpressions,experimental,@grafana/observability-metrics,false,true,false
 grafanaManagedRecordingRules,experimental,@grafana/alerting-squad,false,false,false
 queryLibrary,experimental,@grafana/explore-squad,false,false,false
-autofixDSUID,experimental,@grafana/plugins-platform-backend,false,false,false
 logsExploreTableDefaultVisualization,experimental,@grafana/observability-logs,false,false,true
 newDashboardSharingComponent,experimental,@grafana/sharing-squad,false,false,true
 alertingListViewV2,experimental,@grafana/alerting-squad,false,false,true
@@ -177,5 +176,6 @@ pinNavItems,experimental,@grafana/grafana-frontend-platform,false,false,false
 authZGRPCServer,experimental,@grafana/identity-access-team,false,false,false
 openSearchBackendFlowEnabled,preview,@grafana/aws-datasources,false,false,false
 ssoSettingsLDAP,experimental,@grafana/identity-access-team,false,false,false
+failWrongDSUID,experimental,@grafana/plugins-platform-backend,false,false,false
 databaseReadReplica,experimental,@grafana/grafana-backend-services-squad,false,false,false
 zanzana,experimental,@grafana/identity-access-team,false,false,false

pkg/services/featuremgmt/toggles_gen.go

@@ -655,10 +655,6 @@ const (
 	// Enables Query Library feature in Explore
 	FlagQueryLibrary = "queryLibrary"
 
-	// FlagAutofixDSUID
-	// Automatically migrates invalid datasource UIDs
-	FlagAutofixDSUID = "autofixDSUID"
-
 	// FlagLogsExploreTableDefaultVisualization
 	// Sets the logs table as default visualisation in logs explore
 	FlagLogsExploreTableDefaultVisualization = "logsExploreTableDefaultVisualization"
@@ -719,6 +715,10 @@ const (
 	// Use the new SSO Settings API to configure LDAP
 	FlagSsoSettingsLDAP = "ssoSettingsLDAP"
 
+	// FlagFailWrongDSUID
+	// Throws an error if a datasource has an invalid UIDs
+	FlagFailWrongDSUID = "failWrongDSUID"
+
 	// FlagDatabaseReadReplica
 	// Use a read replica for some database queries.
 	FlagDatabaseReadReplica = "databaseReadReplica"

pkg/services/featuremgmt/toggles_gen.json

@@ -401,8 +401,9 @@
     {
       "metadata": {
         "name": "autofixDSUID",
-        "resourceVersion": "1718727528075",
-        "creationTimestamp": "2024-05-03T11:32:07Z"
+        "resourceVersion": "1717578796182",
+        "creationTimestamp": "2024-05-03T11:32:07Z",
+        "deletionTimestamp": "2024-06-18T14:28:32Z"
       },
       "spec": {
         "description": "Automatically migrates invalid datasource UIDs",
@@ -915,6 +916,18 @@
         "frontend": true
       }
     },
+    {
+      "metadata": {
+        "name": "failWrongDSUID",
+        "resourceVersion": "1718721033692",
+        "creationTimestamp": "2024-06-18T14:30:33Z"
+      },
+      "spec": {
+        "description": "Throws an error if a datasource has an invalid UIDs",
+        "stage": "experimental",
+        "codeowner": "@grafana/plugins-platform-backend"
+      }
+    },
     {
       "metadata": {
         "name": "faroDatasourceSelector",