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

Chore: Adding log also for cases where datasource UID length is invalid (#84443)

Browse Source 
* Adding log also for datasource length
This commit is contained in:
Timur Olzhabayev
2024-03-14 14:49:07 +01:00
committed by GitHub
parent 660fe64bc6
commit 8e90e02db2
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/store.go
+8 -6
View File
@@ -253,8 +253,8 @@ func (ss *SqlStore) AddDataSource(ctx context.Context, cmd *datasources.AddDataS
return fmt.Errorf("failed to generate UID for datasource %q: %w", cmd.Name, err) return fmt.Errorf("failed to generate UID for datasource %q: %w", cmd.Name, err)
} }
cmd.UID = uid cmd.UID = uid
} else if !util.IsValidShortUID(cmd.UID) { } else if err := util.ValidateUID(cmd.UID); err != nil {
logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name) logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name, err)
} }
ds = &datasources.DataSource{ ds = &datasources.DataSource{
@@ -388,8 +388,10 @@ func (ss *SqlStore) UpdateDataSource(ctx context.Context, cmd *datasources.Updat
} }
} }
if !util.IsValidShortUID(cmd.UID) { if cmd.UID != "" {
logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name) if err := util.ValidateUID(cmd.UID); err != nil {
logDeprecatedInvalidDsUid(ss.logger, cmd.UID, cmd.Name, err)
}
} }
return err return err
@@ -415,11 +417,11 @@ func generateNewDatasourceUid(sess *db.Session, orgId int64) (string, error) {
var generateNewUid func() string = util.GenerateShortUID var generateNewUid func() string = util.GenerateShortUID
func logDeprecatedInvalidDsUid(logger log.Logger, uid, name string) { func logDeprecatedInvalidDsUid(logger log.Logger, uid string, name string, err error) {
logger.Warn( logger.Warn(
"Invalid datasource uid. The use of invalid uids is deprecated and this operation will fail in a future "+ "Invalid datasource uid. The use of invalid uids is deprecated and this operation will fail in a future "+
"version of Grafana. A valid uid is a combination of a-z, A-Z, 0-9 (alphanumeric), - (dash) and _ "+ "version of Grafana. A valid uid is a combination of a-z, A-Z, 0-9 (alphanumeric), - (dash) and _ "+
"(underscore) characters, maximum length 40", "(underscore) characters, maximum length 40",
"uid", uid, "name", name, "uid", uid, "name", name, "error", err,
) )
} }