Use google/uuid to instead satori/go.uuid (#11943) (#11946)

Co-authored-by: Lauris BH <[email protected]> Co-authored-by: Lauris BH <[email protected]> Co-authored-by: zeripath <[email protected]>
go-gitea · Jun 18, 2020 · 82343f4 · 82343f4
1 parent d534007
commit 82343f4
Show file tree

Hide file tree

Showing 38 changed files with 967 additions and 817 deletions.
diff --git a/go.mod b/go.mod
@@ -49,6 +49,7 @@ require (
  github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
  github.com/golang/protobuf v1.4.1 // indirect
  github.com/google/go-github/v24 v24.0.1
+ github.com/google/uuid v1.1.1
  github.com/gorilla/context v1.1.1
  github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
  github.com/huandu/xstrings v1.3.0
@@ -85,7 +86,6 @@ require (
  github.com/prometheus/procfs v0.0.4 // indirect
  github.com/quasoft/websspi v1.0.0
  github.com/remyoudompheng/bigfft v0.0.0-20190321074620-2f0d2b0e0001 // indirect
- github.com/satori/go.uuid v1.2.0
  github.com/sergi/go-diff v1.1.0
  github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b // indirect
  github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd

diff --git a/go.sum b/go.sum
@@ -558,8 +558,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20190321074620-2f0d2b0e0001/go.mod h1:qq
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b h1:4kg1wyftSKxLtnPAvcRWakIPpokB9w780/KwrNLnfPA=

diff --git a/models/attachment.go b/models/attachment.go
@@ -14,7 +14,7 @@ import (
  api "code.gitea.io/gitea/modules/structs"
  "code.gitea.io/gitea/modules/timeutil"
 
- gouuid "github.com/satori/go.uuid"
+ gouuid "github.com/google/uuid"
  "xorm.io/xorm"
 )
 
@@ -97,7 +97,7 @@ func (a *Attachment) LinkedRepository() (*Repository, UnitType, error) {
 
 // NewAttachment creates a new attachment object.
 func NewAttachment(attach *Attachment, buf []byte, file io.Reader) (_ *Attachment, err error) {
- attach.UUID = gouuid.NewV4().String()
+ attach.UUID = gouuid.New().String()
 
  localPath := attach.LocalPath()
  if err = os.MkdirAll(path.Dir(localPath), os.ModePerm); err != nil {

diff --git a/models/oauth2_application.go b/models/oauth2_application.go
@@ -16,7 +16,7 @@ import (
  "code.gitea.io/gitea/modules/timeutil"
 
  "github.com/dgrijalva/jwt-go"
- uuid "github.com/satori/go.uuid"
+ uuid "github.com/google/uuid"
  "github.com/unknwon/com"
  "golang.org/x/crypto/bcrypt"
  "xorm.io/xorm"
@@ -174,7 +174,7 @@ func CreateOAuth2Application(opts CreateOAuth2ApplicationOptions) (*OAuth2Applic
 }
 
 func createOAuth2Application(e Engine, opts CreateOAuth2ApplicationOptions) (*OAuth2Application, error) {
- clientID := uuid.NewV4().String()
+ clientID := uuid.New().String()
  app := &OAuth2Application{
  UID: opts.UserID,
  Name: opts.Name,

diff --git a/models/token.go b/models/token.go
@@ -13,7 +13,7 @@ import (
  "code.gitea.io/gitea/modules/generate"
  "code.gitea.io/gitea/modules/timeutil"
 
- gouuid "github.com/satori/go.uuid"
+ gouuid "github.com/google/uuid"
 )
 
 // AccessToken represents a personal access token.
@@ -45,7 +45,7 @@ func NewAccessToken(t *AccessToken) error {
  return err
  }
  t.TokenSalt = salt
- t.Token = base.EncodeSha1(gouuid.NewV4().String())
+ t.Token = base.EncodeSha1(gouuid.New().String())
  t.TokenHash = hashToken(t.Token, t.TokenSalt)
  t.TokenLastEight = t.Token[len(t.Token)-8:]
  _, err = x.Insert(t)

diff --git a/models/upload.go b/models/upload.go
@@ -14,7 +14,7 @@ import (
 
  "code.gitea.io/gitea/modules/setting"
 
- gouuid "github.com/satori/go.uuid"
+ gouuid "github.com/google/uuid"
  "github.com/unknwon/com"
 )
 
@@ -46,7 +46,7 @@ func (upload *Upload) LocalPath() string {
 // NewUpload creates a new upload object.
 func NewUpload(name string, buf []byte, file multipart.File) (_ *Upload, err error) {
  upload := &Upload{
- UUID: gouuid.NewV4().String(),
+ UUID: gouuid.New().String(),
  Name: name,
  }
 

diff --git a/models/webhook.go b/models/webhook.go
@@ -15,7 +15,7 @@ import (
  api "code.gitea.io/gitea/modules/structs"
  "code.gitea.io/gitea/modules/timeutil"
 
- gouuid "github.com/satori/go.uuid"
+ gouuid "github.com/google/uuid"
 )
 
 // HookContentType is the content type of a web hook
@@ -769,7 +769,7 @@ func createHookTask(e Engine, t *HookTask) error {
  if err != nil {
  return err
  }
- t.UUID = gouuid.NewV4().String()
+ t.UUID = gouuid.New().String()
  t.PayloadContent = string(data)
  _, err = e.Insert(t)
  return err

diff --git a/modules/auth/oauth2/oauth2.go b/modules/auth/oauth2/oauth2.go
@@ -10,6 +10,7 @@ import (
  "code.gitea.io/gitea/modules/log"
  "code.gitea.io/gitea/modules/setting"
 
+ uuid "github.com/google/uuid"
  "github.com/lafriks/xormstore"
  "github.com/markbates/goth"
  "github.com/markbates/goth/gothic"
@@ -25,7 +26,6 @@ import (
  "github.com/markbates/goth/providers/openidConnect"
  "github.com/markbates/goth/providers/twitter"
  "github.com/markbates/goth/providers/yandex"
- uuid "github.com/satori/go.uuid"
  "xorm.io/xorm"
 )
 
@@ -61,7 +61,7 @@ func Init(x *xorm.Engine) error {
  gothic.Store = store
 
  gothic.SetState = func(req *http.Request) string {
- return uuid.NewV4().String()
+ return uuid.New().String()
  }
 
  gothic.GetProviderName = func(req *http.Request) (string, error) {

diff --git a/modules/auth/sso/reverseproxy.go b/modules/auth/sso/reverseproxy.go
@@ -14,7 +14,7 @@ import (
 
  "gitea.com/macaron/macaron"
  "gitea.com/macaron/session"
- gouuid "github.com/satori/go.uuid"
+ gouuid "github.com/google/uuid"
 )
 
 // Ensure the struct implements the interface.
@@ -92,7 +92,7 @@ func (r *ReverseProxy) newUser(ctx *macaron.Context) *models.User {
  return nil
  }
 
- email := gouuid.NewV4().String() + "@localhost"
+ email := gouuid.New().String() + "@localhost"
  if setting.Service.EnableReverseProxyEmail {
  webAuthEmail := ctx.Req.Header.Get(setting.ReverseProxyAuthEmail)
  if len(webAuthEmail) > 0 {

diff --git a/modules/auth/sso/sspi_windows.go b/modules/auth/sso/sspi_windows.go
@@ -17,8 +17,8 @@ import (
  "gitea.com/macaron/macaron"
  "gitea.com/macaron/session"
 
+ gouuid "github.com/google/uuid"
  "github.com/quasoft/websspi"
- gouuid "github.com/satori/go.uuid"
 )
 
 const (
@@ -157,12 +157,12 @@ func (s *SSPI) shouldAuthenticate(ctx *macaron.Context) (shouldAuth bool) {
 // newUser creates a new user object for the purpose of automatic registration
 // and populates its name and email with the information present in request headers.
 func (s *SSPI) newUser(ctx *macaron.Context, username string, cfg *models.SSPIConfig) (*models.User, error) {
- email := gouuid.NewV4().String() + "@localhost.localdomain"
+ email := gouuid.New().String() + "@localhost.localdomain"
  user := &models.User{
  Name: username,
  Email: email,
  KeepEmailPrivate: true,
- Passwd: gouuid.NewV4().String(),
+ Passwd: gouuid.New().String(),
  IsActive: cfg.AutoActivateUsers,
  Language: cfg.DefaultLanguage,
  UseCustomAvatar: true,

diff --git a/modules/migrations/gitea.go b/modules/migrations/gitea.go
@@ -29,7 +29,7 @@ import (
  "code.gitea.io/gitea/modules/structs"
  "code.gitea.io/gitea/modules/timeutil"
 
- gouuid "github.com/satori/go.uuid"
+ gouuid "github.com/google/uuid"
 )
 
 var (
@@ -260,7 +260,7 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
 
  for _, asset := range release.Assets {
  var attach = models.Attachment{
- UUID: gouuid.NewV4().String(),
+ UUID: gouuid.New().String(),
  Name: asset.Name,
  DownloadCount: int64(*asset.DownloadCount),
  Size: int64(*asset.Size),

diff --git a/vendor/github.com/google/uuid/.travis.yml b/vendor/github.com/google/uuid/.travis.yml
diff --git a/vendor/github.com/google/uuid/CONTRIBUTING.md b/vendor/github.com/google/uuid/CONTRIBUTING.md
diff --git a/vendor/github.com/google/uuid/CONTRIBUTORS b/vendor/github.com/google/uuid/CONTRIBUTORS
diff --git a/vendor/github.com/google/uuid/LICENSE b/vendor/github.com/google/uuid/LICENSE
diff --git a/vendor/github.com/google/uuid/README.md b/vendor/github.com/google/uuid/README.md
diff --git a/vendor/github.com/google/uuid/dce.go b/vendor/github.com/google/uuid/dce.go
diff --git a/vendor/github.com/google/uuid/doc.go b/vendor/github.com/google/uuid/doc.go
diff --git a/vendor/github.com/google/uuid/go.mod b/vendor/github.com/google/uuid/go.mod