public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plugins Remove failWrongDSUID feature toggle (#107308)

Browse Source 
* remove failWrongDSUID FT

* undo go.mod changes
This commit is contained in:
Will Browne
2025-06-27 14:43:58 +01:00
committed by GitHub
parent ee6cbd0efc
commit 43d369b51a
8 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/store.go
+2 -6
View File
@@ -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
+4 -7
View File
@@ -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,
logger: log.NewNopLogger(),
features: featuremgmt.WithFeatures(featuremgmt.FlagFailWrongDSUID),
db: db,
logger: log.NewNopLogger(),
}
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,
logger: log.NewNopLogger(),
features: featuremgmt.WithFeatures(featuremgmt.FlagFailWrongDSUID),
db: db,
logger: log.NewNopLogger(),
}
require.NotEmpty(t, ds.UID)