fix: deprecate skyring/uuid and use maintained google/uuid (#9340)

This commit is contained in:
Harshavardhana
2020-04-14 02:40:05 -07:00
committed by GitHub
parent d079adc167
commit 9054ce73b2
7 changed files with 45 additions and 228 deletions

View File

@@ -32,6 +32,7 @@ import (
"time"
"unicode/utf8"
"github.com/google/uuid"
"github.com/klauspost/compress/s2"
"github.com/klauspost/readahead"
"github.com/minio/minio-go/v6/pkg/s3utils"
@@ -44,7 +45,6 @@ import (
"github.com/minio/minio/pkg/hash"
"github.com/minio/minio/pkg/ioutil"
"github.com/minio/minio/pkg/wildcard"
"github.com/skyrings/skyring-common/tools/uuid"
)
const (
@@ -216,12 +216,12 @@ func pathJoin(elem ...string) string {
// mustGetUUID - get a random UUID.
func mustGetUUID() string {
uuid, err := uuid.New()
u, err := uuid.NewRandom()
if err != nil {
logger.CriticalIf(GlobalContext, err)
}
return uuid.String()
return u.String()
}
// Create an s3 compatible MD5sum for complete multipart transaction.