Chore: Replace short UID generation with more standard UUIDs (#62731)

pkg/services/dashboards/database/database.go

@@ -453,11 +453,7 @@ func saveDashboard(sess *db.Session, cmd *dashboards.SaveDashboardCommand, emitE
 	}
 
 	if dash.UID == "" {
-		uid, err := generateNewDashboardUid(sess, dash.OrgID)
-		if err != nil {
-			return nil, err
-		}
-		dash.SetUID(uid)
+		dash.SetUID(util.GenerateShortUID())
 	}
 
 	parentVersion := dash.Version
@@ -536,23 +532,6 @@ func saveDashboard(sess *db.Session, cmd *dashboards.SaveDashboardCommand, emitE
 	return dash, nil
 }
 
-func generateNewDashboardUid(sess *db.Session, orgId int64) (string, error) {
-	for i := 0; i < 3; i++ {
-		uid := util.GenerateShortUID()
-
-		exists, err := sess.Where("org_id=? AND uid=?", orgId, uid).Get(&dashboards.Dashboard{})
-		if err != nil {
-			return "", err
-		}
-
-		if !exists {
-			return uid, nil
-		}
-	}
-
-	return "", dashboards.ErrDashboardFailedGenerateUniqueUid
-}
-
 func saveProvisionedData(sess *db.Session, provisioning *dashboards.DashboardProvisioning, dashboard *dashboards.Dashboard) error {
 	result := &dashboards.DashboardProvisioning{}
 

pkg/services/dashboards/errors.go

@@ -54,10 +54,6 @@ var (
 		Reason:     "Multiple dashboards with the same slug exists",
 		StatusCode: 412,
 	}
-	ErrDashboardFailedGenerateUniqueUid = DashboardErr{
-		Reason:     "Failed to generate unique dashboard id",
-		StatusCode: 500,
-	}
 	ErrDashboardTypeMismatch = DashboardErr{
 		Reason:     "Dashboard cannot be changed to a folder",
 		StatusCode: 400,
@@ -126,15 +122,14 @@ var (
 		Status:     "not-found",
 	}
 
-	ErrFolderNotFound                = errors.New("folder not found")
-	ErrFolderVersionMismatch         = errors.New("the folder has been changed by someone else")
-	ErrFolderTitleEmpty              = errors.New("folder title cannot be empty")
-	ErrFolderWithSameUIDExists       = errors.New("a folder/dashboard with the same uid already exists")
-	ErrFolderInvalidUID              = errors.New("invalid uid for folder provided")
-	ErrFolderSameNameExists          = errors.New("a folder or dashboard in the general folder with the same name already exists")
-	ErrFolderFailedGenerateUniqueUid = errors.New("failed to generate unique folder ID")
-	ErrFolderAccessDenied            = errors.New("access denied to folder")
-	ErrFolderContainsAlertRules      = errors.New("folder contains alert rules")
+	ErrFolderNotFound           = errors.New("folder not found")
+	ErrFolderVersionMismatch    = errors.New("the folder has been changed by someone else")
+	ErrFolderTitleEmpty         = errors.New("folder title cannot be empty")
+	ErrFolderWithSameUIDExists  = errors.New("a folder/dashboard with the same uid already exists")
+	ErrFolderInvalidUID         = errors.New("invalid uid for folder provided")
+	ErrFolderSameNameExists     = errors.New("a folder or dashboard in the general folder with the same name already exists")
+	ErrFolderAccessDenied       = errors.New("access denied to folder")
+	ErrFolderContainsAlertRules = errors.New("folder contains alert rules")
 )
 
 // DashboardErr represents a dashboard error.

pkg/services/folder/folderimpl/folder.go

@@ -805,9 +805,5 @@ func toFolderError(err error) error {
 		return dashboards.ErrFolderNotFound
 	}
 
-	if errors.Is(err, dashboards.ErrDashboardFailedGenerateUniqueUid) {
-		err = dashboards.ErrFolderFailedGenerateUniqueUid
-	}
-
 	return err
 }

pkg/services/folder/folderimpl/folder_test.go

@@ -300,7 +300,6 @@ func TestIntegrationFolderService(t *testing.T) {
 				{ActualError: dashboards.ErrDashboardWithSameUIDExists, ExpectedError: dashboards.ErrFolderWithSameUIDExists},
 				{ActualError: dashboards.ErrDashboardVersionMismatch, ExpectedError: dashboards.ErrFolderVersionMismatch},
 				{ActualError: dashboards.ErrDashboardNotFound, ExpectedError: dashboards.ErrFolderNotFound},
-				{ActualError: dashboards.ErrDashboardFailedGenerateUniqueUid, ExpectedError: dashboards.ErrFolderFailedGenerateUniqueUid},
 				{ActualError: dashboards.ErrDashboardInvalidUid, ExpectedError: dashboards.ErrDashboardInvalidUid},
 			}
 

pkg/services/shorturls/shorturlimpl/shorturl.go

@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/services/shorturls"
 	"github.com/grafana/grafana/pkg/services/user"
-	"github.com/grafana/grafana/pkg/util"
+	"github.com/teris-io/shortid"
 )
 
 var getTime = time.Now
@@ -44,10 +44,15 @@ func (s ShortURLService) CreateShortURL(ctx context.Context, user *user.SignedIn
 		return nil, shorturls.ErrShortURLInvalidPath.Errorf("path cannot contain '../': %s", relPath)
 	}
 
+	uid, err := shortid.Generate()
+	if err != nil {
+		return nil, shorturls.ErrShortURLInternal.Errorf("failed to generate uid: %w", err)
+	}
+
 	now := time.Now().Unix()
 	shortURL := shorturls.ShortUrl{
 		OrgId:     user.OrgID,
-		Uid:       util.GenerateShortUID(),
+		Uid:       uid,
 		Path:      relPath,
 		CreatedBy: user.UserID,
 		CreatedAt: now,

pkg/services/sqlstore/migrations/ualert/permissions.go

@@ -101,12 +101,7 @@ func (m *folderHelper) createFolder(orgID int64, title string) (*dashboard, erro
 		}),
 	}
 	dash := cmd.getDashboardModel()
-
-	uid, err := m.generateNewDashboardUid(dash.OrgId)
-	if err != nil {
-		return nil, err
-	}
-	dash.setUid(uid)
+	dash.setUid(util.GenerateShortUID())
 
 	parentVersion := dash.Version
 	dash.setVersion(1)
@@ -116,7 +111,7 @@ func (m *folderHelper) createFolder(orgID int64, title string) (*dashboard, erro
 	dash.UpdatedBy = FOLDER_CREATED_BY
 	metrics.MApiDashboardInsert.Inc()
 
-	if _, err = m.sess.Insert(dash); err != nil {
+	if _, err := m.sess.Insert(dash); err != nil {
 		return nil, err
 	}
 
@@ -138,23 +133,6 @@ func (m *folderHelper) createFolder(orgID int64, title string) (*dashboard, erro
 	return dash, nil
 }
 
-func (m *folderHelper) generateNewDashboardUid(orgId int64) (string, error) {
-	for i := 0; i < 3; i++ {
-		uid := util.GenerateShortUID()
-
-		exists, err := m.sess.Where("org_id=? AND uid=?", orgId, uid).Get(&dashboards.Dashboard{})
-		if err != nil {
-			return "", err
-		}
-
-		if !exists {
-			return uid, nil
-		}
-	}
-
-	return "", dashboards.ErrDashboardFailedGenerateUniqueUid
-}
-
 // based on SQLStore.UpdateDashboardACL()
 // it should be called from inside a transaction
 func (m *folderHelper) setACL(orgID int64, dashboardID int64, items []*dashboardACL) error {