Util: Fix panic when generating UIDs concurrently (#69476)

This commit is contained in:
Jean-Philippe Quéméner
2023-06-05 11:21:11 +02:00
committed by GitHub
parent 1ed4c0382b
commit fe2103bfc8
2 changed files with 28 additions and 0 deletions
+8
View File
@@ -3,6 +3,7 @@ package util
import (
"math/rand"
"regexp"
"sync"
"time"
"github.com/google/uuid"
@@ -12,6 +13,11 @@ var uidrand = rand.New(rand.NewSource(time.Now().UnixNano()))
var alphaRunes = []rune("abcdefghijklmnopqrstuvwxyz")
var hexLetters = []rune("abcdef")
// We want to protect our number generator as they are not thread safe. Not using
// the mutex could result in panics in certain cases where UIDs would be generated
// at the same time.
var mtx sync.Mutex
// Legacy UID pattern
var validUIDPattern = regexp.MustCompile(`^[a-zA-Z0-9\-\_]*$`).MatchString
@@ -30,6 +36,8 @@ func IsShortUIDTooLong(uid string) bool {
// it is guaranteed to have a character as the first letter
// This UID will be a valid k8s name
func GenerateShortUID() string {
mtx.Lock()
defer mtx.Unlock()
uid, err := uuid.NewRandom()
if err != nil {
// This should never happen... but this seems better than a panic